@trudb/tru-common-lib 0.0.718 → 0.0.720

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

@@ -3728,9 +3728,9 @@ class TruAuth {
     setUser() {
         this.auth.setUser(this.user);
     }
-    logout(logoutRequest) {
+    logout() {
         return this.http
-            .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, logoutRequest)
+            .post(`${this.baseUrl}${TRU_AUTH_CONFIG.authUrl}/logout`, null)
             .pipe(tap(() => {
             this.doLogoutAndRedirectToLogin();
         }));
@@ -3783,7 +3783,7 @@ class TruToolbarUserProfile {
             this.uiNotification.changePassword();
         };
         this.onLogoutButtonClicked = () => {
-            this.auth.logout({ username: this.user.username });
+            this.auth.logout();
         };
         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;
@@ -6041,40 +6041,21 @@ 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, appEnvironment, jwt, session) {
+    constructor(auth, appEnvironment, jwt) {
         this.auth = auth;
         this.appEnvironment = appEnvironment;
         this.jwt = jwt;
-        this.session = session;
     }
     intercept(request, next) {
-        if (this.appEnvironment.authType === 'jwt') {
+        if (this.appEnvironment.authType === 'jwt')
             request = this.addToken(request, String(this.jwt.getToken()));
-        }
-        request = request.clone({
-            withCredentials: true
-        });
+        if (this.appEnvironment.authType === 'session')
+            request = request.clone({
+                withCredentials: true
+            });
         return next.handle(request).pipe(catchError((error) => {
-            if (error.status === 401) {
+            if (error.status === 401 || error.status === 404) {
                 this.auth.doLogoutAndRedirectToLogin();
             }
             return throwError(error);
@@ -6086,18 +6067,32 @@ class TruAuthInterceptor {
         });
     }
 }
-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.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.1", ngImport: i0, type: TruAuthInterceptor, deps: [{ token: TruAuth }, { token: TruAppEnvironment }, { 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: 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;
+    }
+    setUser(user) {
+    }
+    isLoggedIn() {
+        return false; //todo, implement this
+    }
+}
+
 const TruAuthStrategyProvider = {
     provide: TRU_AUTH_STRATEGY,
     deps: [HttpClient, TruAppEnvironment],