@arsedizioni/ars-utils 20.2.2 → 20.2.4

package/clipper.common/index.d.ts

@@ -17,6 +17,7 @@ declare const ClipperMessages: {
     LOGIN_CHANGED: string;
     LOGIN_COMPLETED: string;
     LOGOUT_COMPLETED: string;
+    LOGIN_PENDING: string;
     LOGOUT: string;
     DOCUMENT_READ: string;
     DOCUMENT_NAVIGATE: string;
@@ -1053,6 +1054,10 @@ declare class ClipperService implements OnDestroy {
      * @param refresh: true to get the refresh token. Default is false.
      */
     getToken(refresh?: boolean): string;
+    /**
+   * Get the two form factor authentication token
+   */
+    getMFAToken(): string | null;
     /**
      * Store login info
      */
@@ -1082,6 +1087,16 @@ declare class ClipperService implements OnDestroy {
      * @returns: the login result
      */
     login(email?: string, password?: string, remember?: boolean, oauth?: LoginOAuthType, oauthAccessToken?: string | undefined): rxjs.Observable<ApiResult<ClipperLoginResult>>;
+    /**
+     * Complete login
+     * @param result : the login result
+     */
+    private completeLogin;
+    /**
+     * Confirm MFA procedure
+     * @param code: the confirm code
+     */
+    confirmIdentity(code: string): rxjs.Observable<ApiResult<ClipperLoginResult>>;
     /**
      * Perform logout
      */

package/core/index.d.ts

@@ -566,6 +566,8 @@ interface LoginResult<T> extends ApiResult<boolean> {
     context: T;
     token: string;
     refreshToken?: string;
+    requiresMFA?: boolean;
+    MFAToken?: string;
 }
 
 declare class DateIntervalChangeDirective implements OnInit, OnDestroy {

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

@@ -16,6 +16,7 @@ const ClipperMessages = {
     LOGIN_CHANGED: '§clipper-login-changed',
     LOGIN_COMPLETED: '§clipper-login-completed',
     LOGOUT_COMPLETED: '§clipper-logout-completed',
+    LOGIN_PENDING: '§clipper-login-pending',
     LOGOUT: '§clipper-logout',
     // Document
     DOCUMENT_READ: '$clipper-document-read',
@@ -2182,6 +2183,7 @@ class ClipperService {
     setToken(value) {
         sessionStorage.setItem('clipper_jwt', value.token);
         sessionStorage.setItem('clipper_jwt_refresh', value.refreshToken ?? '');
+        localStorage.setItem('clipper_mfa', value.MFAToken ?? '');
     }
     /**
      * Return current JWT token
@@ -2194,6 +2196,12 @@ class ClipperService {
         }
         return token ?? '';
     }
+    /**
+   * Get the two form factor authentication token
+   */
+    getMFAToken() {
+        return localStorage.getItem("clipper_mfa");
+    }
     /**
      * Store login info
      */
@@ -2271,18 +2279,18 @@ class ClipperService {
         }, {
             headers: !oauth || !oauthAccessToken
                 ? new HttpHeaders()
+                    .set("X-MFA", this.getMFAToken() ?? '')
                 : new HttpHeaders()
                     .set("Authorization", oauthAccessToken)
         })
             .pipe(catchError(err => {
             this.loggingIn.set(false);
             localStorage.removeItem('clipper_login');
+            localStorage.removeItem('clipper_mfa');
             return throwError(() => err);
         }), map((r) => {
-            this.loggingIn.set(false);
             if (r.success) {
                 // Store access token
-                this.setToken(r.value);
                 const loginInfo = {
                     context: r.value.context,
                     channels: r.value.settings,
@@ -2295,18 +2303,52 @@ class ClipperService {
                             password: password,
                             remember: remember,
                         }), loginInfo.context.userId.toString());
+                    this.storeLogin();
+                }
+                if (!oauth && r.value.requiresMFA) {
+                    // Notify login is pending
+                    this.broadcastService.sendMessage(ClipperMessages.LOGIN_PENDING);
+                }
+                else {
+                    // Complete login
+                    this.completeLogin(r.value);
                 }
-                // Update info            
-                this._loginInfo = loginInfo;
-                this.storeLogin();
-                this.loggedIn.set(true);
-                this.loggingIn.set(false);
-                // Keep alive
-                this.setKeepAlive();
-                // Initialize channels
-                this.initializeChannels();
-                // Notify
-                this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
+            }
+            return r;
+        }));
+    }
+    /**
+     * Complete login
+     * @param result : the login result
+     */
+    completeLogin(result) {
+        // Update info            
+        this.setToken(result);
+        this.loggedIn.set(true);
+        this.loggingIn.set(false);
+        // Keep alive
+        this.setKeepAlive();
+        // Initialize channels
+        this.initializeChannels();
+        // Notify
+        this.broadcastService.sendMessage(ClipperMessages.LOGIN_COMPLETED);
+    }
+    /**
+     * Confirm MFA procedure
+     * @param code: the confirm code
+     */
+    confirmIdentity(code) {
+        return this.httpClient
+            .post(this._serviceUri + '/login/confirm/' + code, {})
+            .pipe(catchError((err) => {
+            localStorage.removeItem('clipper_login');
+            localStorage.removeItem('clipper_mfa');
+            this.loggingIn.set(false);
+            return throwError(() => err);
+        }), map((r) => {
+            if (r.success) {
+                // Complete login
+                this.completeLogin(r.value);
             }
             return r;
         }));
@@ -2320,6 +2362,7 @@ class ClipperService {
             this.clear(true);
             // Remove credentials
             localStorage.removeItem('clipper_login');
+            localStorage.removeItem('clipper_mfa');
         }), catchError((_e) => {
             return of([]);
         }));
@@ -2333,10 +2376,10 @@ class ClipperService {
         // Logged out
         this.loggedIn.set(false);
         this.loggingIn.set(false);
-        // Notify
-        this.broadcastService.sendMessage(ClipperMessages.LOGOUT_COMPLETED);
         // Reset channels
         this.availableChannels.set([]);
+        // Notify
+        this.broadcastService.sendMessage(ClipperMessages.LOGOUT_COMPLETED);
     }
     /**
      * Clear login data
@@ -3082,10 +3125,10 @@ class ClipperService {
     downloadArchiveFile(id, otp) {
         return this.httpClient.get(this._serviceUri + '/archive/files/download/?id=' + id + '&otp=' + (otp ?? ''), { responseType: 'blob' });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ClipperService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ClipperService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ClipperService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ClipperService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ClipperService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ClipperService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -3170,6 +3213,7 @@ class ClipperAuthInterceptor {
                     return request.clone({
                         setHeaders: {
                             Authorization: 'Bearer ' + token,
+                            'X-MFA': this.clipperService.getMFAToken() ?? '',
                             'ngsw-bypass': 'ngsw-bypass'
                         },
                     });
@@ -3178,19 +3222,19 @@ class ClipperAuthInterceptor {
         }
         return request;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ClipperAuthInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ClipperAuthInterceptor }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ClipperAuthInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ClipperAuthInterceptor }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ClipperAuthInterceptor, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ClipperAuthInterceptor, decorators: [{
             type: Injectable
         }] });
 
 class ArsClipperCommonModule {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ArsClipperCommonModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.2.1", ngImport: i0, type: ArsClipperCommonModule }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ArsClipperCommonModule }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ArsClipperCommonModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.2.3", ngImport: i0, type: ArsClipperCommonModule }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ArsClipperCommonModule }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.1", ngImport: i0, type: ArsClipperCommonModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.2.3", ngImport: i0, type: ArsClipperCommonModule, decorators: [{
             type: NgModule
         }] });