4 files changed, 48 insertions, 21 deletions
diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index 449b8802..ccfbe15f 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -24,10 +24,16 @@ export class AuthService {
     return this.http.post(`${API_SETTINGS.apiURL}/auth/register`, { ...user }, { responseType: 'text' });
   }
 
+  getGuestToken(){
+    return this.http.post(`${API_SETTINGS.apiURL}/auth/guestToken`, {}, { responseType: 'text' });
+  }
+
   isAuthenticated(): boolean {
     if (this.cookie.check('token')) {
       var token = this.cookie.get('token');
-      return !jwtHelper.isTokenExpired(token);
+      var property=jwtHelper.decodeToken(this.cookie.get('token'));
+      var username=property['name'];
+      return !jwtHelper.isTokenExpired(token) && username!="";
     }
     return false;
   }
@@ -41,12 +47,30 @@ export class AuthService {
     if (!exp) {
       exp = new Date();
     }
-    this.refresher = setTimeout(() => {
-      console.log('refreshing token!');
-      this.http.post(`${API_SETTINGS.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => {
-        this.authenticate(response);
-      });
-    }, exp.getTime() - new Date().getTime() - 60000);
+    var property=jwtHelper.decodeToken(this.cookie.get('token'));
+    var username=property['name'];
+    if(username!=""){
+      this.refresher = setTimeout(() => {
+        console.log('refreshing token!');
+        this.http.post(`${API_SETTINGS.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => {
+          this.authenticate(response);
+        });
+      }, exp.getTime() - new Date().getTime() - 60000);
+    }
+    else{
+      this.refresher = setTimeout(() => {
+        console.log('refreshing token!');
+        this.getGuestToken().subscribe((response) => {
+          this.authenticate(response);
+        });
+      }, exp.getTime() - new Date().getTime() - 60000);
+    }
+  }
+
+  addGuestToken(){
+    this.getGuestToken().subscribe((token)=>{
+      this.authenticate(token);
+    });
   }
 
   authenticate(token: string) {
@@ -74,6 +98,7 @@ export class AuthService {
     if (this.refresher)
       clearTimeout(this.refresher);
     this.shared.loggedIn = false;
+    this.addGuestToken();
   }
 
   authHeader() {
diff --git a/frontend/src/app/_services/datasets.service.ts b/frontend/src/app/_services/datasets.service.ts
index 35ca24e5..0ff63828 100644
--- a/frontend/src/app/_services/datasets.service.ts
+++ b/frontend/src/app/_services/datasets.service.ts
@@ -16,7 +16,11 @@ export class DatasetsService {
     return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/dataset/publicdatasets`, { headers: this.authService.authHeader() });
   }
 
-  addDataset(dataset: Dataset): any {
+  getMyDatasets(): Observable<Dataset[]> {
+    return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/dataset/mydatasets`, { headers: this.authService.authHeader() });
+  }
+
+  addDataset(dataset: Dataset): Observable<any> {
     return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
   }
 
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 74253fac..3fbad109 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -1,10 +1,10 @@
-import { HttpClient, HttpParams, HttpRequest } from '@angular/common/http';
+import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import Model from '../_data/Model';
 import { AuthService } from './auth.service';
 import { API_SETTINGS } from 'src/config';
-import Dataset from '../_data/Dataset';
 import { Observable } from 'rxjs';
+import Dataset from '../_data/Dataset';
 
 
 @Injectable({
@@ -35,25 +35,23 @@ export class ModelsService {
   addDataset(dataset: Dataset): Observable<any> {
     return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
   }
-  trainModel(modelId: string): Observable<any> {
-    return this.http.post(`${API_SETTINGS.apiURL}/model/train`, modelId, { headers: this.authService.authHeader() });
+  trainModel(model: Model): Observable<any> {
+    return this.http.post(`${API_SETTINGS.apiURL}/model/sendmodel`, model, { headers: this.authService.authHeader(), responseType: 'text' });
   }
 
   getMyDatasets(): Observable<Dataset[]> {
     return this.http.get<Dataset[]>(`${API_SETTINGS.apiURL}/dataset/mydatasets`, { headers: this.authService.authHeader() });
   }
-  
+
   getMyModels(): Observable<Model[]> {
     return this.http.get<Model[]>(`${API_SETTINGS.apiURL}/model/mymodels`, { headers: this.authService.authHeader() });
   }
 
-  editModel(model:Model) : Observable<Model>
-  {
+  editModel(model: Model): Observable<Model> {
     return this.http.put<Model>(`${API_SETTINGS.apiURL}/model/`, model, { headers: this.authService.authHeader() });
   }
 
-  deleteModel(model:Model) 
-  {
-    return this.http.delete(`${API_SETTINGS.apiURL}/model/`+model.name, { headers: this.authService.authHeader(), responseType : "text" });
+  deleteModel(model: Model) {
+    return this.http.delete(`${API_SETTINGS.apiURL}/model/` + model.name, { headers: this.authService.authHeader(), responseType: "text" });
   }
 }
diff --git a/frontend/src/app/_services/web-socket.service.ts b/frontend/src/app/_services/web-socket.service.ts
index 890ada6b..1a7efa87 100644
--- a/frontend/src/app/_services/web-socket.service.ts
+++ b/frontend/src/app/_services/web-socket.service.ts
@@ -13,15 +13,15 @@ export class WebSocketService {
 
   constructor() {
     this.ws = new WebsocketBuilder(API_SETTINGS.apiWSUrl)
-      .withBackoff(new ConstantBackoff(30000))
-      .onOpen((i, e) => { console.log('WS: Connected to ' + API_SETTINGS.apiWSUrl) })
+      .withBackoff(new ConstantBackoff(120000))
+      .onOpen((i, e) => { /*console.log('WS: Connected to ' + API_SETTINGS.apiWSUrl)*/ })
       .onMessage((i, e) => {
         console.log('WS MESSAGE: ', e.data);
         this.handlers.forEach(handler => {
           handler(e.data);
         })
       })
-      .onClose((i, e) => { console.log('WS: Connection closed!') })
+      .onClose((i, e) => { /*console.log('WS: Connection closed!')*/ })
       .build();
   }