@posiwise/common-services 0.2.25 → 0.2.26

package/fesm2022/posiwise-common-services.mjs

@@ -323,8 +323,14 @@ class BaseHttpService {
         this.getConfig();
         this.toast = injector.get(CustomToastService);
     }
+    buildUrl(url) {
+        // Collapse any run of 2+ slashes (arises when baseUrl ends with '/'
+        // and the caller path also starts with '/', sometimes twice) down to
+        // one, while preserving the '://' of an absolute URL scheme.
+        return `${this.baseUrl}${url}`.replace(/([^:]\/)\/+/g, '$1');
+    }
     get(url) {
-        return this.http.get(`${this.baseUrl}${url}`).pipe(catchError(error => {
+        return this.http.get(this.buildUrl(url)).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
@@ -338,31 +344,31 @@ class BaseHttpService {
                 delete params[k];
             }
         }
-        return this.http.get(`${this.baseUrl}${url}`, { params }).pipe(catchError(error => {
+        return this.http.get(this.buildUrl(url), { params }).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
     }
     post(url, params = {}) {
-        return this.http.post(`${this.baseUrl}${url}`, params).pipe(catchError(error => {
+        return this.http.post(this.buildUrl(url), params).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
     }
     put(url, params = {}) {
-        return this.http.put(`${this.baseUrl}${url}`, params).pipe(catchError(error => {
+        return this.http.put(this.buildUrl(url), params).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
     }
     patch(url, params = {}) {
-        return this.http.patch(`${this.baseUrl}${url}`, params).pipe(catchError(error => {
+        return this.http.patch(this.buildUrl(url), params).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
     }
     delete(url, option = {}) {
-        return this.http.delete(`${this.baseUrl}${url}`, option).pipe(catchError(error => {
+        return this.http.delete(this.buildUrl(url), option).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
@@ -371,7 +377,7 @@ class BaseHttpService {
         const formData = new FormData();
         formData.append(param, file);
         const headers = new HttpHeaders({ enctype: 'multipart/form-data' });
-        return this.http.put(`${this.baseUrl}${url}`, formData, { headers }).pipe(catchError(error => {
+        return this.http.put(this.buildUrl(url), formData, { headers }).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
@@ -385,7 +391,7 @@ class BaseHttpService {
             }
         }
         const headers = new HttpHeaders({ enctype: 'multipart/form-data' });
-        return this.http.post(`${this.baseUrl}${url}`, formData, { headers }).pipe(catchError(error => {
+        return this.http.post(this.buildUrl(url), formData, { headers }).pipe(catchError(error => {
             this.handleError(error);
             return throwError(() => new HttpErrorResponse(error));
         }));
@@ -698,11 +704,11 @@ class SecureTokenStorageService {
         }
         return null;
     }
-    /**
-     * Delete cookie
-     */
+    // Attributes MUST mirror setSecureCookie — browsers require matching
+    // Secure + SameSite for the delete to take effect on HTTPS.
     deleteCookie(name) {
-        this.document.cookie = `${name}=; Path=/; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
+        const isSecure = this.document.location.protocol === 'https:';
+        this.document.cookie = `${name}=; Path=/; ${isSecure ? 'Secure; ' : ''}SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
     }
     /**
      * Initialize tokens from storage on service startup
@@ -2249,11 +2255,17 @@ class AhoyService {
         this.ahoy = '/ahoy';
         this.toast = injector.get(CustomToastService);
     }
+    // AhoyService does not extend BaseHttpService, so it needs its own
+    // slash normalization: the micro-service base URL ends with '/' and the
+    // path segments below start with '/', producing '/main-api/v1//versions'.
+    buildUrl(url) {
+        return url.replace(/([^:]\/)\/+/g, '$1');
+    }
     getAhoyEvents(params, service, paging) {
         const baseUrl = HelperService.getBaseUrlMicroService(service);
         const page = HelperService.getPagingParams(paging);
         return this.http
-            .get(`${baseUrl}${this.ahoy}/events`, {
+            .get(this.buildUrl(`${baseUrl}${this.ahoy}/events`), {
             params: { ...page, ...params }
         })
             .pipe(catchError(error => {
@@ -2265,7 +2277,7 @@ class AhoyService {
         const baseUrl = HelperService.getBaseUrlMicroService(service);
         const page = HelperService.getPagingParams(paging);
         return this.http
-            .get(`${baseUrl}${this.ahoy}/messages`, {
+            .get(this.buildUrl(`${baseUrl}${this.ahoy}/messages`), {
             params: { ...page, ...params }
         })
             .pipe(catchError(error => {
@@ -2277,7 +2289,7 @@ class AhoyService {
         const baseUrl = HelperService.getBaseUrlMicroService(service);
         const page = HelperService.getPagingParams(paging);
         return this.http
-            .get(`${baseUrl}${this.ahoy}/visits`, {
+            .get(this.buildUrl(`${baseUrl}${this.ahoy}/visits`), {
             params: { ...page, ...params }
         })
             .pipe(catchError(error => {
@@ -2289,7 +2301,7 @@ class AhoyService {
         const baseUrl = HelperService.getBaseUrlMicroService(service);
         const page = HelperService.getPagingParams(paging);
         return this.http
-            .get(`${baseUrl}/versions/get_all`, {
+            .get(this.buildUrl(`${baseUrl}/versions/get_all`), {
             params: { ...page, ...params }
         })
             .pipe(catchError(error => {
@@ -2301,7 +2313,7 @@ class AhoyService {
         const baseUrl = HelperService.getBaseUrlMicroService(service);
         const page = HelperService.getPagingParams(paging);
         return this.http
-            .get(`${baseUrl}/events/get_all`, {
+            .get(this.buildUrl(`${baseUrl}/events/get_all`), {
             params: { ...page, ...params }
         })
             .pipe(catchError(error => {
@@ -2368,7 +2380,7 @@ class CommonService {
         return this.api.put(`${NEWSLETTER_SUBSCRIPTION_PATH}/${newsletterId}/toggle`, param);
     }
     unsubscribeNewsletter(token) {
-        return this.api.get(`/${NEWSLETTER_UNSUBSCRIBE_PATH}?token=${token}`);
+        return this.api.get(`${NEWSLETTER_UNSUBSCRIBE_PATH}?token=${token}`);
     }
     // FAQ
     getFaq(params) {