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

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 3 insertions, 1 deletions

diff --git a/frontend/src/app/_services/auth.service.ts b/frontend/src/app/_services/auth.service.ts
index 20ff45f3..449b8802 100644
--- a/frontend/src/app/_services/auth.service.ts
+++ b/frontend/src/app/_services/auth.service.ts
@@ -61,8 +61,10 @@ export class AuthService {
   updateUser() {
     if (this.cookie.check('token')) {
       const token = this.cookie.get('token');
+      const decodedToken = jwtHelper.decodeToken(token);
+      console.log("decoded:", decodedToken);
       this.shared.loggedIn = this.isAuthenticated();
-      this.shared.username = jwtHelper.decodeToken(token).name;
+      this.shared.username = decodedToken.name;
       this.enableAutoRefresh();
     }
   }