@esolve/ng-esolve-connect 0.129.0 → 0.130.0

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

@@ -1,11 +1,11 @@
 import { isPlatformBrowser, CommonModule, IMAGE_LOADER, DOCUMENT } from '@angular/common';
-import { HttpErrorResponse, HttpClient, HttpParams, HttpHeaders, provideHttpClient, withInterceptors, withInterceptorsFromDi } from '@angular/common/http';
+import { HttpErrorResponse, HttpClient, HttpStatusCode, HttpParams, HttpHeaders, provideHttpClient, withInterceptors, withInterceptorsFromDi } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { InjectionToken, inject, Injectable, PLATFORM_ID, signal, computed, provideAppInitializer, NgModule, ElementRef, HostListener, Input, Directive } from '@angular/core';
+import { InjectionToken, inject, Injectable, PLATFORM_ID, ApplicationRef, signal, computed, provideAppInitializer, NgModule, ElementRef, HostListener, Input, Directive } from '@angular/core';
 import { SsrCookieService } from 'ngx-cookie-service-ssr';
-import { throwError, Subject, switchMap, timer, takeUntil, filter, distinctUntilChanged, catchError as catchError$1, of, tap, firstValueFrom, map as map$1, BehaviorSubject, iif } from 'rxjs';
 import { toObservable } from '@angular/core/rxjs-interop';
-import { fromUnixTime, parseISO } from 'date-fns';
+import { throwError, Subject, filter, take, shareReplay, switchMap, timer, takeUntil, merge, distinctUntilChanged, firstValueFrom, from, catchError as catchError$1, of, tap, map as map$1, BehaviorSubject, iif } from 'rxjs';
+import { fromUnixTime, isAfter, parseISO } from 'date-fns';
 import { map, catchError, switchMap as switchMap$1 } from 'rxjs/operators';
 import { Title, Meta } from '@angular/platform-browser';
 
@@ -522,6 +522,7 @@ class EsolveSessionService {
         this.config = inject(EsolveConfigService);
         this.cookieService = inject(EsolveCookieService);
         this.storage_key = this.setStorageKey();
+        this.appRef = inject(ApplicationRef);
         this.token = signal('');
         this.user_id = signal(0);
         this.access_level = signal(0);
@@ -554,8 +555,11 @@ class EsolveSessionService {
         this.timer_stop = new Subject();
         this.expire = new Subject();
         this.session_end = new Subject();
+        this.app_stable_init$ = this.appRef.isStable.pipe(filter(Boolean), take(1), shareReplay(1));
         this.timer_start
-            .pipe(switchMap((time) => timer(time).pipe(takeUntil(this.timer_stop))))
+            .pipe(switchMap((time) => {
+            return timer(time).pipe(takeUntil(merge(this.timer_stop, this.timer_start)));
+        }))
             .subscribe(() => {
             // Stored time expired. Check if session is valid
             this.session_end.next();
@@ -652,7 +656,8 @@ class EsolveSessionService {
     stopTimer() {
         this.timer_stop.next();
     }
-    startTimer(time) {
+    async startTimer(time) {
+        await firstValueFrom(this.app_stable_init$);
         this.timer_start.next(time);
     }
     getCachedSession() {
@@ -660,11 +665,14 @@ class EsolveSessionService {
     }
     reset() {
         this.removeCache();
-        this.timer_stop.next();
+        this.stopTimer();
     }
     handleSession(session, expiry_date_unix, grace_unix) {
         const expiry_date = fromUnixTime(expiry_date_unix);
         const grace_expiry_date = fromUnixTime(expiry_date_unix + grace_unix);
+        if (!isAfter(grace_expiry_date, Date.now())) {
+            throw new Error('Invalid session expiry');
+        }
         this.setCache(session.token, grace_expiry_date);
         this.updateUserId(session.user_id);
         this.updateAccessLevel(session.access_level);
@@ -696,6 +704,10 @@ class EsolveSessionService {
         }
         if (typeof options.token !== 'undefined' &&
             options.token.trim() !== '') {
+            const expiry_date_unix = options.expiry_date_unix ?? 0;
+            const grace_unix = options.grace_unix ?? 0;
+            const grace_expiry_date = fromUnixTime(expiry_date_unix + grace_unix);
+            this.setCache(options.token, grace_expiry_date);
             this.updateToken(options.token);
         }
     }
@@ -813,14 +825,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
         }] });
 
 class EsolveAuthService {
+    #validating_session;
+    get validating_session() {
+        return this.#validating_session.asReadonly();
+    }
     constructor() {
         this.config = inject(EsolveConfigService);
         this.http = inject(HttpClient);
         this.session = inject(EsolveSessionService);
         this.errorHandler = inject(EsolveErrorHandlerService);
+        this.#validating_session = signal(false);
+        this.validating_session$ = toObservable(this.#validating_session);
         this.session
             .onSessionEnd()
-            .pipe(switchMap(() => this.checkAccessToken()), catchError$1(() => of(null)))
+            .pipe(switchMap(() => {
+            return from(this.checkAccessToken()).pipe(catchError$1((error) => {
+                if (error instanceof HttpErrorResponse &&
+                    error.status === HttpStatusCode.Unauthorized) {
+                    // Token is invalid or expired
+                    return of(null);
+                }
+                throw error;
+            }));
+        }))
             .subscribe((result) => {
             if (result) {
                 this.handleAuthentication(result);
@@ -934,7 +961,10 @@ class EsolveAuthService {
         }));
     }
     async logout() {
-        this.session.stopTimer();
+        if (this.session.getToken() === '') {
+            this.resetLocalSession();
+            return false;
+        }
         const response = await firstValueFrom(this.http
             .post(`${this.config.api_url}/set-logout.php`, {}, {
             headers: {
@@ -997,14 +1027,46 @@ class EsolveAuthService {
         }
         catch (error) {
             console.error(error);
+            this.session.updateToken('');
             this.session.reset();
         }
         return valid;
     }
+    async validateSessionAndRefresh() {
+        if (this.#validating_session()) {
+            return firstValueFrom(this.onSessionValidationEnd());
+        }
+        this.#validating_session.set(true);
+        let token = '';
+        try {
+            const session = this.session.getCachedSession();
+            if (!session) {
+                throw new Error('Invalid session');
+            }
+            const result = await this.checkAccessToken(session);
+            if (!result.key) {
+                throw new Error('Invalid key');
+            }
+            this.handleAuthentication(result);
+            token = result.key;
+        }
+        catch (error) {
+            console.error(error);
+            this.session.updateToken('');
+            const response = await firstValueFrom(this.getAnonymousSession());
+            const result = response.additional_data;
+            token = result.key;
+        }
+        finally {
+            this.#validating_session.set(false);
+        }
+        return token;
+    }
     /**
      * Use when logout fails to forcibly reset the local session
      */
     async resetLocalSession() {
+        this.session.updateToken('');
         this.session.reset();
         await firstValueFrom(this.getAnonymousSession());
     }
@@ -1053,6 +1115,7 @@ class EsolveAuthService {
         }
         catch (error) {
             console.error(error);
+            this.session.updateToken('');
             this.session.reset();
         }
         return null;
@@ -1091,6 +1154,9 @@ class EsolveAuthService {
         }
         return throwError(() => error);
     }
+    onSessionValidationEnd() {
+        return this.validating_session$.pipe(filter((busy) => !busy), switchMap(() => this.session.onTokenUpdate()), take(1));
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: EsolveAuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.15", ngImport: i0, type: EsolveAuthService, providedIn: 'root' }); }
 }
@@ -1238,6 +1304,43 @@ const esolveAuthInterceptor = (req, next) => {
     return next(req);
 };
 
+const esolveUnauthorizedErrorInterceptor = (req, next) => {
+    const config = inject(EsolveConfigService);
+    const session = inject(EsolveSessionService);
+    const auth = inject(EsolveAuthService);
+    if (req.url.startsWith(`${config.api_url}/`)) {
+        const service_identifier = req.url.replace(`${config.api_url}/`, '');
+        // Skip the following services
+        const excluded_services = ['get-access-token.php', 'set-logout.php'];
+        if (excluded_services.includes(service_identifier)) {
+            return next(req);
+        }
+        return next(req).pipe(catchError$1((error) => {
+            if (error.status === HttpStatusCode.Unauthorized) {
+                const validation_end_stream$ = from(auth.validateSessionAndRefresh());
+                // Wait for valid session and retry
+                return validation_end_stream$.pipe(switchMap((token) => {
+                    if (req.method !== 'GET') {
+                        throw new Error('Invalid session. Please try again');
+                    }
+                    // Retry request with new token
+                    let headers = req.headers;
+                    const state_hash = session.getStateHash();
+                    headers = headers.set('X-Esolve-State-Hash', state_hash);
+                    // Retry request with new header
+                    headers = headers.set('Authorization', `Bearer ${token}`);
+                    const retry_req = req.clone({
+                        headers,
+                    });
+                    return next(retry_req);
+                }));
+            }
+            throw error;
+        }));
+    }
+    return next(req);
+};
+
 const ESOLVE_EURUS_AUTO_LOGIN = provideAppInitializer(() => {
     const initializerFn = ((auth) => async () => {
         await auth.autoLogin();
@@ -1253,7 +1356,10 @@ function provideNgEsolveConnect(config, auto_login = false) {
             provide: ESOLVE_CONNECT_CONFIG,
             useValue: config,
         },
-        provideHttpClient(withInterceptors([esolveAuthInterceptor])),
+        provideHttpClient(withInterceptors([
+            esolveAuthInterceptor,
+            esolveUnauthorizedErrorInterceptor,
+        ])),
     ];
     if (auto_login) {
         providers.push(ESOLVE_EURUS_AUTO_LOGIN);
@@ -5988,23 +6094,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
                 }]
         }], ctorParameters: () => [] });
 
-class EsolveSessionShippingUpdateResult extends EsolveResponseResult {
+class EsolveSessionClientUpdateResult extends EsolveResponseResult {
     constructor(response) {
         super(response);
         if (typeof response.esolve_id === 'string') {
             throw new Error('Invalid response id.');
         }
-        this.shipping_updated = response.esolve_id > 0;
+        this.client_updated = response.esolve_id > 0;
     }
 }
 
-class EsolveSessionClientUpdateResult extends EsolveResponseResult {
+class EsolveSessionShippingUpdateResult extends EsolveResponseResult {
     constructor(response) {
         super(response);
         if (typeof response.esolve_id === 'string') {
             throw new Error('Invalid response id.');
         }
-        this.client_updated = response.esolve_id > 0;
+        this.shipping_updated = response.esolve_id > 0;
     }
 }
 
@@ -6163,8 +6269,13 @@ class EsolveAccountService {
             if (response.auto_login) {
                 const session_data = response.session_data;
                 let token = '';
+                let expiry_date_unix = undefined;
+                let grace_unix = undefined;
                 if (!Array.isArray(additional_data)) {
                     token = additional_data.key;
+                    expiry_date_unix =
+                        +additional_data.expiry_time;
+                    grace_unix = +additional_data.grace_period;
                 }
                 this.sessionService.handleUpdateSession({
                     user_id: +response.esolve_id,
@@ -6173,6 +6284,8 @@ class EsolveAccountService {
                     shipping_id: +session_data.shipping_id,
                     clients_id: +session_data.clients_id,
                     token,
+                    expiry_date_unix,
+                    grace_unix,
                 });
             }
             return new EsolveRegistrationResult(response);
@@ -9740,5 +9853,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.15", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { ESOLVE_CONNECT_CONFIG, ESOLVE_EURUS_AUTO_LOGIN, EsolveAccountConfirmationResult, EsolveAccountPayment, EsolveAccountService, EsolveAdditionalStockImage, EsolveAddress, EsolveAddressResult, EsolveAffiliate, EsolveAffiliateCheckResult, EsolveAffiliateLinkResult, EsolveAffiliateService, EsolveAlbum, EsolveAlbumImage, EsolveAlbumImageList, EsolveAlbumList, EsolveAlbumsService, EsolveAsset, EsolveAssetsService, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCaptcha, EsolveCaptchaService, EsolveCartAlternative, EsolveCartItem, EsolveCartService, EsolveCartStockItem, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveCdnSrcDirective, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveClientAsset, EsolveClientAssetList, EsolveColour, EsolveCompetition, EsolveCompetitionDates, EsolveCompetitionEntryResult, EsolveCompetitionWinner, EsolveCompetitionsService, EsolveConfigService, EsolveCookieService, EsolveCountry, EsolveCountryService, EsolveCoupon, EsolveCouponsService, EsolveDeliveriesService, EsolveDelivery, EsolveDeliveryCategoryTotals, EsolveDeliveryList, EsolveDeliveryStatus, EsolveDependantItem, EsolveDeviceService, EsolveEmptyCartResult, EsolveEmptyWishlistResult, EsolveEnquiryResult, EsolveEnquiryService, EsolveErpDocumentRequest, EsolveErpDocumentsRequestResult, EsolveErrorHandlerService, EsolveFilterFactory, EsolveGenericFilter, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHttpError, EsolveLinkedAsset, EsolveLinkedStockItem, EsolveList, EsolveLocation, EsolveLocationAddress, EsolveLocationContactInfo, EsolveLocationGEO, EsolveLocationList, EsolveLocationPOBoxAddress, EsolveLocationTradingDay, EsolveLocationTradingTimes, EsolveLocationUpdateResult, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaStockItem, EsolveMenuItem, EsolveMenuService, EsolveMultipleSelectFilter, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolveNewsletterResult, EsolveOtp, EsolveOtpService, EsolveOtpValidation, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangeFilter, EsolveRangesService, EsolveRecipeStockItem, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveReview, EsolveReviewList, EsolveReviewResult, EsolveReviewsService, EsolveSeoInfo, EsolveSeoService, EsolveSessionAddressUpdateResult, EsolveSessionClientUpdateResult, EsolveSessionMetadataService, EsolveSessionService, EsolveSessionShippingUpdateResult, EsolveSetDeviceResult, EsolveSetNotifyResult, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveShippingTotals, EsolveSingleSelectFilter, EsolveSpecial, EsolveSpecialDates, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStatement, EsolveStatementAgeing, EsolveStatementBalances, EsolveStatementTransaction, EsolveStockBadge, EsolveStockGroup, EsolveStockGroupItem, EsolveStockImage, EsolveStockImageCollection, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, EsolveStockItemLocationLevel, EsolveStockLeadTimes, EsolveStockPrice, EsolveStockReviewsReport, EsolveStockService, EsolveStockTransactionSales, EsolveSuggestedStockItem, EsolveSupplier, EsolveSuppliersService, EsolveTag, EsolveTagsService, EsolveTimeSlot, EsolveTimeSlotConfig, EsolveTimeSlotDate, EsolveTimeSlotDays, EsolveTimeSlotTimes, EsolveToggleFilter, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionAnalyticsData, EsolveTransactionApprovalResult, EsolveTransactionClient, EsolveTransactionDelivery, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionPick, EsolveTransactionShippingMethod, EsolveTransactionTimeSlot, EsolveTransactionUser, EsolveTransactionsService, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveUserClientAccount, EsolveUserClientAccountBalances, EsolveUserDevice, EsolveVaultItem, EsolveVaultItemResult, EsolveVoucher, EsolveVouchersService, EsolveWalletBalances, EsolveWalletService, EsolveWalletTransaction, EsolveWalletTransactionsList, EsolveWishlistItem, EsolveWishlistService, NgEsolveConnectModule, esolveAuthInterceptor, esolveHexHash, isEsolveCdnPath, isFtgCdnPath, isLegacyEsolveCdnPath, processEsolveImageSrc, provideEsolveImageLoader, provideNgEsolveConnect };
+export { ESOLVE_CONNECT_CONFIG, ESOLVE_EURUS_AUTO_LOGIN, EsolveAccountConfirmationResult, EsolveAccountPayment, EsolveAccountService, EsolveAdditionalStockImage, EsolveAddress, EsolveAddressResult, EsolveAffiliate, EsolveAffiliateCheckResult, EsolveAffiliateLinkResult, EsolveAffiliateService, EsolveAlbum, EsolveAlbumImage, EsolveAlbumImageList, EsolveAlbumList, EsolveAlbumsService, EsolveAsset, EsolveAssetsService, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCaptcha, EsolveCaptchaService, EsolveCartAlternative, EsolveCartItem, EsolveCartService, EsolveCartStockItem, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveCdnSrcDirective, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveClientAsset, EsolveClientAssetList, EsolveColour, EsolveCompetition, EsolveCompetitionDates, EsolveCompetitionEntryResult, EsolveCompetitionWinner, EsolveCompetitionsService, EsolveConfigService, EsolveCookieService, EsolveCountry, EsolveCountryService, EsolveCoupon, EsolveCouponsService, EsolveDeliveriesService, EsolveDelivery, EsolveDeliveryCategoryTotals, EsolveDeliveryList, EsolveDeliveryStatus, EsolveDependantItem, EsolveDeviceService, EsolveEmptyCartResult, EsolveEmptyWishlistResult, EsolveEnquiryResult, EsolveEnquiryService, EsolveErpDocumentRequest, EsolveErpDocumentsRequestResult, EsolveErrorHandlerService, EsolveFilterFactory, EsolveGenericFilter, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHttpError, EsolveLinkedAsset, EsolveLinkedStockItem, EsolveList, EsolveLocation, EsolveLocationAddress, EsolveLocationContactInfo, EsolveLocationGEO, EsolveLocationList, EsolveLocationPOBoxAddress, EsolveLocationTradingDay, EsolveLocationTradingTimes, EsolveLocationUpdateResult, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaStockItem, EsolveMenuItem, EsolveMenuService, EsolveMultipleSelectFilter, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolveNewsletterResult, EsolveOtp, EsolveOtpService, EsolveOtpValidation, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangeFilter, EsolveRangesService, EsolveRecipeStockItem, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveReview, EsolveReviewList, EsolveReviewResult, EsolveReviewsService, EsolveSeoInfo, EsolveSeoService, EsolveSessionAddressUpdateResult, EsolveSessionClientUpdateResult, EsolveSessionMetadataService, EsolveSessionService, EsolveSessionShippingUpdateResult, EsolveSetDeviceResult, EsolveSetNotifyResult, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveShippingTotals, EsolveSingleSelectFilter, EsolveSpecial, EsolveSpecialDates, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStatement, EsolveStatementAgeing, EsolveStatementBalances, EsolveStatementTransaction, EsolveStockBadge, EsolveStockGroup, EsolveStockGroupItem, EsolveStockImage, EsolveStockImageCollection, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, EsolveStockItemLocationLevel, EsolveStockLeadTimes, EsolveStockPrice, EsolveStockReviewsReport, EsolveStockService, EsolveStockTransactionSales, EsolveSuggestedStockItem, EsolveSupplier, EsolveSuppliersService, EsolveTag, EsolveTagsService, EsolveTimeSlot, EsolveTimeSlotConfig, EsolveTimeSlotDate, EsolveTimeSlotDays, EsolveTimeSlotTimes, EsolveToggleFilter, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionAnalyticsData, EsolveTransactionApprovalResult, EsolveTransactionClient, EsolveTransactionDelivery, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionPick, EsolveTransactionShippingMethod, EsolveTransactionTimeSlot, EsolveTransactionUser, EsolveTransactionsService, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveUserClientAccount, EsolveUserClientAccountBalances, EsolveUserDevice, EsolveVaultItem, EsolveVaultItemResult, EsolveVoucher, EsolveVouchersService, EsolveWalletBalances, EsolveWalletService, EsolveWalletTransaction, EsolveWalletTransactionsList, EsolveWishlistItem, EsolveWishlistService, NgEsolveConnectModule, esolveAuthInterceptor, esolveHexHash, esolveUnauthorizedErrorInterceptor, isEsolveCdnPath, isFtgCdnPath, isLegacyEsolveCdnPath, processEsolveImageSrc, provideEsolveImageLoader, provideNgEsolveConnect };
 //# sourceMappingURL=esolve-ng-esolve-connect.mjs.map