@arsedizioni/ars-utils 20.2.34 → 20.3.3

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

@@ -13,9 +13,18 @@ const EvolutionMessages = {
     LOGIN_CHANGED: '§evo-login-changed',
     LOGIN_COMPLETED: '§evo-login-completed',
     LOGOUT_COMPLETED: '§evo-logout-completed',
+    LOGIN_PENDING: '§evo-login-pending',
     LOGOUT: '§evo-logout'
 };
 
+var EvolutionLoginFlags;
+(function (EvolutionLoginFlags) {
+    EvolutionLoginFlags[EvolutionLoginFlags["None"] = 0] = "None";
+    EvolutionLoginFlags[EvolutionLoginFlags["RememberCredentials"] = 1] = "RememberCredentials";
+    EvolutionLoginFlags[EvolutionLoginFlags["DisableMfa"] = 2] = "DisableMfa";
+    EvolutionLoginFlags[EvolutionLoginFlags["ExtendMfaValidity"] = 4] = "ExtendMfaValidity";
+    EvolutionLoginFlags[EvolutionLoginFlags["ExtendRememberCredentialsValidity"] = 8] = "ExtendRememberCredentialsValidity";
+})(EvolutionLoginFlags || (EvolutionLoginFlags = {}));
 var EvolutionServiceFlags;
 (function (EvolutionServiceFlags) {
     EvolutionServiceFlags[EvolutionServiceFlags["None"] = 0] = "None";
@@ -487,7 +496,6 @@ class EvolutionService {
         this._flags = EvolutionServiceFlags.None;
         this.loggedIn = signal(false, ...(ngDevMode ? [{ debugName: "loggedIn" }] : []));
         this.loggingIn = signal(false, ...(ngDevMode ? [{ debugName: "loggingIn" }] : []));
-        this.shouldRefreshToken = signal(false, ...(ngDevMode ? [{ debugName: "shouldRefreshToken" }] : []));
         this.keepAlive = 0;
     }
     get serviceUri() {
@@ -498,7 +506,7 @@ class EvolutionService {
     }
     get loginInfo() {
         if (!this._loginInfo) {
-            const loginInfo = localStorage.getItem('evolution_login');
+            const loginInfo = localStorage.getItem('evolution_context');
             if (loginInfo) {
                 try {
                     this._loginInfo = JSON.parse(loginInfo);
@@ -574,8 +582,6 @@ class EvolutionService {
         if (!tokenExpired || this.loggedIn()) {
             // Auto login
             this.loggedIn.set(true);
-            // Should refresh
-            this.shouldRefreshToken.set(!!tokenExpirationDate);
             // Keep alive
             this.setKeepAlive();
             // Notify 
@@ -586,7 +592,7 @@ class EvolutionService {
    * Get access token expiration date
    */
     getTokenExpirationDate() {
-        const token = this.getToken();
+        const token = this.getAuthToken();
         if (!token)
             return undefined;
         // Parse json object from base64 encoded jwt token
@@ -594,14 +600,6 @@ class EvolutionService {
         // 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
      */
@@ -638,26 +636,41 @@ class EvolutionService {
         if (value.authToken ?? value.token) {
             sessionStorage.setItem('evolution_auth', value.authToken ?? value.token);
         }
-        if (value.refreshToken) {
-            sessionStorage.setItem('evolution_refresh', value.refreshToken ?? '');
+        if (value.rememberToken) {
+            localStorage.setItem('evolution_remember', value.rememberToken);
         }
     }
     /**
      * Return current JWT token
      * @param refresh: true to get the refresh token. Default is false.
      */
-    getToken(refresh = false) {
-        let token = sessionStorage.getItem(refresh ? 'evolution_refresh' : 'evolution_auth');
+    getAuthToken() {
+        let token = sessionStorage.getItem('evolution_auth');
         if (token && token[0] === '"') {
             return token.substring(1, token.length - 1);
         }
         return token;
     }
+    /**
+     * Get the two form factor authentication token
+     */
+    getRememberToken() {
+        return localStorage.getItem("myars_remember") ?? undefined;
+    }
     /**
     * Store login info
     */
-    storeLogin() {
-        localStorage.setItem('evolution_login', JSON.stringify(this._loginInfo));
+    storeContext() {
+        localStorage.setItem('evolution_context', JSON.stringify(this._loginInfo));
+    }
+    /**
+     * Update context
+     * @param result: the new context
+     */
+    updateContext(result) {
+        this._loginInfo = result;
+        this.setToken(result);
+        this.storeContext();
     }
     /**
     * Perform auto login using current link data
@@ -668,20 +681,11 @@ class EvolutionService {
      * @param oauthAccessToken: the optional OAuth2 access token
     * @param onSuccess: function to execute on seccess
     */
-    autoLogin(email, password, remember, oauth, oauthAccessToken, onSuccess) {
-        if (!oauth && !oauthAccessToken && (!email || !password)) {
-            // Try to use link if exists
-            const linkInfo = localStorage.getItem('clipper_link_evolution');
-            if (linkInfo) {
-                const link = JSON.parse(SystemUtils.cipher(linkInfo, 'evolution', true));
-                if (link) {
-                    email = link.user;
-                    password = link.password;
-                    remember = true;
-                }
-            }
+    autoLogin(email, password, remember, oauth, oauthAccessToken, onSuccess, flags) {
+        if (remember) {
+            flags |= EvolutionLoginFlags.RememberCredentials;
         }
-        this.login(email, password, remember, oauth, oauthAccessToken)
+        this.login(email ?? this.getRememberToken(), password, remember, oauth, oauthAccessToken, flags)
             .subscribe({
             next: r => {
                 if (!r.success) {
@@ -718,6 +722,7 @@ class EvolutionService {
                 }
             },
             complete: () => {
+                this.clear();
                 if (onSuccess) {
                     onSuccess();
                 }
@@ -731,46 +736,80 @@ class EvolutionService {
      * @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, password, remember, oauth, oauthAccessToken) {
-        this.loggingIn.set(true);
+    login(email, password, remember, oauth, oauthAccessToken, flags) {
+        if (remember) {
+            flags |= EvolutionLoginFlags.RememberCredentials;
+        }
         return this.httpClient
             .post(this._serviceUri + '/login2', {
+            clientId: localStorage.getItem("evolution_client_id"),
             user: oauth ? null : email,
             password: oauth ? null : password,
-            clientId: localStorage.getItem("evolution_client_id"),
-            OAUTH: oauth
+            remember: remember,
+            oauth: oauth,
+            flags: flags
         }, {
-            headers: !oauth
+            headers: !oauth || !oauthAccessToken
                 ? new HttpHeaders()
                 : new HttpHeaders()
                     .set("Authorization", oauthAccessToken ?? '')
         })
-            .pipe(finalize(() => this.dialogService.clearBusy()), catchError(err => { this.handleLoginError(); return throwError(() => err); }), map((r) => {
+            .pipe(catchError(err => {
             this.loggingIn.set(false);
+            localStorage.removeItem('evolution_context');
+            localStorage.removeItem('evolution_remember');
+            return throwError(() => err);
+        }), map((r) => {
             if (r.success) {
-                // Store access token
-                this.setToken(r.value);
-                const loginInfo = {
-                    context: r.value.context,
-                    OAUTH: oauth
-                };
-                if (!oauth) {
-                    loginInfo.userCredentials =
-                        SystemUtils.cipher(JSON.stringify({
-                            email: email,
-                            password: password,
-                            remember: remember,
-                        }), loginInfo.context.userId.toString());
+                if (!this._loginInfo)
+                    this._loginInfo = r.value;
+                this._loginInfo.oauth = oauth;
+                if (!oauth && r.value.requiresMfa) {
+                    // Notify login is pending
+                    this.broadcastService.sendMessage(EvolutionMessages.LOGIN_PENDING, { flags: flags });
+                }
+                else {
+                    // Complete login
+                    this.completeLogin(r.value);
                 }
-                this._loginInfo = loginInfo.context;
-                this.storeLogin();
-                this.loggedIn.set(true);
-                // Keep alive
-                this.setKeepAlive();
-                // Notify
-                this.broadcastService.sendMessage(EvolutionMessages.LOGIN_COMPLETED);
+            }
+            return r;
+        }));
+    }
+    /**
+     * Complete login
+     * @param result : the login result
+     */
+    completeLogin(result) {
+        // Update context info            
+        this.updateContext(result);
+        this.loggedIn.set(true);
+        this.loggingIn.set(false);
+        // Keep alive
+        this.setKeepAlive();
+        // Notify
+        this.broadcastService.sendMessage(EvolutionMessages.LOGIN_COMPLETED);
+    }
+    /**
+     * Confirm MFA procedure
+     * @param code: the confirm code
+     * @param flags: the login flags
+     */
+    confirmIdentity(code, flags = EvolutionLoginFlags.None) {
+        return this.httpClient
+            .post(this._serviceUri + '/login/confirm/' + code + '/?flags=' + flags, {})
+            .pipe(catchError((err) => {
+            localStorage.removeItem('evolution_context');
+            localStorage.removeItem('evolution_remember');
+            this.loggingIn.set(false);
+            return throwError(() => err);
+        }), map((r) => {
+            if (r.success) {
+                // Complete login
+                this.completeLogin(r.value);
             }
             return r;
         }));
@@ -782,6 +821,9 @@ class EvolutionService {
         return this.httpClient.post(this._serviceUri + '/logout', {}).pipe(finalize(() => {
             this.removeKeepAlive();
             this.clear();
+            // Clean up
+            localStorage.removeItem('evolution_context');
+            localStorage.removeItem('evolution_remember');
         }), catchError((_e) => {
             return of([]);
         }));
@@ -793,32 +835,22 @@ class EvolutionService {
     loginSwitch(id) {
         return this.httpClient
             .post(this._serviceUri + '/login-switch/', {
+            clientId: localStorage.getItem("evolution_client_id"),
             userId: id,
-            clientId: localStorage.getItem("evolution_client_id")
         })
             .pipe(catchError((err) => {
-            this.handleLoginError();
+            this.loggingIn.set(false);
+            localStorage.removeItem('evolution_context');
+            localStorage.removeItem('evolution_remember');
             return throwError(() => err);
         }), map((r) => {
-            this.loggingIn.set(false);
             if (r.success) {
-                // Store access token
-                this.setToken(r.value);
-                this._loginInfo = r.value.context;
-                this.loggedIn.set(true);
-                // Notify
-                this.broadcastService.sendMessage(EvolutionMessages.LOGIN_COMPLETED);
+                // Update login
+                this.completeLogin(r.value);
             }
             return r;
         }));
     }
-    /**
-   * Handle login error
-   */
-    handleLoginError() {
-        this.loggingIn.set(false);
-        localStorage.removeItem('evolution_login');
-    }
     /**
      * Reset login refresh timer and login state
      */
@@ -832,13 +864,17 @@ class EvolutionService {
     }
     /**
      * Clear login data
+     * @param clearOAuthToken: true to clear oauth token also
      */
-    clear() {
+    clear(clearOAuthToken = false) {
         // Clear local storage
         sessionStorage.removeItem('evolution_auth');
         sessionStorage.removeItem('evolution_refresh');
+        localStorage.removeItem('evolution_context');
         sessionStorage.removeItem('evolution_oauth');
-        localStorage.removeItem('evolution_login');
+        if (clearOAuthToken) {
+            sessionStorage.removeItem('evolution_oauth_token');
+        }
         // Reset login
         this.reset();
     }
@@ -846,7 +882,7 @@ class EvolutionService {
     * Perform token refresh
     */
     refresh() {
-        return this.httpClient.get(this._serviceUri + '/refresh2/?token=' + this.getToken(true)).pipe(map((r) => {
+        return this.httpClient.get(this._serviceUri + '/refresh2').pipe(map((r) => {
             // Update token
             this.setToken(r.value);
             return r;
@@ -1057,7 +1093,7 @@ class EvolutionAuthInterceptor {
         if (request.url.startsWith(this.evolutionService.serviceUri ?? '')) {
             if (this.evolutionService.loggedIn()) {
                 if (!token)
-                    token = this.evolutionService.getToken();
+                    token = this.evolutionService.getAuthToken();
                 if (token) {
                     return request.clone({
                         setHeaders: {
@@ -1094,5 +1130,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.4", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-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 };
 //# sourceMappingURL=arsedizioni-ars-utils-evolution.common.mjs.map