@arsedizioni/ars-utils 20.3.65 → 20.4.1

package/clipper.common/index.d.ts

@@ -192,7 +192,6 @@ interface ClipperUserInfo {
 }
 interface ClipperLoginResult extends LoginResult<ClipperUserInfo> {
     settings?: ClipperChannelSettings[];
-    token?: string;
 }
 interface ClipperLoginInfo {
     context?: ClipperUserInfo;
@@ -969,18 +968,6 @@ declare class ClipperAuthInterceptor implements HttpInterceptor {
     private broadcastService;
     private lastErrorTime;
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
-    /**
-     * Handle 401 error
-     * @param request : the request
-     * @param next : the http handler
-     */
-    private handle401Error;
-    /**
-     * Add token to request
-     * @param request : the request
-     * @param token: the token or null to use curre3nt
-     */
-    private addTokenToRequest;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<ClipperAuthInterceptor, never>;
     static ɵprov: _angular_core.ɵɵInjectableDeclaration<ClipperAuthInterceptor>;
 }
@@ -990,7 +977,6 @@ declare class ClipperService implements OnDestroy {
     private broadcastServiceSubscription?;
     private broadcastService;
     private dialogService;
-    private keepAlive;
     private _appUri?;
     get appUri(): string | undefined;
     private _serviceUri;
@@ -1025,30 +1011,9 @@ declare class ClipperService implements OnDestroy {
      */
     initialize(serviceUri: string, appUri?: string, flags?: ClipperServiceFlags): void;
     /**
-   * Get access token expiration date
-   */
-    private getTokenExpirationDate;
-    /**
-   * Set keep alive
-   */
-    private setKeepAlive;
-    /**
-     * Remove keep alive
-     */
-    private removeKeepAlive;
-    /**
    * Ping
    */
     ping(): void;
-    /**
-   * Set JWT tokens
-   * @param value : the login result
-   */
-    private setToken;
-    /**
-     * Return current auth token
-     */
-    getAuthToken(): string | undefined;
     /**
      * Store context
      */
@@ -1102,10 +1067,6 @@ declare class ClipperService implements OnDestroy {
      */
     clear(clearOAuthToken?: boolean): void;
     /**
-    * Perform token refresh
-    */
-    refresh(): rxjs.Observable<ApiResult<ClipperLoginResult>>;
-    /**
    * Initialize channels
    */
     private initializeChannels;

package/core/index.d.ts

@@ -565,7 +565,6 @@ declare class DateInterval {
 interface LoginResult<T> extends ApiResult<boolean> {
     context: T;
     oauth?: number;
-    authToken: string;
     requiresMfa?: boolean;
 }
 

package/evolution.common/index.d.ts

@@ -16,7 +16,6 @@ declare const EvolutionMessages: {
 };
 
 interface EvolutionLoginResult extends LoginResult<EvolutionUserInfo> {
-    token?: string;
 }
 interface EvolutionLoginInfo {
     context: EvolutionUserInfo;
@@ -701,18 +700,6 @@ declare class EvolutionAuthInterceptor implements HttpInterceptor {
     private broadcastService;
     private lastErrorTime;
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
-    /**
-     * Handle 401 error
-     * @param request : the request
-     * @param next : the http handler
-     */
-    private handle401Error;
-    /**
-     * Add token to request
-     * @param request : the request
-     * @param token: the token or null to use curre3nt
-     */
-    private addTokenToRequest;
     static ɵfac: i0.ɵɵFactoryDeclaration<EvolutionAuthInterceptor, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<EvolutionAuthInterceptor>;
 }
@@ -730,7 +717,6 @@ declare class EvolutionService implements OnDestroy {
     get loginInfo(): EvolutionLoginInfo | undefined;
     readonly loggedIn: i0.WritableSignal<boolean>;
     readonly loggingIn: i0.WritableSignal<boolean>;
-    private keepAlive;
     ngOnDestroy(): void;
     /**
      * Initialize service
@@ -739,31 +725,10 @@ declare class EvolutionService implements OnDestroy {
      */
     initialize(serviceUri: string, flags?: EvolutionServiceFlags): void;
     /**
-   * Get access token expiration date
-   */
-    private getTokenExpirationDate;
-    /**
-     * Set keep alive
-     */
-    private setKeepAlive;
-    /**
-     * Remove keep alive
-     */
-    private removeKeepAlive;
-    /**
    * Ping
    */
     ping(): void;
     /**
-  * Set auth token
-  * @param value : the login result
-  */
-    private setToken;
-    /**
-     * Return current auth token
-     */
-    getAuthToken(): string | undefined;
-    /**
     * Store login info
     */
     storeContext(): void;
@@ -820,10 +785,6 @@ declare class EvolutionService implements OnDestroy {
      * @param clearOAuthToken: true to clear oauth token also
      */
     clear(clearOAuthToken?: boolean): void;
-    /**
-    * Perform token refresh
-    */
-    refresh(): rxjs.Observable<ApiResult<EvolutionLoginResult>>;
     /**
      * Convert folders in a tree of Node object.
      * @param folders : the subfolders group or null to root

package/fesm2022/arsedizioni-ars-utils-clipper.common.mjs

@@ -1,8 +1,8 @@
 import * as i0 from '@angular/core';
 import { signal, computed, inject, Injectable, NgModule } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpRequest, HttpErrorResponse } from '@angular/common/http';
 import { BroadcastService, SystemUtils } from '@arsedizioni/ars-utils/core';
-import { EMPTY, throwError, of, catchError as catchError$1, switchMap } from 'rxjs';
+import { EMPTY, throwError, of, catchError as catchError$1 } from 'rxjs';
+import { HttpClient, HttpHeaders, HttpRequest } from '@angular/common/http';
 import { DialogService } from '@arsedizioni/ars-utils/ui';
 import { catchError, finalize, map } from 'rxjs/operators';
 
@@ -1996,7 +1996,6 @@ class ClipperService {
         this.httpClient = inject(HttpClient);
         this.broadcastService = inject(BroadcastService);
         this.dialogService = inject(DialogService);
-        this.keepAlive = 0;
         this._serviceUri = '';
         this._flags = ClipperServiceFlags.None;
         this.loggedIn = signal(sessionStorage.getItem("clipper_oauth_token") !== null, ...(ngDevMode ? [{ debugName: "loggedIn" }] : []));
@@ -2050,7 +2049,6 @@ class ClipperService {
         if (this.broadcastServiceSubscription) {
             this.broadcastServiceSubscription.unsubscribe();
         }
-        this.removeKeepAlive();
     }
     /**
      * Initialize service
@@ -2112,14 +2110,9 @@ class ClipperService {
             });
         }
         // Eveluate current session storage in case of page refresh (F5)
-        const tokenExpirationDate = this.getTokenExpirationDate();
-        const tokenExpired = !tokenExpirationDate || tokenExpirationDate.getTime() < Date.now();
-        if (!tokenExpired || this.loggedIn()) {
+        if (this.loggedIn()) {
             // Auto login
-            this.loggedIn.set(true);
             this.loggingIn.set(false);
-            // Keep alive
-            this.setKeepAlive();
             // Initialize channels
             this.initializeChannels();
             // Notify 
@@ -2127,38 +2120,6 @@ class ClipperService {
         }
     }
     /**
-   * Get access token expiration date
-   */
-    getTokenExpirationDate() {
-        const token = this.getAuthToken();
-        if (!token || token.length === 0)
-            return undefined;
-        // Parse json object from base64 encoded jwt token
-        const jwtToken = JSON.parse(atob(token.split('.')[1]));
-        // Set a timeout to refresh the token a minute before it expires
-        return new Date(jwtToken.exp * 1000);
-    }
-    /**
-   * Set keep alive
-   */
-    setKeepAlive() {
-        // Keep alive every 1 min
-        if (this.keepAlive === 0) {
-            this.keepAlive = window.setInterval(() => {
-                this.ping();
-            }, 1000 * 60 * 5);
-        }
-    }
-    /**
-     * Remove keep alive
-     */
-    removeKeepAlive() {
-        if (this.keepAlive > 0) {
-            window.clearInterval(this.keepAlive);
-            this.keepAlive = 0;
-        }
-    }
-    /**
    * Ping
    */
     ping() {
@@ -2166,25 +2127,6 @@ class ClipperService {
             .pipe(catchError(() => { return EMPTY; }))
             .subscribe();
     }
-    /**
-   * Set JWT tokens
-   * @param value : the login result
-   */
-    setToken(value) {
-        if (value.authToken ?? value.token) {
-            sessionStorage.setItem('clipper_auth', value.authToken ?? value.token);
-        }
-    }
-    /**
-     * Return current auth token
-     */
-    getAuthToken() {
-        let token = sessionStorage.getItem('clipper_auth');
-        if (token && token[0] === '"') {
-            return token.substring(1, token.length - 1);
-        }
-        return token;
-    }
     /**
      * Store context
      */
@@ -2201,7 +2143,6 @@ class ClipperService {
         }
         this._loginInfo.context = result.context;
         this._loginInfo.channels = result.settings;
-        this.setToken(result);
         this.storeContext();
     }
     /**
@@ -2307,8 +2248,6 @@ class ClipperService {
         this.updateContext(result);
         this.loggedIn.set(!result.context?.isTemporary);
         this.loggingIn.set(false);
-        // Keep alive
-        this.setKeepAlive();
         // Initialize channels
         this.initializeChannels();
         // Notify
@@ -2337,7 +2276,6 @@ class ClipperService {
     logout(forget = false) {
         return this.httpClient.post(this._serviceUri + '/logout/?forget=' + forget, {})
             .pipe(finalize(() => {
-            this.removeKeepAlive();
             this.clear(true);
             // Clean up
             localStorage.removeItem('clipper_context');
@@ -2373,16 +2311,6 @@ class ClipperService {
         this.reset();
     }
     /**
-    * Perform token refresh
-    */
-    refresh() {
-        return this.httpClient.get(this._serviceUri + '/refresh2').pipe(map((r) => {
-            // Update token
-            this.setToken(r.value);
-            return r;
-        }));
-    }
-    /**
    * Initialize channels
    */
     initializeChannels() {
@@ -3129,14 +3057,9 @@ class ClipperAuthInterceptor {
     intercept(request, next) {
         if (request.url.startsWith(this.clipperService.serviceUri)) {
             request = request.clone({ withCredentials: true });
-            return next.handle(this.addTokenToRequest(request))
+            return next.handle(request)
                 .pipe(catchError$1(error => {
                 if (error.url.startsWith(this.clipperService.serviceUri)) {
-                    if (error instanceof HttpErrorResponse &&
-                        error.status === 401 &&
-                        !request.url.includes("/login")) {
-                        return this.handle401Error(request, next);
-                    }
                     const errorStatus = parseInt(error.status ?? "0");
                     if ((errorStatus > 0 && errorStatus < 500) || (this.clipperService.flags & ClipperServiceFlags.NotifySystemErrors) > 0) {
                         const errorTime = new Date().getTime();
@@ -3169,43 +3092,6 @@ class ClipperAuthInterceptor {
         }
         return next.handle(request);
     }
-    /**
-     * Handle 401 error
-     * @param request : the request
-     * @param next : the http handler
-     */
-    handle401Error(request, next) {
-        if (this.clipperService.loggedIn()) {
-            return this.clipperService.refresh().pipe(switchMap(() => {
-                return next.handle(this.addTokenToRequest(request));
-            }), catchError$1(error => {
-                return throwError(() => error);
-            }));
-        }
-        return next.handle(request);
-    }
-    /**
-     * Add token to request
-     * @param request : the request
-     * @param token: the token or null to use curre3nt
-     */
-    addTokenToRequest(request, token) {
-        if (request.url.startsWith(this.clipperService.serviceUri)) {
-            if (this.clipperService.loggedIn()) {
-                if (!token)
-                    token = this.clipperService.getAuthToken();
-                if (token) {
-                    return request.clone({
-                        setHeaders: {
-                            Authorization: 'Bearer ' + token,
-                            'ngsw-bypass': 'ngsw-bypass'
-                        },
-                    });
-                }
-            }
-        }
-        return request;
-    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: ClipperAuthInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.2", ngImport: i0, type: ClipperAuthInterceptor }); }
 }