Revize 2c5da396

Re #8469 - Improvment security - implementace

• authGuard and roleGuard final version
  + usage of localStorage for fields
  + loading properties form cookies to state

src/app/auth/services/auth.service.ts

@@ -1 +1 @@
 import {Injectable} from '@angular/core';
 import {HttpClient, HttpResponse} from '@angular/common/http';
-import {Observable, of, pipe} from 'rxjs';
+import {Observable, of} from 'rxjs';
 import {catchError, mapTo, tap} from 'rxjs/operators';
 import {Router} from '@angular/router';
 import {CookieService} from 'ngx-cookie-service';
 import {UserState} from '../states/user.state';
 import {LoginService} from '../../shared/api/endpoints/services/login.service';
 import {UserInfo} from '../../shared/api/endpoints/models/user-info';
-import {Group} from '../../shared/api/endpoints/models/group';
+import {User} from '../models/user';
+import {GlobalVariable} from '../../globals';
 
 @Injectable({
   providedIn: 'root'
@@ -23 +24 @@
   ) {
   }
 
+  setFromCookie() {
+    const user: User = {
+      userInfo: {
+        rights: JSON.parse(localStorage.getItem(GlobalVariable.RIGHTS)),
+        language: this.cookieService.get(GlobalVariable.LANGUAGE),
+        audio: JSON.parse(this.cookieService.get(GlobalVariable.AUDIO)),
+        sessionid: this.cookieService.get(GlobalVariable.SESSION_ID)
+      },
+      userName: localStorage.getItem(GlobalVariable.USER_NAME),
+      isLoggedIn: true
+    }
+    this.userState.setUser(user);
+  }
+
+  getUser() {
+    console.log('Auth Service', this.userState.getUser());
+    if (!this.userState.getUser() && this.cookieService.get(GlobalVariable.SESSION_ID)) {
+      console.log('Session in cookie!');
+      this.setFromCookie();
+    }
+    return this.userState.getUser();
+  }
+
+  getUserState(): Observable<User> {
+    return this.userState.getUser$();
+  }
+
   doLogin(loginInput): Observable<boolean> {
     return this.loginService.login$Response(loginInput)
       .pipe(
-        tap((userInfo: HttpResponse<UserInfo>) => this.setUserFromResponse(userInfo.body, loginInput)),
+        tap((userInfo: HttpResponse<UserInfo>) => this.setUserFromResponse(userInfo.body, loginInput.username)),
         mapTo(true),
         catchError(() => {
           return of<boolean>(false);
@@ -34 +62 @@
       );
   }
 
-  getUserState(): Observable<UserInfo> {
-    return this.userState.getUser$();
-  }
-
-  getIsLoggedIn(): boolean {
-    return this.userState.getLoggedIn();
-  }
-
-  setUserFromResponse(userInfo: UserInfo, loginInput): UserInfo {
-    this.userState.setUser(userInfo);
-    this.userState.setLoggedIn(true);
-    sessionStorage.setItem('userName', loginInput.username)
-    sessionStorage.setItem('sessionid', userInfo.sessionid)
-    sessionStorage.setItem('language', userInfo.language)
-    sessionStorage.setItem('audio', String(userInfo.audio))
-    this.cookieService.set('userName', loginInput.username)
+  setUserFromResponse(userInfo: UserInfo, username): UserInfo {
+    console.log('Setting user from login!');
+    this.userState.setUser({
+      userInfo,
+      isLoggedIn: true,
+      userName: username
+    });
+    this.setSessionStorage(userInfo, username);
     return userInfo;
   }
 
   doLogout() {
+    this.userState.setUser(null);
     this.cookieService.deleteAll();
+    localStorage.clear();
+    this.router.navigate(['/login']);
   }
 
-  getUserRoles(): Group[] {
-    return this.userState.getUserGroups();
+  setSessionStorage(userInfo: UserInfo, username) {
+    localStorage.setItem(GlobalVariable.USER_NAME, username)
+    // TODO - get rights from response
+    // localStorage.setItem('rights', userInfo.rights.toString());
+    localStorage.setItem(GlobalVariable.RIGHTS, '1');
   }
 }