@esolve/ng-esolve-connect 0.29.4 → 0.29.6

package/fesm2015/esolve-ng-esolve-connect.mjs

@@ -168,6 +168,26 @@ class EsolveSessionService {
             clearTimeout(this.key_expiration_timer);
         }
     }
+    getCachedSession() {
+        let json_data = this.cookieService.get(this.storage_key);
+        if (json_data === '') {
+            const local_store_data = this.getBackup();
+            if (local_store_data) {
+                json_data = local_store_data;
+            }
+        }
+        const stored_session = (json_data ? JSON.parse(json_data) : null);
+        if (!stored_session) {
+            return null;
+        }
+        const expiration_date = new Date(stored_session.expiration_date);
+        const loaded_session = new EsolveSession(stored_session.id, stored_session.location_id, stored_session.key, expiration_date);
+        return loaded_session;
+    }
+    resetSessionCache() {
+        this.cookieService.delete(this.storage_key, '/');
+        this.removeBackup();
+    }
     restore(expirationCallback, invalidSessionCallback) {
         if (this.currentSession.valid) {
             return;
@@ -249,6 +269,15 @@ class EsolveSessionService {
         }
         localStorage.setItem(this.storage_key, data);
     }
+    removeBackup() {
+        if (!this.is_browser) {
+            return;
+        }
+        if (!localStorage) {
+            return;
+        }
+        localStorage.removeItem(this.storage_key);
+    }
 }
 EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.3", ngImport: i0, type: EsolveSessionService, deps: [{ token: PLATFORM_ID }, { token: ESOLVE_CONNECT_CONFIG }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveSessionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.3", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
@@ -1712,6 +1741,11 @@ class EsolveAuthService {
         this.errorHandler = errorHandler;
         this.cookieService = cookieService;
     }
+    static preValidate(auth) {
+        return () => {
+            return auth.validateCachedTokens();
+        };
+    }
     getAccessToken(email, password, anonymous = false) {
         let params = new HttpParams();
         if (anonymous) {
@@ -1740,11 +1774,14 @@ class EsolveAuthService {
         }));
     }
     autoLogin() {
-        this.session.restore(this.handleExpiration(), () => {
-            firstValueFrom(this.getAccessToken('', '', true)).then(() => {
-                // empty
-            }, (error) => {
-                console.error(error);
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.validateCachedTokens();
+            this.session.restore(this.handleExpiration(), () => {
+                firstValueFrom(this.getAccessToken('', '', true)).then(() => {
+                    // empty
+                }, (error) => {
+                    console.error(error);
+                });
             });
         });
     }
@@ -1802,6 +1839,26 @@ class EsolveAuthService {
             throw new Error('Invalid response');
         });
     }
+    validateCachedTokens() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let valid = false;
+            try {
+                const session = this.session.getCachedSession();
+                if (!session) {
+                    throw null;
+                }
+                const result = yield firstValueFrom(this.checkAccessToken(session));
+                if (!result.key) {
+                    throw null;
+                }
+                valid = true;
+            }
+            catch (error) {
+                this.session.resetSessionCache();
+            }
+            return valid;
+        });
+    }
     checkAccessToken(session) {
         var _a;
         session = session || this.session.currentSession;
@@ -2623,7 +2680,8 @@ class EsolveCoupon {
 ;
 
 class EsolveCouponsService {
-    constructor(config, http, cookieService) {
+    constructor(platformId, config, http, cookieService) {
+        this.platformId = platformId;
         this.config = config;
         this.http = http;
         this.cookieService = cookieService;
@@ -2633,6 +2691,7 @@ class EsolveCouponsService {
         this.validation_error = new Subject();
         this.setStorageKey();
         this.coupons_cache = this.retrieveCache();
+        this.is_browser = isPlatformBrowser(this.platformId);
     }
     onValidationError() {
         return this.validation_error.asObservable();
@@ -2712,11 +2771,10 @@ class EsolveCouponsService {
         this.deleteCoupons();
     }
     retrieveCache() {
-        if (this.cookieService.check(this.storage_key) ||
-            localStorage.getItem(this.storage_key)) {
+        if (this.cookieService.check(this.storage_key) || this.getBackup()) {
             let coupons_json = this.cookieService.get(this.storage_key);
-            if (coupons_json === '' && localStorage) {
-                let local_store_data = localStorage.getItem(this.storage_key);
+            if (coupons_json === '') {
+                const local_store_data = this.getBackup();
                 if (local_store_data) {
                     coupons_json = local_store_data;
                 }
@@ -2734,9 +2792,7 @@ class EsolveCouponsService {
         if (this.coupons_cache.size > 0) {
             const coupons_json = this.jsonEncodeMap(this.coupons_cache);
             this.cookieService.set(this.storage_key, coupons_json, undefined, '/');
-            if (localStorage) {
-                localStorage.setItem(this.storage_key, coupons_json);
-            }
+            this.setBackup(coupons_json);
         }
         else {
             this.deleteCoupons();
@@ -2745,9 +2801,34 @@ class EsolveCouponsService {
     deleteCoupons() {
         this.coupons_cache.clear();
         this.cookieService.delete(this.storage_key, '/');
-        if (localStorage) {
-            localStorage.removeItem(this.storage_key);
+        this.removeBackup();
+    }
+    getBackup() {
+        if (!this.is_browser) {
+            return null;
+        }
+        if (!localStorage) {
+            return null;
         }
+        return localStorage.getItem(this.storage_key);
+    }
+    setBackup(data) {
+        if (!this.is_browser) {
+            return;
+        }
+        if (!localStorage) {
+            return;
+        }
+        localStorage.setItem(this.storage_key, data);
+    }
+    removeBackup() {
+        if (!this.is_browser) {
+            return;
+        }
+        if (!localStorage) {
+            return;
+        }
+        localStorage.removeItem(this.storage_key);
     }
     addCoupon(id, key) {
         if (!this.coupons_cache.has(id)) {
@@ -2803,7 +2884,7 @@ class EsolveCouponsService {
         return coupons;
     }
 }
-EsolveCouponsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.3", ngImport: i0, type: EsolveCouponsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCouponsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.3", ngImport: i0, type: EsolveCouponsService, deps: [{ token: PLATFORM_ID }, { token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveCouponsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.3", ngImport: i0, type: EsolveCouponsService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.3", ngImport: i0, type: EsolveCouponsService, decorators: [{
             type: Injectable,
@@ -2812,6 +2893,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.3", ngImpor
                 }]
         }], ctorParameters: function () {
         return [{ type: undefined, decorators: [{
+                        type: Inject,
+                        args: [PLATFORM_ID]
+                    }] }, { type: undefined, decorators: [{
                         type: Inject,
                         args: [ESOLVE_CONNECT_CONFIG]
                     }] }, { type: i1$2.HttpClient }, { type: EsolveCookieService }];