4 files changed, 90 insertions, 1 deletions
diff --git a/frontend/src/app/_services/auth-guard.service.ts b/frontend/src/app/_services/auth-guard.service.ts
index b6d3678d..057996e0 100644
--- a/frontend/src/app/_services/auth-guard.service.ts
+++ b/frontend/src/app/_services/auth-guard.service.ts
@@ -15,7 +15,7 @@ export class AuthGuardService implements CanActivate {
     if (this.auth.isAuthenticated()) {
       return true;
     }
-    this.router.navigate(['login']);
+    this.router.navigate(['']);
     return false;
   }
 }
diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index c96c2dae..afc1567b 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -3,6 +3,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
 import { API_SETTINGS } from 'src/config';
+import shared from '../Shared';
 
 const jwtHelper = new JwtHelperService();
 
@@ -11,6 +12,8 @@ const jwtHelper = new JwtHelperService();
 })
 export class AuthService {
 
+  shared = shared;
+
   constructor(private http: HttpClient, private cookie: CookieService) { }
 
   login(username: string, password: string) {
@@ -28,4 +31,49 @@ export class AuthService {
     }
     return false;
   }
+
+  lastToken?: string;
+  refresher: any;
+
+  enableAutoRefresh() {
+    this.lastToken = this.cookie.get('token');
+    let exp = jwtHelper.getTokenExpirationDate(this.lastToken);
+    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());
+  }
+
+  authenticate(token: string) {
+    let exp = jwtHelper.getTokenExpirationDate(token);
+    if (!exp) {
+      exp = new Date();
+    }
+    this.cookie.set('token', token, exp);
+    this.updateUser();
+  }
+
+  updateUser() {
+    if (this.cookie.check('token')) {
+      const token = this.cookie.get('token');
+      this.shared.loggedIn = this.isAuthenticated();
+      this.enableAutoRefresh();
+    }
+  }
+
+  logOut() {
+    this.cookie.delete('token');
+    if (this.refresher)
+      clearTimeout(this.refresher);
+    this.shared.loggedIn = false;
+  }
+
+  authHeader() {
+    return new HttpHeaders().set("Authorization", "Bearer " + this.cookie.get('token'));
+  }
 }
diff --git a/frontend/src/app/_services/models.service.spec.ts b/frontend/src/app/_services/models.service.spec.ts
new file mode 100644
index 00000000..b5b25752
--- /dev/null
+++ b/frontend/src/app/_services/models.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ModelsService } from './models.service';
+
+describe('ModelsService', () => {
+  let service: ModelsService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(ModelsService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
new file mode 100644
index 00000000..80dc1ae3
--- /dev/null
+++ b/frontend/src/app/_services/models.service.ts
@@ -0,0 +1,25 @@
+import { HttpClient } 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';
+
+
+@Injectable({
+  providedIn: 'root'
+})
+export class ModelsService {
+
+  constructor(private http: HttpClient, private authService: AuthService) { }
+
+  addModel(model: Model) {
+    return this.http.post(`${API_SETTINGS.apiURL}/model/add`, model, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
+  addDataset(dataset: Dataset) {
+    return this.http.post(`${API_SETTINGS.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
+  trainModel(modelId: string) {
+    return this.http.post(`${API_SETTINGS.apiURL}/model/train`, modelId, { headers: this.authService.authHeader(), responseType: 'text' });
+  }
+}