@arsedizioni/ars-utils 20.2.13 → 20.2.14

package/clipper.common/index.d.ts

@@ -197,7 +197,6 @@ interface ClipperLoginInfo {
     context: ClipperUserInfo;
     complianceContext?: any;
     channels?: ClipperChannelSettings[];
-    credentials?: string;
     oauth?: LoginOAuthType;
 }
 declare class ClipperSearchParams {
@@ -1050,14 +1049,18 @@ declare class ClipperService implements OnDestroy {
    */
     private setToken;
     /**
-     * Return current JWT token
+     * Return current auth token
      * @param refresh: true to get the refresh token. Default is false.
      */
-    getToken(refresh?: boolean): string;
+    getAuthToken(refresh?: boolean): string;
     /**
    * Get the two form factor authentication token
    */
-    getMFAToken(): string | null;
+    getRememberToken(): string | null;
+    /**
+   * Get the two form factor authentication token
+   */
+    getMfaToken(): string | null;
     /**
      * Store context
      */
@@ -1100,8 +1103,9 @@ declare class ClipperService implements OnDestroy {
     /**
      * Confirm MFA procedure
      * @param code: the confirm code
+     * @param remember: true to remember credentials. Default is false.
      */
-    confirmIdentity(code: string): rxjs.Observable<ApiResult<ClipperLoginResult>>;
+    confirmIdentity(code: string, remember?: boolean): rxjs.Observable<ApiResult<ClipperLoginResult>>;
     /**
      * Perform logout
      */

package/clipper.ui/index.d.ts

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

package/core/index.d.ts

@@ -566,6 +566,7 @@ interface LoginResult<T> extends ApiResult<boolean> {
     context: T;
     token: string;
     refreshToken?: string;
+    rememberToken?: string;
     requiresMFA?: boolean;
     mfaToken?: string;
 }

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

@@ -2131,7 +2131,7 @@ class ClipperService {
    * 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
@@ -2180,16 +2180,23 @@ class ClipperService {
    * @param value : the login result
    */
     setToken(value) {
-        sessionStorage.setItem('clipper_jwt', value.token);
-        sessionStorage.setItem('clipper_jwt_refresh', value.refreshToken ?? '');
-        localStorage.setItem('clipper_mfa', value.mfaToken ?? '');
+        sessionStorage.setItem('clipper_auth', 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 JWT token
+     * Return current auth token
      * @param refresh: true to get the refresh token. Default is false.
      */
-    getToken(refresh = false) {
-        let token = sessionStorage.getItem(refresh ? 'clipper_jwt_refresh' : 'clipper_jwt');
+    getAuthToken(refresh = false) {
+        let token = sessionStorage.getItem(refresh ? 'clipper_refresh' : 'clipper_auth');
         if (token && token[0] === '"') {
             return token.substring(1, token.length - 1);
         }
@@ -2198,7 +2205,13 @@ class ClipperService {
     /**
    * Get the two form factor authentication token
    */
-    getMFAToken() {
+    getRememberToken() {
+        return localStorage.getItem("clipper_remember");
+    }
+    /**
+   * Get the two form factor authentication token
+   */
+    getMfaToken() {
         return localStorage.getItem("clipper_mfa");
     }
     /**
@@ -2285,19 +2298,21 @@ class ClipperService {
             .post(this._serviceUri + '/login2', {
             user: oauth ? null : email,
             password: oauth ? null : password,
+            remember: remember,
             clientId: localStorage.getItem("clipper_client_id"),
             OAUTH: oauth
         }, {
             headers: !oauth || !oauthAccessToken
                 ? new HttpHeaders()
-                    .set("X-MFA", this.getMFAToken() ?? '')
+                    .set("X-MFA", this.getMfaToken() ?? '')
                 : new HttpHeaders()
-                    .set("Authorization", oauthAccessToken)
+                    .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) => {
             if (r.success) {
@@ -2305,16 +2320,6 @@ class ClipperService {
                 this._loginInfo.context = r.value.context;
                 this._loginInfo.channels = r.value.settings;
                 this._loginInfo.oauth = oauth;
-                if (!this._loginInfo.oauth) {
-                    this._loginInfo.credentials = SystemUtils.cipher(JSON.stringify({
-                        email: email,
-                        password: password,
-                        remember: remember
-                    }), r.value.context?.userId?.toString() ?? '');
-                }
-                else {
-                    this._loginInfo.credentials = undefined;
-                }
                 if (!oauth && r.value.requiresMFA) {
                     // Notify login is pending
                     this.broadcastService.sendMessage(ClipperMessages.LOGIN_PENDING);
@@ -2346,13 +2351,15 @@ class ClipperService {
     /**
      * Confirm MFA procedure
      * @param code: the confirm code
+     * @param remember: true to remember credentials. Default is false.
      */
-    confirmIdentity(code) {
+    confirmIdentity(code, remember = false) {
         return this.httpClient
-            .post(this._serviceUri + '/login/confirm/' + code, {})
+            .post(this._serviceUri + '/login/confirm/' + code + '/?remember=' + remember, {})
             .pipe(catchError((err) => {
             localStorage.removeItem('clipper_context');
             localStorage.removeItem('clipper_mfa');
+            localStorage.removeItem('clipper_remember');
             this.loggingIn.set(false);
             return throwError(() => err);
         }), map((r) => {
@@ -2373,6 +2380,7 @@ class ClipperService {
             // Remove credentials
             localStorage.removeItem('clipper_context');
             localStorage.removeItem('clipper_mfa');
+            localStorage.removeItem('clipper_remember');
         }), catchError((_e) => {
             return of([]);
         }));
@@ -2396,8 +2404,8 @@ class ClipperService {
      */
     clear(clearOAuthToken = false) {
         // Clear local storage
-        sessionStorage.removeItem('clipper_jwt');
-        sessionStorage.removeItem('clipper_jwt_refresh');
+        sessionStorage.removeItem('clipper_auth');
+        sessionStorage.removeItem('clipper_refresh');
         sessionStorage.removeItem('clipper_oauth');
         if (clearOAuthToken) {
             sessionStorage.removeItem('clipper_oauth_token');
@@ -2409,7 +2417,7 @@ class ClipperService {
     * 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/?token=' + this.getAuthToken(true)).pipe(map((r) => {
             // Update token
             this.setToken(r.value);
             return r;
@@ -3217,12 +3225,11 @@ class ClipperAuthInterceptor {
         if (request.url.startsWith(this.clipperService.serviceUri)) {
             if (this.clipperService.loggedIn()) {
                 if (!token)
-                    token = this.clipperService.getToken();
+                    token = this.clipperService.getAuthToken();
                 if (token) {
                     return request.clone({
                         setHeaders: {
                             Authorization: 'Bearer ' + token,
-                            'X-MFA': this.clipperService.getMFAToken() ?? '',
                             'ngsw-bypass': 'ngsw-bypass'
                         },
                     });