@arsedizioni/ars-utils 19.0.21 → 19.0.23

package/clipper.common/common/services/clipper.service.d.ts

@@ -39,6 +39,14 @@ export declare class ClipperService implements OnDestroy {
      */
     initialize(serviceUri: string, flags?: ClipperServiceFlags): void;
     /**
+   * Get access token expiration date
+   */
+    private getTokenExpirationDate;
+    /**
+     * Checks if access token in expired
+     */
+    private isTokenExpired;
+    /**
    * Set keep alive
    */
     private setKeepAlive;

package/evolution.common/common/services/evolution.service.d.ts

@@ -24,6 +24,14 @@ export declare class EvolutionService implements OnDestroy {
      * @param flags: the service flags. Default is none.
      */
     initialize(serviceUri: string, flags?: EvolutionServiceFlags): void;
+    /**
+   * Get access token expiration date
+   */
+    private getTokenExpirationDate;
+    /**
+     * Checks if access token in expired
+     */
+    private isTokenExpired;
     /**
      * Set keep alive
      */

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

@@ -2197,7 +2197,7 @@ class ClipperService {
             });
         }
         // Eveluate current session storage in case of page refresh (F5)
-        if (!this.loggedIn() && this.getToken()) {
+        if (!this.loggedIn() && !this.isTokenExpired()) {
             // Auto login
             this.loggedIn.set(true);
             // Notify
@@ -2207,6 +2207,25 @@ class ClipperService {
         }
     }
     /**
+   * Get access token expiration date
+   */
+    getTokenExpirationDate() {
+        const token = this.getToken();
+        if (!token)
+            return null;
+        // 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);
+    }
+    /**
+     * Checks if access token in expired
+     */
+    isTokenExpired() {
+        const expires = this.getTokenExpirationDate();
+        return !expires || expires.getTime() < Date.now();
+    }
+    /**
    * Set keep alive
    */
     setKeepAlive() {
@@ -2374,11 +2393,7 @@ class ClipperService {
         return this.httpClient.post(this._serviceUri + '/logout', {}).pipe(finalize(() => {
             this.removeKeepAlive();
             this.clear(true);
-        }), map(r => {
-            this.clear(true);
-            return r;
         }), catchError((_e) => {
-            this.clear(true);
             return of([]);
         }));
     }