Merge branch 'redesign' into 'master'

merge

See merge request igrannonica/neuronstellar!29

1 files changed, 16 insertions, 14 deletions

diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index 9e3f9f2f..cc5ad688 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -3,7 +3,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
 import shared from '../Shared';
-import { Configuration } from '../configuration.service';
+import { Configuration } from './configuration.service';
 
 const jwtHelper = new JwtHelperService();
 
@@ -12,9 +12,8 @@ const jwtHelper = new JwtHelperService();
 })
 export class AuthService {
 
-  public loggedInEvent: EventEmitter<boolean> = new EventEmitter();
-
   shared = shared;
+  public loggedInEvent: EventEmitter<boolean> = new EventEmitter();
 
   constructor(private http: HttpClient, private cookie: CookieService) { }
 
@@ -23,7 +22,7 @@ export class AuthService {
   }
 
   register(user: any) {
-    return this.http.post(`${Configuration.settings.apiURL}/auth/register`, { ...user }, { responseType: 'text' });
+    return this.http.post(`${Configuration.settings.apiURL}/auth/register`, { ...user },{ headers: this.authHeader() , responseType: 'text' });
   }
 
   getGuestToken() {
@@ -53,26 +52,19 @@ export class AuthService {
     }
     var property = jwtHelper.decodeToken(this.cookie.get('token'));
     var username = property['name'];
-    if (username != "") {
 
       this.refresher = setTimeout(() => {
         this.http.post(`${Configuration.settings.apiURL}/auth/renewJwt`, {}, { headers: this.authHeader(), responseType: 'text' }).subscribe((response) => {
           this.authenticate(response);
         });
       }, exp.getTime() - new Date().getTime() - 60000);
-    }
-    else {
-      this.refresher = setTimeout(() => {
-        this.getGuestToken().subscribe((response) => {
-          this.authenticate(response);
-        });
-      }, exp.getTime() - new Date().getTime() - 60000);
-    }
+  
   }
 
   addGuestToken() {
     this.getGuestToken().subscribe((token) => {
       this.authenticate(token);
+      location.reload();
     });
   }
 
@@ -83,7 +75,6 @@ export class AuthService {
     }
     this.cookie.set('token', token, exp);
     this.updateUser();
-    this.loggedInEvent.emit(true);
   }
 
   updateUser() {
@@ -108,4 +99,15 @@ export class AuthService {
   authHeader() {
     return new HttpHeaders().set("Authorization", "Bearer " + this.cookie.get('token'));
   }
+  alreadyGuest(){
+    if(this.cookie.check('token')){
+      const token = this.cookie.get('token');
+      const decodedToken = jwtHelper.decodeToken(token);
+      if(decodedToken.role=="Guest")
+        return true;
+    }
+    return false;
+  }
+
+
 }