From 95a524dd04776fe4a4063ccdfa1b766853f7c1d8 Mon Sep 17 00:00:00 2001
From: kevinpauer <kevinpauer@t-online.de>
Date: Sat, 19 Mar 2022 23:02:47 +0100
Subject: [PATCH] Fix token storage

---
 frontend/src/app/Services/data.service.ts     | 27 ++++++++++++-------
 .../src/app/Views/login/login.component.ts    |  6 ++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/frontend/src/app/Services/data.service.ts b/frontend/src/app/Services/data.service.ts
index bcf65c0..45e6617 100644
--- a/frontend/src/app/Services/data.service.ts
+++ b/frontend/src/app/Services/data.service.ts
@@ -1,20 +1,29 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { TokenStorageService } from './token.service';
 const API_URL = 'https://aktienbot.flokaiser.com/api/';
-const httpOptions = {
-  headers: new HttpHeaders({
-    'Content-Type': 'application/json',
-    Authorization: 'Bearer',
-  }),
-};
 @Injectable({
   providedIn: 'root',
 })
 export class DataService {
-  constructor(private http: HttpClient) {}
-  getPublicContent(): Observable<any> {
-    return this.http.get(API_URL + 'portfolio', { responseType: 'text' });
+  constructor(
+    private http: HttpClient,
+    private tokenStorage: TokenStorageService
+  ) {}
+
+  httpOptions = {
+    headers: new HttpHeaders({
+      'Content-Type': 'application/json',
+      Authorization: 'Bearer' + this.tokenStorage.getToken(),
+    }),
+  };
+
+  getStockData(): Observable<any> {
+    return this.http.get(API_URL + 'portfolio', {
+      headers: this.httpOptions.headers,
+      responseType: 'text',
+    });
   }
 
   showStorage() {
diff --git a/frontend/src/app/Views/login/login.component.ts b/frontend/src/app/Views/login/login.component.ts
index 9b5bfb5..420e0b2 100644
--- a/frontend/src/app/Views/login/login.component.ts
+++ b/frontend/src/app/Views/login/login.component.ts
@@ -31,16 +31,14 @@ export class LoginComponent implements OnInit {
   }
   onSubmit(): void {
     const { username, password } = this.form;
-    console.log(username, password);
     this.authService.login(username, password).subscribe(
       (data) => {
-        this.tokenStorage.saveToken(data.accessToken);
-        this.tokenStorage.saveUser(data);
+        this.tokenStorage.saveToken(data.data.token);
+        this.tokenStorage.saveUser(data.data);
 
         this.isLoginFailed = false;
         this.isLoggedIn = true;
         this.accountName = username;
-        console.log(this.isLoggedIn);
         this.router.navigate(['']);
       },
       (err) => {