@arsedizioni/ars-utils 19.5.28 → 19.5.29

package/clipper.ui/ui/document-menu/document-menu.component.d.ts

@@ -13,7 +13,7 @@ export declare class ClipperDocumentMenuComponent implements OnInit, OnDestroy {
     private changeDetector;
     private clipperService;
     readonly useSelections: import("@angular/core").InputSignal<boolean>;
-    readonly selectionSource: import("@angular/core").InputSignal<"none" | "selection" | "bag">;
+    readonly selectionSource: import("@angular/core").InputSignal<"selection" | "bag" | "none">;
     protected selection: () => ClipperDocumentInfo[];
     readonly parent: import("@angular/core").InputSignal<ClipperSearchResultManager>;
     readonly item: import("@angular/core").InputSignal<ClipperDocumentInfo>;

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

@@ -5,6 +5,7 @@ import { BroadcastService, SystemUtils } from '@arsedizioni/ars-utils/core';
 import { EMPTY, throwError, of, catchError as catchError$1, switchMap } from 'rxjs';
 import { DialogService } from '@arsedizioni/ars-utils/ui';
 import { catchError, map, finalize } from 'rxjs/operators';
+import { addSeconds } from 'date-fns';
 
 const ClipperMessages = {
     /**
@@ -2110,15 +2111,29 @@ class ClipperService {
             });
         }
         // Eveluate current session storage in case of page refresh (F5)
-        if (this.loggedIn() || !this.isTokenExpired()) {
+        const tokenExpirationDate = this.getTokenExpirationDate();
+        const tokenExpired = !tokenExpirationDate || tokenExpirationDate.getTime() < Date.now();
+        if (this.loggedIn() || !tokenExpired) {
             // Auto login
             this.loggedIn.set(true);
             // Keep alive
             this.setKeepAlive();
             // Initialize channels
             this.initializeChannels();
-            // Notify
-            this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
+            // Refresh token if necessary
+            if (tokenExpirationDate && addSeconds(tokenExpirationDate, 30).getTime() > Date.now()) {
+                this.refresh().subscribe(r => {
+                    if (r.success) {
+                        this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
+                    }
+                    else {
+                        this.clear();
+                    }
+                });
+            }
+            else {
+                this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
+            }
         }
     }
     /**
@@ -2294,12 +2309,12 @@ class ClipperService {
                 this._loginInfo = loginInfo;
                 this.storeLogin();
                 this.loggedIn.set(true);
-                // Notify
-                this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
                 // Keep alive
                 this.setKeepAlive();
                 // Initialize channels
                 this.initializeChannels();
+                // Notify
+                this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
             }
             return r;
         }));