Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

1 files changed, 2 insertions, 0 deletions

diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index ccfbe15f..a108f8db 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -33,6 +33,7 @@ export class AuthService {
       var token = this.cookie.get('token');
       var property=jwtHelper.decodeToken(this.cookie.get('token'));
       var username=property['name'];
+      var userId = property['id'];
       return !jwtHelper.isTokenExpired(token) && username!="";
     }
     return false;
@@ -89,6 +90,7 @@ export class AuthService {
       console.log("decoded:", decodedToken);
       this.shared.loggedIn = this.isAuthenticated();
       this.shared.username = decodedToken.name;
+      this.shared.userId = decodedToken.id;
       this.enableAutoRefresh();
     }
   }