@trudb/tru-common-lib 0.0.723 → 0.0.725

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

@@ -3726,7 +3726,7 @@ class TruAuth {
         }));
     }
     setUser() {
-        this.auth.setUser(this.user);
+        this.auth.createUser(this.user);
     }
     logout() {
         this.http
@@ -3735,11 +3735,16 @@ class TruAuth {
         });
     }
     userClaims() {
-        return this.http
-            .get(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/userClaims`)
-            .pipe(tap((userClaims) => {
-            this.user.create(userClaims);
-        }));
+        if (this.appEnvironment.authType === 'session') {
+            return this.http
+                .get(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/userClaims`)
+                .pipe(tap((userClaims) => {
+                this.user.create(userClaims);
+            }));
+        }
+        else {
+            return this.auth.createUser(this.user);
+        }
     }
     get isLoggedIn() {
         if (!this.loggedIn.value) {
@@ -5996,7 +6001,7 @@ class TruAuthJwtStrategy {
     isLoggedIn() {
         return !!this.getJwtToken();
     }
-    setUser(user) {
+    createUser(user) {
         let jwtData = this.getDecodedJwtJsonData();
         console.log(jwtData);
         let userData = {
@@ -6007,7 +6012,7 @@ class TruAuthJwtStrategy {
             username: jwtData['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name'],
             roles: jwtData['http://schemas.microsoft.com/ws/2008/06/identity/claims/role']
         };
-        user.create(userData);
+        return of(user.create(userData));
     }
     getJwtToken() {
         try {
@@ -6018,7 +6023,7 @@ class TruAuthJwtStrategy {
         }
     }
     getDecodedJwtJsonData() {
-        let token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
+        let token = this.getJwtToken();
         let payload = {};
         if (token && token !== "undefined") {
             const encodedPayload = token.split(".")[1];
@@ -6028,7 +6033,7 @@ class TruAuthJwtStrategy {
         return payload;
     }
     getToken() {
-        var token = JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
+        var token = this.getJwtToken();
         if (token && token !== "undefined") {
             const encodedPayload = token.split(".")[1];
             const payloadStr = window.atob(encodedPayload);
@@ -6090,7 +6095,8 @@ class TruAuthSessionStrategy {
     doLogoutUser() {
         this.loggedUser = undefined;
     }
-    setUser(user) {
+    createUser(user) {
+        return of({});
     }
     isLoggedIn() {
         return false; //todo, implement this