@trudb/tru-common-lib 0.0.705 → 0.0.708

package/fesm2020/trudb-tru-common-lib.mjs

@@ -70,7 +70,7 @@ import * as signalR from '@microsoft/signalr';
 import moment$1 from 'moment';
 import * as i8 from 'ag-grid-angular';
 import { AgGridModule } from 'ag-grid-angular';
-import { tap, switchMap, catchError } from 'rxjs/operators';
+import { tap, catchError } from 'rxjs/operators';
 import * as i1$6 from '@angular/router';
 import { RouterModule } from '@angular/router';
 import * as i1$7 from '@angular/platform-browser';
@@ -3678,9 +3678,6 @@ const TRU_AUTH_CONFIG = {
 };
 const TRU_AUTH_STRATEGY = new InjectionToken("AuthStrategy");
 
-class TruAuthUserRequest {
-}
-
 class TruAuthCache {
     constructor() {
         this.prunables = [];
@@ -3711,21 +3708,28 @@ class TruAuth {
         this.auth = auth;
         this.loggedIn = new BehaviorSubject(false);
         this.baseUrl = '';
-        this.createUserRequest = (username) => {
-            let truUser = new TruAuthUserRequest();
-            truUser.username = username;
-            return truUser;
-        };
         this.baseUrl = this.appEnvironment.appUri;
     }
     login(loginRequest) {
         return this.http
             .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
-            .pipe(tap((tokenData) => this.tokenData = tokenData), switchMap(() => this.http.post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/user`, this.createUserRequest(loginRequest.username)).pipe(tap((userData) => {
-            this.auth.doLoginUser(this.tokenData);
-            this.user.create(userData);
+            .pipe(tap((tokenData) => {
+            this.auth.doLoginUser(tokenData);
             this.loggedIn.next(true);
-        }))));
+        }));
+    }
+    setUser() {
+        let jwtData = this.auth.getDecodedJwtJsonData();
+        console.log(jwtData);
+        let user = {
+            activeUserRef: jwtData.UserRef,
+            firstName: jwtData.FirstName,
+            lastName: jwtData.LastName,
+            email: jwtData.Email,
+            username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
+            roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
+        };
+        this.user.create(user);
     }
     logout() {
         this.doLogoutUser();
@@ -5988,6 +5992,16 @@ class TruAuthJwtStrategy {
     getJwtToken() {
         return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
     }
+    getDecodedJwtJsonData() {
+        let token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
+        let payload = {};
+        if (token && token !== "undefined") {
+            const encodedPayload = token.split(".")[1];
+            const payloadStr = window.atob(encodedPayload);
+            payload = JSON.parse(payloadStr);
+        }
+        return payload;
+    }
     getToken() {
         var token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
         if (token && token !== "undefined") {
@@ -6048,16 +6062,10 @@ class TruAuthSessionStrategy {
     doLogoutUser() {
         this.loggedUser = undefined;
     }
-    getCurrentUser() {
-        if (this.loggedUser) {
-            return of(this.loggedUser);
-        }
-        else {
-            return this.http
-                .get(`${TRU_AUTH_CONFIG.authUrl}/user`)
-                .pipe(tap((user) => (this.loggedUser = user)));
-        }
+    getDecodedJwtJsonData() {
+        return {};
     }
+    ;
     isLoggedIn() {
         return false; //todo, implement this
     }