@trudb/tru-common-lib 0.0.711 → 0.0.715

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

@@ -3720,26 +3720,20 @@ class TruAuth {
     login(loginRequest) {
         return this.http
             .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/login`, loginRequest)
-            .pipe(tap((tokenData) => {
-            this.auth.doLoginUser(tokenData);
+            .pipe(tap((data) => {
+            this.auth.doLoginUser(data);
             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);
+        this.auth.setUser(this.user);
     }
-    logout() {
-        this.doLogoutUser();
+    logout(logoutRequest) {
+        return this.http
+            .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, logoutRequest)
+            .pipe(tap(() => {
+            this.doLogoutAndRedirectToLogin();
+        }));
     }
     get isLoggedIn() {
         if (!this.loggedIn.value) {
@@ -3782,7 +3776,7 @@ class TruToolbarUserProfile {
             this.uiNotification.changePassword();
         };
         this.onLogoutButtonClicked = () => {
-            this.auth.doLogoutAndRedirectToLogin();
+            this.auth.logout({ username: this.user.username });
         };
         this.initial = user?.firstName ? user?.firstName.slice(0, 1).toUpperCase() : user?.username?.slice(0, 1).toUpperCase();
         this.name = user?.firstName && user?.lastName ? user?.firstName + ' ' + user?.lastName : user?.username;
@@ -5996,6 +5990,19 @@ class TruAuthJwtStrategy {
     isLoggedIn() {
         return !!this.getJwtToken();
     }
+    setUser(user) {
+        let jwtData = this.getDecodedJwtJsonData();
+        console.log(jwtData);
+        let userData = {
+            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']
+        };
+        user.create(userData);
+    }
     getJwtToken() {
         return JSON.parse(localStorage.getItem(this.JWT_ACCESS_TOKEN));
     }
@@ -6027,14 +6034,33 @@ class TruAuthJwtStrategy {
     }
 }
 
+class TruAuthSessionStrategy {
+    constructor(http) {
+        this.http = http;
+    }
+    doLoginUser(user) {
+        this.loggedUser = user;
+    }
+    doLogoutUser() {
+        this.loggedUser = undefined;
+    }
+    setUser(user) {
+    }
+    isLoggedIn() {
+        return false; //todo, implement this
+    }
+}
+
 // import { ConfigService } from "../config.service";
 class TruAuthInterceptor {
-    constructor(auth, jwt) {
+    constructor(auth, appEnvironment, jwt, session) {
         this.auth = auth;
+        this.appEnvironment = appEnvironment;
         this.jwt = jwt;
+        this.session = session;
     }
     intercept(request, next) {
-        if (TRU_AUTH_CONFIG.auth === "token" && this.jwt && this.jwt.getToken()) {
+        if (this.appEnvironment.authType === 'jwt') {
             request = this.addToken(request, String(this.jwt.getToken()));
         }
         return next.handle(request).pipe(catchError((error) => {
@@ -6050,34 +6076,18 @@ class TruAuthInterceptor {
         });
     }
 }
-TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
+TruAuthInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TruAppEnvironment }, { token: TRU_AUTH_STRATEGY }, { token: TRU_AUTH_STRATEGY }], target: i0.ɵɵFactoryTarget.Injectable });
 TruAuthInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: TruAuth }, { type: TruAuthJwtStrategy, decorators: [{
+        }], ctorParameters: function () { return [{ type: TruAuth }, { type: TruAppEnvironment }, { type: TruAuthJwtStrategy, decorators: [{
+                    type: Inject,
+                    args: [TRU_AUTH_STRATEGY]
+                }] }, { type: TruAuthSessionStrategy, decorators: [{
                     type: Inject,
                     args: [TRU_AUTH_STRATEGY]
                 }] }]; } });
 
-class TruAuthSessionStrategy {
-    constructor(http) {
-        this.http = http;
-    }
-    doLoginUser(user) {
-        this.loggedUser = user;
-    }
-    doLogoutUser() {
-        this.loggedUser = undefined;
-    }
-    getDecodedJwtJsonData() {
-        return {};
-    }
-    ;
-    isLoggedIn() {
-        return false; //todo, implement this
-    }
-}
-
 const TruAuthStrategyProvider = {
     provide: TRU_AUTH_STRATEGY,
     deps: [HttpClient, TruAppEnvironment],