@arsedizioni/ars-utils 20.2.33 → 20.3.1

package/clipper.common/index.d.ts

@@ -1009,7 +1009,6 @@ declare class ClipperService implements OnDestroy {
     readonly loggingIn: _angular_core.WritableSignal<boolean>;
     readonly snapshot: _angular_core.WritableSignal<ClipperSearchResult>;
     readonly supportsRS: _angular_core.WritableSignal<boolean>;
-    readonly shouldRefreshToken: _angular_core.WritableSignal<boolean>;
     readonly referencesSnapshot: _angular_core.WritableSignal<ClipperSearchResult>;
     readonly dashboard: ClipperDashboard;
     readonly bag: _angular_core.WritableSignal<ClipperDocumentInfo[]>;
@@ -1035,10 +1034,6 @@ declare class ClipperService implements OnDestroy {
    * Get access token expiration date
    */
     private getTokenExpirationDate;
-    /**
-     * Checks if access token in expired
-     */
-    isTokenExpired(): boolean;
     /**
    * Set keep alive
    */
@@ -1058,17 +1053,12 @@ declare class ClipperService implements OnDestroy {
     private setToken;
     /**
      * Return current auth token
-     * @param refresh: true to get the refresh token. Default is false.
      */
-    getAuthToken(refresh?: boolean): string | undefined;
+    getAuthToken(): string | undefined;
     /**
    * Get the two form factor authentication token
    */
     getRememberToken(): string | null;
-    /**
-   * Get the two form factor authentication token
-   */
-    getMfaToken(): string | null;
     /**
      * Store context
      */
@@ -1118,9 +1108,8 @@ declare class ClipperService implements OnDestroy {
     confirmIdentity(code: string, flags?: number): rxjs.Observable<ApiResult<ClipperLoginResult>>;
     /**
      * Perform logout
-     * @param soft: true if is a soft logout (mfa and remember tokens remains). Default is false.
      */
-    logout(soft?: boolean): rxjs.Observable<any>;
+    logout(): rxjs.Observable<any>;
     /**
     * Reset login refresh timer and login state
     */

package/core/index.d.ts

@@ -564,11 +564,10 @@ declare class DateInterval {
 }
 interface LoginResult<T> extends ApiResult<boolean> {
     context: T;
+    oauth?: number;
     authToken: string;
-    refreshToken?: string;
     rememberToken?: string;
     requiresMfa?: boolean;
-    mfaToken?: string;
 }
 
 declare class DateIntervalChangeDirective implements OnInit, OnDestroy {

package/evolution.common/index.d.ts

@@ -11,16 +11,23 @@ declare const EvolutionMessages: {
     LOGIN_CHANGED: string;
     LOGIN_COMPLETED: string;
     LOGOUT_COMPLETED: string;
+    LOGIN_PENDING: string;
     LOGOUT: string;
 };
 
+declare enum EvolutionLoginFlags {
+    None = 0,
+    RememberCredentials = 1,
+    DisableMfa = 2,
+    ExtendMfaValidity = 4,
+    ExtendRememberCredentialsValidity = 8
+}
 interface EvolutionLoginResult extends LoginResult<EvolutionUserInfo> {
     token?: string;
 }
 interface EvolutionLoginInfo {
     context: EvolutionUserInfo;
-    userCredentials?: string;
-    OAUTH?: LoginOAuthType;
+    oauth?: LoginOAuthType;
 }
 interface EvolutionUserLink {
     id?: number;
@@ -726,10 +733,9 @@ declare class EvolutionService implements OnDestroy {
     private _flags;
     get flags(): EvolutionServiceFlags;
     private _loginInfo?;
-    get loginInfo(): EvolutionUserInfo | undefined;
+    get loginInfo(): EvolutionLoginInfo | undefined;
     readonly loggedIn: i0.WritableSignal<boolean>;
     readonly loggingIn: i0.WritableSignal<boolean>;
-    readonly shouldRefreshToken: i0.WritableSignal<boolean>;
     private keepAlive;
     ngOnDestroy(): void;
     /**
@@ -742,10 +748,6 @@ declare class EvolutionService implements OnDestroy {
    * Get access token expiration date
    */
     private getTokenExpirationDate;
-    /**
-     * Checks if access token in expired
-     */
-    isTokenExpired(): boolean;
     /**
      * Set keep alive
      */
@@ -767,11 +769,20 @@ declare class EvolutionService implements OnDestroy {
      * Return current JWT token
      * @param refresh: true to get the refresh token. Default is false.
      */
-    getToken(refresh?: boolean): string | undefined;
+    getAuthToken(): string | undefined;
+    /**
+     * Get the two form factor authentication token
+     */
+    getRememberToken(): string | undefined;
     /**
     * Store login info
     */
-    storeLogin(): void;
+    storeContext(): void;
+    /**
+     * Update context
+     * @param result: the new context
+     */
+    updateContext(result: EvolutionLoginResult): void;
     /**
     * Perform auto login using current link data
      * @param email: the optional email if using OAuth2
@@ -781,7 +792,7 @@ declare class EvolutionService implements OnDestroy {
      * @param oauthAccessToken: the optional OAuth2 access token
     * @param onSuccess: function to execute on seccess
     */
-    autoLogin(email?: string, password?: string, remember?: boolean, oauth?: LoginOAuthType, oauthAccessToken?: string, onSuccess?: Function): boolean;
+    autoLogin(email?: string, password?: string, remember?: boolean, oauth?: LoginOAuthType, oauthAccessToken?: string, onSuccess?: Function, flags?: EvolutionLoginFlags): boolean;
     /**
      * Perform auto logout
      * @param onSuccess: function to execute on seccess
@@ -794,9 +805,21 @@ declare class EvolutionService implements OnDestroy {
      * @param remember: remember credentials
      * @param oauth: the optional open authentication supported
      * @param oauthAccessToken: the optional OAuth2 access token
+     * @param flags: the optional login flags
      * @returns: the login result
      */
-    login(email?: string, password?: string, remember?: boolean, oauth?: LoginOAuthType, oauthAccessToken?: string): rxjs.Observable<ApiResult<EvolutionLoginResult>>;
+    login(email?: string, password?: string, remember?: boolean, oauth?: LoginOAuthType, oauthAccessToken?: string, flags?: EvolutionLoginFlags): rxjs.Observable<ApiResult<EvolutionLoginResult>>;
+    /**
+     * Complete login
+     * @param result : the login result
+     */
+    private completeLogin;
+    /**
+     * Confirm MFA procedure
+     * @param code: the confirm code
+     * @param flags: the login flags
+     */
+    confirmIdentity(code: string, flags?: number): rxjs.Observable<ApiResult<EvolutionLoginResult>>;
     /**
      * Perform logout
      */
@@ -806,18 +829,15 @@ declare class EvolutionService implements OnDestroy {
     * @param id : new user id
     */
     loginSwitch(id: number): rxjs.Observable<ApiResult<EvolutionLoginResult>>;
-    /**
-   * Handle login error
-   */
-    private handleLoginError;
     /**
      * Reset login refresh timer and login state
      */
     reset(): void;
     /**
      * Clear login data
+     * @param clearOAuthToken: true to clear oauth token also
      */
-    clear(): void;
+    clear(clearOAuthToken?: boolean): void;
     /**
     * Perform token refresh
     */
@@ -891,5 +911,5 @@ declare class EvolutionCommonModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<EvolutionCommonModule>;
 }
 
-export { ERPComplianceActivityState, ERPComplianceLawOrigin, ERPComplianceLawState, ERPComplianceLawsSelectionType, ERPComplianceNotificationLimit, ERPComplianceProfileFlags, ERPComplianceProfileRole, ERPComplianceRegisterNotificationType, ERPComplianceRegisterSiteImportOptions, ERPComplianceScope, ERPExportFormat, ERPExportPart, ERPExportSource, ERPExportType, ERPModule, ERPPlace, ERPPlacePermission, ERPRecurrenceFrequencyType, EvolutionAuthInterceptor, EvolutionCommonModule, EvolutionComplianceActivityStates, EvolutionComplianceContextInfo, EvolutionComplianceLawChangeStates, EvolutionComplianceLawOrigins, EvolutionComplianceLawStates, EvolutionComplianceNotificationLimits, EvolutionComplianceNotifications, EvolutionComplianceObligationAuthorities, EvolutionComplianceObligationTypes, EvolutionComplianceProfileFlags, EvolutionComplianceProfileRoles, EvolutionComplianceScopes, EvolutionMessages, EvolutionRecurrenceFrequencyTypes, EvolutionService, EvolutionServiceFlags };
+export { ERPComplianceActivityState, ERPComplianceLawOrigin, ERPComplianceLawState, ERPComplianceLawsSelectionType, ERPComplianceNotificationLimit, ERPComplianceProfileFlags, ERPComplianceProfileRole, ERPComplianceRegisterNotificationType, ERPComplianceRegisterSiteImportOptions, ERPComplianceScope, ERPExportFormat, ERPExportPart, ERPExportSource, ERPExportType, ERPModule, ERPPlace, ERPPlacePermission, ERPRecurrenceFrequencyType, EvolutionAuthInterceptor, EvolutionCommonModule, EvolutionComplianceActivityStates, EvolutionComplianceContextInfo, EvolutionComplianceLawChangeStates, EvolutionComplianceLawOrigins, EvolutionComplianceLawStates, EvolutionComplianceNotificationLimits, EvolutionComplianceNotifications, EvolutionComplianceObligationAuthorities, EvolutionComplianceObligationTypes, EvolutionComplianceProfileFlags, EvolutionComplianceProfileRoles, EvolutionComplianceScopes, EvolutionLoginFlags, EvolutionMessages, EvolutionRecurrenceFrequencyTypes, EvolutionService, EvolutionServiceFlags };
 export type { ComplianceRegisterUsersResultModel, EvolutionChangeContextModel, EvolutionChangeContextResultModel, EvolutionComplianceActivitiesAddParams, EvolutionComplianceActivity, EvolutionComplianceLaswExportParams, EvolutionComplianceLaw, EvolutionComplianceLawDocumentInfo, EvolutionComplianceLawReference, EvolutionComplianceLawsAddParams, EvolutionComplianceRegister, EvolutionComplianceRegisterProfile, EvolutionComplianceRegisterSite, EvolutionContextInfo, EvolutionExportModel, EvolutionLicenceModuleInfo, EvolutionLoginInfo, EvolutionLoginResult, EvolutionPermission, EvolutionPlacePermission, EvolutionPlaceable, EvolutionQueryRegisterProfilesModel, EvolutionRegisterProfileSiteInfo, EvolutionRegisterProfileUserInfo, EvolutionUserInfo, EvolutionUserLink, EvolutionUserModuleInfo };

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

@@ -2011,7 +2011,6 @@ class ClipperService {
         this.loggingIn = signal(false, ...(ngDevMode ? [{ debugName: "loggingIn" }] : []));
         this.snapshot = signal(undefined, ...(ngDevMode ? [{ debugName: "snapshot" }] : []));
         this.supportsRS = signal(false, ...(ngDevMode ? [{ debugName: "supportsRS" }] : []));
-        this.shouldRefreshToken = signal(false, ...(ngDevMode ? [{ debugName: "shouldRefreshToken" }] : []));
         this.referencesSnapshot = signal(undefined, ...(ngDevMode ? [{ debugName: "referencesSnapshot" }] : []));
         this.dashboard = new ClipperDashboard();
         this.bag = signal([], ...(ngDevMode ? [{ debugName: "bag" }] : []));
@@ -2101,7 +2100,7 @@ class ClipperService {
                 }
                 else if (message.id === ClipperMessages.LOGOUT) {
                     if (this.loggedIn()) {
-                        this.logout(true).subscribe(r => {
+                        this.logout().subscribe(r => {
                             if (!r.success) {
                                 if (r.message) {
                                     this.dialogService.error("<p>" + r.message + "</p><br><br><hr><p class='small'><i>Per eliminare la configurazione di Clipper accedere a:<br><b>menu > personalizza > collegamenti</b></i></p>", undefined, "Errore di Clipper");
@@ -2128,8 +2127,6 @@ class ClipperService {
         if (!tokenExpired || this.loggedIn()) {
             // Auto login
             this.loggedIn.set(true);
-            // Should refresh
-            this.shouldRefreshToken.set(!!tokenExpirationDate);
             // Keep alive
             this.setKeepAlive();
             // Initialize channels
@@ -2150,14 +2147,6 @@ class ClipperService {
         // 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();
-        const expired = !expires || expires.getTime() < Date.now();
-        return expired;
-    }
     /**
    * Set keep alive
    */
@@ -2194,22 +2183,15 @@ class ClipperService {
         if (value.authToken ?? value.token) {
             sessionStorage.setItem('clipper_auth', value.authToken ?? value.token);
         }
-        if (value.refreshToken) {
-            sessionStorage.setItem('clipper_refresh', value.refreshToken);
-        }
         if (value.rememberToken) {
             localStorage.setItem('clipper_remember', value.rememberToken);
         }
-        if (value.mfaToken) {
-            localStorage.setItem('clipper_mfa', value.mfaToken);
-        }
     }
     /**
      * Return current auth token
-     * @param refresh: true to get the refresh token. Default is false.
      */
-    getAuthToken(refresh = false) {
-        let token = sessionStorage.getItem(refresh ? 'clipper_refresh' : 'clipper_auth');
+    getAuthToken() {
+        let token = sessionStorage.getItem('clipper_auth');
         if (token && token[0] === '"') {
             return token.substring(1, token.length - 1);
         }
@@ -2221,12 +2203,6 @@ class ClipperService {
     getRememberToken() {
         return localStorage.getItem("clipper_remember");
     }
-    /**
-   * Get the two form factor authentication token
-   */
-    getMfaToken() {
-        return localStorage.getItem("clipper_mfa");
-    }
     /**
      * Store context
      */
@@ -2260,7 +2236,7 @@ class ClipperService {
         if (remember) {
             flags |= ClipperLoginFlags.RememberCredentials;
         }
-        this.login(email, password, remember, oauth, oauthAccessToken, flags)
+        this.login(email ?? this.getRememberToken(), password, remember, oauth, oauthAccessToken, flags)
             .subscribe({
             next: r => {
                 if (!r.success) {
@@ -2284,10 +2260,11 @@ class ClipperService {
     autoLogout(onSuccess) {
         if (!this.loggedIn())
             return;
-        this.logout(true).subscribe({
+        this.logout().subscribe({
             next: r => {
                 if (!r.success) {
                     this.dialogService.error(r.message, undefined, "Errore in Clipper");
+                    this.broadcastService.sendMessage(ClipperMessages.LOGIN_CHANGED);
                 }
                 else {
                     this.dialogService.toast('Disconnesso da Clipper', 1500, 'power_off');
@@ -2326,14 +2303,12 @@ class ClipperService {
         }, {
             headers: !oauth || !oauthAccessToken
                 ? new HttpHeaders()
-                    .set("X-MFA", this.getMfaToken() ?? '')
                 : new HttpHeaders()
                     .set("Authorization", 'Bearer ' + oauthAccessToken)
         })
             .pipe(catchError(err => {
             this.loggingIn.set(false);
             localStorage.removeItem('clipper_context');
-            localStorage.removeItem('clipper_mfa');
             localStorage.removeItem('clipper_remember');
             return throwError(() => err);
         }), map((r) => {
@@ -2379,7 +2354,6 @@ class ClipperService {
             .post(this._serviceUri + '/login/confirm/' + code + '/?flags=' + flags, {})
             .pipe(catchError((err) => {
             localStorage.removeItem('clipper_context');
-            localStorage.removeItem('clipper_mfa');
             localStorage.removeItem('clipper_remember');
             this.loggingIn.set(false);
             return throwError(() => err);
@@ -2393,18 +2367,14 @@ class ClipperService {
     }
     /**
      * Perform logout
-     * @param soft: true if is a soft logout (mfa and remember tokens remains). Default is false.
      */
-    logout(soft = false) {
+    logout() {
         return this.httpClient.post(this._serviceUri + '/logout', {}).pipe(finalize(() => {
             this.removeKeepAlive();
             this.clear(true);
-            // Remove credentials
+            // Clean up
             localStorage.removeItem('clipper_context');
             localStorage.removeItem('clipper_remember');
-            if (!soft) {
-                localStorage.removeItem('clipper_mfa');
-            }
         }), catchError((_e) => {
             return of([]);
         }));
@@ -2428,8 +2398,8 @@ class ClipperService {
      */
     clear(clearOAuthToken = false) {
         // Clear local storage
+        localStorage.removeItem('clipper_context');
         sessionStorage.removeItem('clipper_auth');
-        sessionStorage.removeItem('clipper_refresh');
         sessionStorage.removeItem('clipper_oauth');
         if (clearOAuthToken) {
             sessionStorage.removeItem('clipper_oauth_token');
@@ -2441,7 +2411,7 @@ class ClipperService {
     * Perform token refresh
     */
     refresh() {
-        return this.httpClient.get(this._serviceUri + '/refresh2/?token=' + this.getAuthToken(true)).pipe(map((r) => {
+        return this.httpClient.get(this._serviceUri + '/refresh2').pipe(map((r) => {
             // Update token
             this.setToken(r.value);
             return r;