fixed authentication bug

src/app/components/body/about/about.component.html

@@ -1,6 +1,7 @@
 <mat-card>
 
   <mat-card-content *ngIf="whatAbout === 'general'">
+
     <br>
     <p>
       This System was built in the process of the research conducted by the Author Ahmad Shallouf for his Master Thesis
@@ -34,6 +35,7 @@
       <tr>
         <td><button mat-button routerLink="/control" style="color: white">control panel</button></td>
       </tr>
+
     </table>
 
   </mat-card-content>

src/app/components/body/submitting/submitting.component.ts

@@ -98,8 +98,6 @@ export class SubmittingComponent implements OnInit{
   }
 
   onFileSelected(event : any) {
-    console.log(event);
-    console.log(event.target.files[0]);
     const file: File = event.target.files[0];
     if (file) {
       this.chosenFileName = file.name;

src/app/state_management/services/app-state.service.ts

@@ -26,7 +26,6 @@ export class AppStateService {
 
   constructor(public http: HttpClient,
               public authService: AuthenticationService) {
-    console.log('AppStateService created');
     console.log(this._apiUrl)
     this.updateTasks();
     this.updateDatasets();
@@ -60,7 +59,6 @@ export class AppStateService {
     isPublic: boolean,
     fileContent: string
   ) : Observable<Object> {
-    console.log(fileContent);
     return this.http.post(this._apiUrl + '/submission/' + task + '/' + dataset, {
       modelName: modelName,
       modelLink: modelLink,
@@ -125,7 +123,16 @@ export class AppStateService {
 
   public updateControlPanel() {
     const headers = this.authService.getAuthHeaders();
-    this.http.get(`${this._apiUrl}/controlPanelSubmissions`, { headers }).subscribe(
+    this.http.get(`${this._apiUrl}/controlPanelSubmissions`, { headers }).pipe(
+      catchError(error => {
+          if (error.status === 401) {
+            this.authService.logout();
+          }
+          console.log(error);
+          return error;
+        }
+      ))
+      .subscribe(
       (data: any) => {
         this._setState({
           ...this.getState(),
@@ -137,19 +144,30 @@ export class AppStateService {
 
   public forceUpdateSubmission(entry: any){
     const headers = this.authService.getAuthHeaders();
-    this.http.put(`${this._apiUrl}/controlPanelSubmission/${entry.id}`, entry, { headers }).subscribe(
-      () => {
-        this.updateControlPanel();
-      }
-    );
+    this.http.put(`${this._apiUrl}/controlPanelSubmission/${entry.id}`, entry, { headers }).pipe(
+      catchError(error => {
+          if (error.status === 401) {
+            this.authService.logout();
+          }
+          console.log(error);
+          return error;
+        }
+      ))
+      .subscribe(
+        () => {
+          this.updateControlPanel();
+        }
+      );
   }
 
   public deleteSubmission(id: number){
     const headers = this.authService.getAuthHeaders();
-    console.log('Deleting submission with id: ' + id);
     this.http.delete(`${this._apiUrl}/controlPanelSubmission/` + id, { headers })
       .pipe(
         catchError(error => {
+          if (error.status === 401) {
+            this.authService.logout();
+          }
           console.log(error);
           return error;
         }

src/app/state_management/services/authentication.service.ts

@@ -68,7 +68,10 @@ export class AuthenticationService {
     );
   }
 
-  public isAuthenticated(): boolean {
-    return this.token !== null;
+
+  public logout(): void {
+    this.token = null;
+    localStorage.removeItem('auth_token');
+    this.$authStatus.next('');
   }
 }