@arsedizioni/ars-utils 20.2.4 → 20.2.6

package/clipper.common/index.d.ts

@@ -198,7 +198,7 @@ interface ClipperLoginInfo {
     complianceContext?: any;
     channels?: ClipperChannelSettings[];
     credentials?: string;
-    OAUTH?: LoginOAuthType;
+    oauth?: LoginOAuthType;
 }
 declare class ClipperSearchParams {
     version: number;
@@ -1059,9 +1059,14 @@ declare class ClipperService implements OnDestroy {
    */
     getMFAToken(): string | null;
     /**
-     * Store login info
+     * Store context
      */
-    storeLogin(): void;
+    storeContext(): void;
+    /**
+ * Update context
+ * @param newContext: the new context
+ */
+    updateContext(newContext?: ClipperUserInfo): void;
     /**
    * Perform auto login using current link data
      * @param email: the optional email if using OAuth2

package/core/index.d.ts

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

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

@@ -2031,7 +2031,7 @@ class ClipperService {
     }
     get loginInfo() {
         if (!this._loginInfo) {
-            const loginInfo = localStorage.getItem('clipper_login');
+            const loginInfo = localStorage.getItem('clipper_context');
             if (loginInfo) {
                 try {
                     this._loginInfo = JSON.parse(loginInfo);
@@ -2117,7 +2117,6 @@ class ClipperService {
         if (!tokenExpired || this.loggedIn()) {
             // Auto login
             this.loggedIn.set(true);
-            this.loggingIn.set(false);
             // Should refresh
             this.shouldRefreshToken.set(!!tokenExpirationDate);
             // Keep alive
@@ -2183,7 +2182,7 @@ class ClipperService {
     setToken(value) {
         sessionStorage.setItem('clipper_jwt', value.token);
         sessionStorage.setItem('clipper_jwt_refresh', value.refreshToken ?? '');
-        localStorage.setItem('clipper_mfa', value.MFAToken ?? '');
+        localStorage.setItem('clipper_mfa', value.mfaToken ?? '');
     }
     /**
      * Return current JWT token
@@ -2203,10 +2202,22 @@ class ClipperService {
         return localStorage.getItem("clipper_mfa");
     }
     /**
-     * Store login info
+     * Store context
      */
-    storeLogin() {
-        localStorage.setItem('clipper_login', JSON.stringify(this._loginInfo));
+    storeContext() {
+        localStorage.setItem('clipper_context', JSON.stringify(this._loginInfo));
+    }
+    /**
+ * Update context
+ * @param newContext: the new context
+ */
+    updateContext(newContext) {
+        // Update login info
+        if (!this._loginInfo)
+            this._loginInfo = { context: newContext };
+        else
+            this._loginInfo.context = newContext;
+        this.storeContext();
     }
     /**
    * Perform auto login using current link data
@@ -2269,7 +2280,6 @@ class ClipperService {
      * @returns: the login result
      */
     login(email, password, remember, oauth, oauthAccessToken = sessionStorage.getItem("clipper_oauth_token")) {
-        this.loggingIn.set(true);
         return this.httpClient
             .post(this._serviceUri + '/login2', {
             user: oauth ? null : email,
@@ -2285,26 +2295,25 @@ class ClipperService {
         })
             .pipe(catchError(err => {
             this.loggingIn.set(false);
-            localStorage.removeItem('clipper_login');
+            localStorage.removeItem('clipper_context');
             localStorage.removeItem('clipper_mfa');
             return throwError(() => err);
         }), map((r) => {
             if (r.success) {
-                // Store access token
-                const loginInfo = {
-                    context: r.value.context,
-                    channels: r.value.settings,
-                    OAUTH: oauth
-                };
-                if (!oauth) {
-                    loginInfo.credentials =
-                        SystemUtils.cipher(JSON.stringify({
-                            email: email,
-                            password: password,
-                            remember: remember,
-                        }), loginInfo.context.userId.toString());
-                    this.storeLogin();
+                if (!this._loginInfo)
+                    this._loginInfo = { context: undefined };
+                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;
+                }
+                console.log(r.value.requiresMFA ?? "no");
                 if (!oauth && r.value.requiresMFA) {
                     // Notify login is pending
                     this.broadcastService.sendMessage(ClipperMessages.LOGIN_PENDING);
@@ -2324,6 +2333,7 @@ class ClipperService {
     completeLogin(result) {
         // Update info            
         this.setToken(result);
+        this.updateContext(result.context);
         this.loggedIn.set(true);
         this.loggingIn.set(false);
         // Keep alive
@@ -2341,7 +2351,7 @@ class ClipperService {
         return this.httpClient
             .post(this._serviceUri + '/login/confirm/' + code, {})
             .pipe(catchError((err) => {
-            localStorage.removeItem('clipper_login');
+            localStorage.removeItem('clipper_context');
             localStorage.removeItem('clipper_mfa');
             this.loggingIn.set(false);
             return throwError(() => err);
@@ -2361,7 +2371,7 @@ class ClipperService {
             this.removeKeepAlive();
             this.clear(true);
             // Remove credentials
-            localStorage.removeItem('clipper_login');
+            localStorage.removeItem('clipper_context');
             localStorage.removeItem('clipper_mfa');
         }), catchError((_e) => {
             return of([]);
@@ -2375,7 +2385,6 @@ class ClipperService {
         this._loginInfo = undefined;
         // Logged out
         this.loggedIn.set(false);
-        this.loggingIn.set(false);
         // Reset channels
         this.availableChannels.set([]);
         // Notify
@@ -2808,7 +2817,7 @@ class ClipperService {
                 if (params.channels) {
                     // Update channels
                     this._loginInfo.channels = params.channels;
-                    this.storeLogin();
+                    this.storeContext();
                     this.initializeChannels();
                 }
             }
@@ -2831,7 +2840,7 @@ class ClipperService {
                 this.dashboard.isTrial = r.value.isTrial;
                 this.dashboard.items.set(r.value.items ?? []);
                 this.broadcastService.sendMessage(ClipperMessages.COMMAND_DASHBOARD_UPDATED);
-                this.storeLogin();
+                this.storeContext();
                 this.initializeChannels();
             }
             return r;