DHBW/TelegramAktienBot
1
0
Fork 0
Code Issues 6 Pull Requests 26 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into bot

Browse Source
This commit is contained in:
Linus E 2022-03-28 18:56:24 +02:00
commit 26a6561682
16 changed files with 156 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/api_blueprint_user.py
View File

@ -59,7 +59,10 @@ def login(data):
if not check_password(query_user.password, password.encode("utf-8")): # Password incorrect
abort(500, message="Unable to login")
token = jwt.encode({'email': query_user.email, 'exp': datetime.datetime.utcnow() + datetime.timedelta(minutes=45)}, os.getenv('SECRET_KEY'), "HS256")
if query_user.email == os.getenv("BOT_EMAIL"):
token = jwt.encode({'email': query_user.email, 'exp': datetime.datetime.utcnow() + datetime.timedelta(days=365)}, os.getenv('SECRET_KEY'), "HS256")
else:
token = jwt.encode({'email': query_user.email, 'exp': datetime.datetime.utcnow() + datetime.timedelta(days=1)}, os.getenv('SECRET_KEY'), "HS256")
return make_response({"token": token}, 200, "Successfully logged in")

9
api/helper_functions.py
View File

@ -41,12 +41,17 @@ def get_email_from_token_data():
if token is not None:
if ':' in token: # Maybe bot token, check if token valid and return username after ":" then
email = token.split(":")[1]
telegram_user_id = token.split(":")[1]
token = token.split(":")[0]
try:
if jwt.decode(token, os.getenv('SECRET_KEY'), algorithms=["HS256"])['email'] == os.getenv("BOT_EMAIL"):
return email
res = db.session.query(User).filter_by(telegram_user_id=telegram_user_id).first()
if res is not None:
return res.as_dict()['email']
else:
return None
else:
return None
except jwt.PyJWTError:

1
frontend/README.md
View File

@ -25,3 +25,4 @@ Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To u
## Further help
To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI Overview and Command Reference](https://angular.io/cli) page.

2
frontend/src/app/Helpers/auth.interceptor.ts
View File

@ -7,7 +7,7 @@ import {
} from '@angular/common/http';
import { TokenStorageService } from '../Services/token.service';
import { Observable } from 'rxjs';
const TOKEN_HEADER_KEY = 'Authorization'; // for Spring Boot back-end
const TOKEN_HEADER_KEY = 'Authorization';
@Injectable()
export class AuthInterceptor implements HttpInterceptor {
constructor(private token: TokenStorageService) {}

16
frontend/src/app/Helpers/helper.service.spec.ts Normal file
View File

@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';
import { HelperService } from './helper.service';
describe('HelperService', () => {
let service: HelperService;
beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(HelperService);
});
it('should be created', () => {
expect(service).toBeTruthy();
});
});

10
frontend/src/app/Helpers/helper.service.ts Normal file
View File

@ -0,0 +1,10 @@
import { Injectable } from '@angular/core';
import { Stock } from '../Models/stock.model';
@Injectable({
providedIn: 'root'
})
export class HelperService {
constructor() { }
}

6
frontend/src/app/Models/stock.model.ts Normal file
View File

@ -0,0 +1,6 @@
export class Stock {
count = 0;
price = 0;
symbol = '';
time = '';
}

9
frontend/src/app/Services/auth.service.ts
View File

@ -11,18 +11,19 @@ const httpOptions = {
})
export class AuthService {
constructor(private http: HttpClient) {}
login(username: string, password: string): Observable<any> {
login(email: string, password: string): Observable<any> {
return this.http.post(AUTH_API + '/login', {
username,
email,
password,
});
}
register(username: string, password: string): Observable<any> {
register(email: string, username: string, password: string): Observable<any> {
return this.http.post(
AUTH_API + '/register',
{
username,
email,
password,
username,
},
httpOptions
);

36
frontend/src/app/Services/data.service.ts
View File

@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Injectable, OnInit } from '@angular/core';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';
import { delay, Observable } from 'rxjs';
import { TokenStorageService } from './token.service';
const API_URL = 'https://aktienbot.flokaiser.com/api/';
@Injectable({
@ -12,26 +12,32 @@ export class DataService {
private tokenStorage: TokenStorageService
) {}
headers = new HttpHeaders({
public getStockData(): Observable<any> {
return this.http.get(API_URL + 'portfolio', {
headers: new HttpHeaders({
'Content-Type': 'application/json',
Authorization: 'Bearer ' + this.tokenStorage.getToken(),
});
async getStockData() {
await this.http
.get(API_URL + 'portfolio', {
headers: this.headers,
}),
responseType: 'text',
})
.subscribe((data) => {
console.log(data);
return data;
});
}
getKeywords(): Observable<any> {
public getTransactionData(): Observable<any> {
return this.http.get(API_URL + 'transactions', {
headers: new HttpHeaders({
'Content-Type': 'application/json',
Authorization: 'Bearer ' + this.tokenStorage.getToken(),
}),
responseType: 'text',
});
}
public getKeywords(): Observable<any> {
return this.http.get(API_URL + 'keywords', {
headers: this.headers,
headers: new HttpHeaders({
'Content-Type': 'application/json',
Authorization: 'Bearer ' + this.tokenStorage.getToken(),
}),
responseType: 'text',
});
}

34
frontend/src/app/Views/dashboard/dashboard.component.html
View File

@ -64,7 +64,39 @@
<div class="heading fix-right-side">
<div class="vertical-center">Transaktionen</div>
</div>
<mat-card class="placeholder"></mat-card>
<div class="stockTable">
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
<!--- Note that these columns can be defined in any order.
The actual rendered columns are set as a property on the row definition" -->
<!-- Position Column -->
<ng-container matColumnDef="position">
<th mat-header-cell *matHeaderCellDef>Count</th>
<td mat-cell *matCellDef="let element">{{ element.position }}</td>
</ng-container>
<!-- Name Column -->
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef>Pirce</th>
<td mat-cell *matCellDef="let element">{{ element.name }}</td>
</ng-container>
<!-- Weight Column -->
<ng-container matColumnDef="weight">
<th mat-header-cell *matHeaderCellDef>Symbol</th>
<td mat-cell *matCellDef="let element">{{ element.weight }}</td>
</ng-container>
<!-- Symbol Column -->
<ng-container matColumnDef="symbol">
<th mat-header-cell *matHeaderCellDef>Time</th>
<td mat-cell *matCellDef="let element">{{ element.symbol }}</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
</table>
</div>
</div>
</mat-grid-tile>
</mat-grid-list>

15
frontend/src/app/Views/dashboard/dashboard.component.ts
View File

@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { throwToolbarMixedModesError } from '@angular/material/toolbar';
import { DataService } from 'src/app/Services/data.service';
import { TokenStorageService } from 'src/app/Services/token.service';
export interface PeriodicElement {
name: string;
@ -49,11 +50,15 @@ const ELEMENT_DATA: PeriodicElement[] = [
})
export class DashboardComponent implements OnInit {
constructor(private dataService: DataService) {}
//TODO avoid using ngOnInit() like this
//TODO fix server problems
async ngOnInit() {
const data = await this.dataService.getStockData();
ngOnInit() {
this.dataService.getStockData().subscribe((response: any) => {
console.log(response);
//TODO map data on array for display
});
this.dataService.getTransactionData().subscribe((response: any) => {
console.log(response);
//TODO map data on array for display
});
}
displayedColumns: string[] = ['position', 'name', 'weight', 'symbol'];

22
frontend/src/app/Views/login/login.component.html
View File

@ -14,21 +14,21 @@
class="backgorund"
>
<div class="form-group">
<label for="username">Username</label>
<label for="email">Email</label>
<input
type="text"
type="email"
class="form-control"
name="username"
[(ngModel)]="form.username"
name="email"
[(ngModel)]="form.email"
required
#username="ngModel"
email
#email="ngModel"
/>
<div
class="alert alert-danger"
role="alert"
*ngIf="username.errors && f.submitted"
>
Username is required!
<div class="alert-danger" *ngIf="email.errors && f.submitted">
<div *ngIf="email.errors?.['required']">Email is required</div>
<div *ngIf="email.errors?.['email']">
Email must be a valid email address
</div>
</div>
</div>
<div class="form-group">

10
frontend/src/app/Views/login/login.component.ts
View File

@ -10,7 +10,7 @@ import { Router } from '@angular/router';
})
export class LoginComponent implements OnInit {
form: any = {
username: null,
email: null,
password: null,
};
isLoggedIn = false;
@ -29,7 +29,7 @@ export class LoginComponent implements OnInit {
private router: Router
) {}
//ngOnInit() checks if a
//ngOnInit() checks if a user is logged in
ngOnInit(): void {
this.tokenStorage.signOut();
if (this.tokenStorage.getToken()) {
@ -39,15 +39,15 @@ export class LoginComponent implements OnInit {
//onSubmit() saves valuable information in session storage
onSubmit(): void {
const { username, password } = this.form;
this.authService.login(username, password).subscribe(
const { email, password } = this.form;
this.authService.login(email, password).subscribe(
(data) => {
this.tokenStorage.saveToken(data.data.token);
this.tokenStorage.saveUser(data.data);
this.isLoginFailed = false;
this.isLoggedIn = true;
this.accountName = username;
this.accountName = email;
this.router.navigate(['']);
},
(err) => {

18
frontend/src/app/Views/register/register.component.html
View File

@ -35,6 +35,24 @@
</div>
</div>
</div>
<div class="form-group">
<label for="email">Email</label>
<input
type="email"
class="form-control"
name="email"
[(ngModel)]="form.email"
required
email
#email="ngModel"
/>
<div class="alert-danger" *ngIf="email.errors && f.submitted">
<div *ngIf="email.errors?.['required']">Email is required</div>
<div *ngIf="email.errors?.['email']">
Email must be a valid email address
</div>
</div>
</div>
<div class="form-group">
<label for="password">Password</label>
<input

7
frontend/src/app/Views/register/register.component.ts
View File

@ -9,8 +9,9 @@ import { AuthService } from '../../Services/auth.service';
})
export class RegisterComponent implements OnInit {
form: any = {
username: null,
email: null,
password: null,
username: null,
};
isSuccessful = false;
isSignUpFailed = false;
@ -23,8 +24,8 @@ export class RegisterComponent implements OnInit {
constructor(private authService: AuthService, private router: Router) {}
ngOnInit(): void {}
onSubmit(): void {
const { username, password } = this.form;
this.authService.register(username, password).subscribe(
const { email, username, password } = this.form;
this.authService.register(email, username, password).subscribe(
(data) => {
this.isSuccessful = true;
this.isSignUpFailed = false;

1
frontend/src/index.html
View File

@ -5,7 +5,6 @@
<title>Aktienbot</title>
<base href="/" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" type="image/x-icon" href="frontend/Aktienbot/src/favicon.ico" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap"