@esolve/ng-esolve-connect 0.11.1 → 0.12.0

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

@@ -19,8 +19,9 @@ const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 // };
 
 class EsolveSession {
-    constructor(id = -1, key = '', expiration_date) {
+    constructor(id = -1, location_id = 0, key = '', expiration_date) {
         this.id = id;
+        this.location_id = location_id;
         this.key = key;
         this.expiration_date = expiration_date;
     }
@@ -40,6 +41,9 @@ class EsolveSession {
     updateUser(user_id) {
         this.id = user_id;
     }
+    updateLocation(location_id) {
+        this.location_id = location_id;
+    }
 }
 
 class EsolveCookieService {
@@ -144,7 +148,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: ['RESPONSE']
                 }] }]; } });
 
-// TODO: Rewrite session manager to use a pure rxjs solution.
 class EsolveSessionService {
     constructor(platformId, config, cookieService) {
         this.platformId = platformId;
@@ -159,17 +162,6 @@ class EsolveSessionService {
     get currentSession() {
         return this._session.value;
     }
-    setStorageKey() {
-        if ((typeof this.config.user_session_storage_key === 'string') &&
-            (this.config.user_session_storage_key !== '')) {
-            this.storage_key = this.config.user_session_storage_key;
-        }
-    }
-    startTimer(callback, duration) {
-        if (this.is_browser) {
-            this.key_expiration_timer = setTimeout(callback, duration);
-        }
-    }
     clearTimer() {
         if (this.key_expiration_timer) {
             clearTimeout(this.key_expiration_timer);
@@ -186,7 +178,7 @@ class EsolveSessionService {
             return;
         }
         const expiration_date = new Date(stored_session.expiration_date);
-        const loaded_session = new EsolveSession(stored_session.id, stored_session.key, expiration_date);
+        const loaded_session = new EsolveSession(stored_session.id, stored_session.location_id, stored_session.key, expiration_date);
         if (!loaded_session.expired) {
             this._session.next(loaded_session);
             const expiration_duration = expiration_date.getTime() - new Date().getTime();
@@ -196,22 +188,38 @@ class EsolveSessionService {
             expirationCallback(loaded_session);
         }
     }
-    handleSession(user_id, key, expiry_time, expires, expirationCallback) {
+    handleSession(user_id, location_id, key, expiry_time, expires, expirationCallback) {
         const expiration_date = new Date(expiry_time * 1000);
-        const session = new EsolveSession(user_id, key, expiration_date);
+        const session = new EsolveSession(user_id, location_id, key, expiration_date);
         this.cookieService.set(this.storage_key, JSON.stringify(session), expiration_date, '/');
         this._session.next(session);
         this.startTimer(expirationCallback, expires * 1000);
     }
-    handleUpdateSession(user_id, callback) {
+    handleUpdateSession({ user_id, location_id, }, callback) {
         const current_session = this.currentSession;
-        current_session.updateUser(user_id);
+        if (typeof user_id !== 'undefined') {
+            current_session.updateUser(user_id);
+        }
+        if (typeof location_id !== 'undefined') {
+            current_session.updateLocation(location_id);
+        }
         this.cookieService.set(this.storage_key, JSON.stringify(current_session), current_session.expiration_date, '/');
         this._session.next(current_session);
         if (typeof callback === 'function') {
             callback();
         }
     }
+    setStorageKey() {
+        if ((typeof this.config.user_session_storage_key === 'string') &&
+            (this.config.user_session_storage_key !== '')) {
+            this.storage_key = this.config.user_session_storage_key;
+        }
+    }
+    startTimer(callback, duration) {
+        if (this.is_browser) {
+            this.key_expiration_timer = setTimeout(callback, duration);
+        }
+    }
 }
 EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", 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: "13.1.1", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
@@ -698,7 +706,7 @@ class EsolveAuthService {
                 throw responseData;
             }
         }), catchError(this.handleError), tap((responseData) => {
-            this.handleAuthentication(responseData);
+            this.handleAuthentication(responseData.additional_data);
         }));
     }
     autoLogin() {
@@ -736,8 +744,14 @@ class EsolveAuthService {
             for (const response_log of login_response.log) {
                 if ((response_log.type === 'success') &&
                     (response_log.message_code === 'login_success')) {
-                    this.session.handleUpdateSession(login_response.esolve_id);
-                    return login_response.esolve_id;
+                    const session_data = login_response.session_data;
+                    const user_id = +login_response.esolve_id;
+                    const location_id = +session_data.location_id;
+                    this.session.handleUpdateSession({
+                        user_id: user_id,
+                        location_id: location_id
+                    });
+                    return user_id;
                 }
             }
             throw login_response;
@@ -766,8 +780,15 @@ class EsolveAuthService {
                 (!responseData.additional_data.key_okay)) {
                 throw responseData;
             }
-            responseData.additional_data.key = token;
-            return responseData;
+            const additional_data = responseData.additional_data;
+            const result = {
+                key: token,
+                expires: additional_data.expires,
+                expiry_time: additional_data.expiry_time,
+                location_id: additional_data.location_id,
+                user_id: additional_data.user_id,
+            };
+            return result;
         }))
             .toPromise();
     }
@@ -781,11 +802,11 @@ class EsolveAuthService {
             });
         };
     }
-    handleAuthentication(responseData) {
-        if (!responseData.additional_data.key) {
+    handleAuthentication(result) {
+        if (!result.key) {
             return;
         }
-        this.session.handleSession(responseData.additional_data.user_id, responseData.additional_data.key, +responseData.additional_data.expiry_time, +responseData.additional_data.expires, this.handleExpiration());
+        this.session.handleSession(+result.user_id, +result.location_id, result.key, +result.expiry_time, +result.expires, this.handleExpiration());
     }
     handleError(errorRes) {
         const error = {
@@ -1114,6 +1135,7 @@ class EsolveRegistrationResult extends EsolveResponseResult {
         this.guest = response.guest;
         this.auto_login = response.auto_login;
         this.authentication_required = response.authentication_required;
+        this.location_id = response.session_data.location_id;
     }
 }
 
@@ -1134,6 +1156,13 @@ class EsolveResetPasswordResult extends EsolveResponseResult {
     }
 }
 
+class EsolveLocationUpdateResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.location_updated = (response.esolve_id > 0);
+    }
+}
+
 class EsolveAccountService {
     constructor(config, http, sessionService, errorHandler, responseHandler) {
         this.config = config;
@@ -1251,7 +1280,10 @@ class EsolveAccountService {
         })
             .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
             if (response.auto_login) {
-                this.sessionService.handleUpdateSession(response.esolve_id);
+                this.sessionService.handleUpdateSession({
+                    user_id: +response.esolve_id,
+                    location_id: +response.session_data.location_id,
+                });
             }
             return new EsolveRegistrationResult(response);
         })), catchError((errorRes) => {
@@ -1304,13 +1336,31 @@ class EsolveAccountService {
         })
             .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
             if (!response.login_required) {
-                this.sessionService.handleUpdateSession(response.esolve_id);
+                this.sessionService.handleUpdateSession({
+                    user_id: +response.esolve_id,
+                    location_id: +response.session_data.location_id,
+                });
             }
             return new EsolveResetPasswordResult(response);
         })), catchError((errorRes) => {
             return this.errorHandler.handleHttpPostError('set-forgot-password', errorRes);
         }));
     }
+    updateLocation(location_id) {
+        const body = { location_id };
+        return this.http
+            .post(`${this.config.api_url}/set-session-location.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
+            },
+            responseType: 'json',
+            observe: 'body',
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+            this.sessionService.handleUpdateSession({ location_id });
+            return new EsolveLocationUpdateResult(response);
+        })));
+    }
     getTransactions(options = {}) {
         try {
             this.loginGuard();
@@ -3212,4 +3262,3 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
  */
 
 export { EsolveAccountService, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveCookieService, EsolveErrorHandlerService, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHeading, EsolveHttpError, EsolveList, EsolveLocationsService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockLocationAddress, EsolveStockLocationContactInfo, EsolveStockLocationPOBoxAddress, EsolveStockLocationTradingTimes, EsolveStockLocationTradingTimesDay, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };
-//# sourceMappingURL=esolve-ng-esolve-connect.mjs.map