tango-app-ui-shared 3.5.0-alpha.10 → 3.5.0-alpha.12

package/fesm2022/tango-app-ui-shared.mjs

@@ -73,7 +73,7 @@ class AuthService {
         return headers;
     }
     logout() {
-        this.deleteCookie(this.authlocalStorageToken);
+        // this.deleteCookie(this.authlocalStorageToken);
         return this.http.get(`${this.userApiUrl}/logout`);
     }
     getClients() {
@@ -150,24 +150,6 @@ class AuthService {
     getHeaderZone(data) {
         return this.http.post(`${this.trafficApiUrl}/headerZoneV2`, data);
     }
-    base64Encode(str) {
-        return btoa(encodeURIComponent(str));
-    }
-    base64Decode(str) {
-        return decodeURIComponent(atob(str));
-    }
-    setCookie(name, value, days = 1) {
-        const encodedValue = this.base64Encode(value);
-        const expires = new Date(Date.now() + days * 864e5).toUTCString();
-        document.cookie = `${name}=${encodedValue}; expires=${expires}; path=/; Secure; SameSite=Strict`;
-    }
-    getCookie(name) {
-        const match = document.cookie.match(new RegExp(`(^| )${name}=([^;]+)`));
-        return match ? this.base64Decode(match[2]) : null;
-    }
-    deleteCookie(name) {
-        document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthService, deps: [{ token: i2.Router }, { token: i1.GlobalStateService }, { token: i3.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: AuthService, providedIn: 'root' });
 }
@@ -10931,131 +10913,28 @@ class HttpAuthInterceptor {
             }
         });
     }
-    // intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    //   const user: any = JSON.parse(localStorage.getItem(this.authlocalStorageToken) || '{}');
-    //   request = request.clone({
-    //     setHeaders: {
-    //       Authorization: 'Bearer ' + user.authenticationToken
-    //     }
-    //   });
-    //   return next.handle(request)
-    //   .pipe(tap((response:any)=>{
-    //     if(response?.body?.data?.result === 'RESTRICTED-IP'){
-    //       this.router.navigateByUrl('/error/403-ip')
-    //     }
-    //   }))
-    //   .pipe(
-    //     catchError((error:any)=>{
-    //       if (error instanceof HttpErrorResponse && error.status === 401) {
-    //         // If the error is due to unauthorized access, try to refresh the token
-    //         return this.handle401Error(request, next);
-    //       } 
-    //       // else if (error instanceof HttpErrorResponse && error.status === 403) {
-    //       //   // If the error is due to unauthorized access, try to refresh the token
-    //       //  this.router.navigate(['/manage/brands'])
-    //       // } 
-    //       return throwError(error);
-    //     })
-    //   );
-    // }
-    // private handle401Error(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    //   if (!this.isRefreshingToken) {
-    //     this.isRefreshingToken = true;
-    //     return this.authService.refreshToken().pipe(
-    //       switchMap((res: any) => {
-    //         if (res && res.code == 200 && res.data.result) {
-    //           // Update local storage with the new token
-    //           localStorage.setItem(this.authlocalStorageToken, JSON.stringify(res.data.result));
-    //           // Clone the request with the new token
-    //           request = request.clone({
-    //             setHeaders: {
-    //               Authorization: `Bearer ${res.data.result.authenticationToken}`
-    //             }
-    //           });
-    //           // Reset the flag for token refreshing
-    //           this.isRefreshingToken = false;
-    //           // Retry the original request with the new token
-    //           return next.handle(request);
-    //         } else {
-    //           // Logout user if refresh token fails
-    //           this.authService.logout();
-    //           const keysToKeep = ['data-mismatch-draft'];
-    //           const valuesToKeep:any = {};
-    //           keysToKeep.forEach(key => {
-    //             const value = localStorage.getItem(key);
-    //             if (value !== null) {
-    //               valuesToKeep[key] = value;
-    //             }
-    //           });
-    //           localStorage.clear();
-    //           Object.keys(valuesToKeep).forEach(key => {
-    //             localStorage.setItem(key, valuesToKeep[key]);
-    //           }); 
-    //           this.router.navigate(['/auth/login']);
-    //           return throwError('Token Expired Please Login Again!');
-    //         }
-    //       }),
-    //       catchError((error) => {
-    //         // Logout user if refresh token fails
-    //         this.authService.logout();
-    //         const keysToKeep = ['data-mismatch-draft'];
-    //         const valuesToKeep:any = {};
-    //         keysToKeep.forEach(key => {
-    //           const value = localStorage.getItem(key);
-    //           if (value !== null) {
-    //             valuesToKeep[key] = value;
-    //           }
-    //         });
-    //         localStorage.clear();
-    //         Object.keys(valuesToKeep).forEach(key => {
-    //           localStorage.setItem(key, valuesToKeep[key]);
-    //         }); 
-    //         this.router.navigate(['/auth/login']);
-    //         return throwError(error);
-    //       })
-    //     );
-    //   } else {
-    //     // If already refreshing the token, queue the request and wait
-    //     return this.tokenRefreshed.pipe(
-    //       switchMap(() => {
-    //         const tokens: any = JSON.parse(localStorage.getItem(this.authlocalStorageToken) || '{}');
-    //         request = request.clone({
-    //           setHeaders: {
-    //             Authorization: 'Bearer ' + tokens.authenticationToken
-    //           }
-    //         });
-    //         return next.handle(request);
-    //       })
-    //     );
-    //   }
-    // }
     intercept(request, next) {
-        const tokenObjStr = this.authService.getCookie(this.authlocalStorageToken);
-        let token = '';
-        if (tokenObjStr) {
-            try {
-                const tokenObj = JSON.parse(tokenObjStr);
-                token = tokenObj?.authenticationToken || '';
+        const user = JSON.parse(localStorage.getItem(this.authlocalStorageToken) || '{}');
+        request = request.clone({
+            setHeaders: {
+                Authorization: 'Bearer ' + user.authenticationToken
             }
-            catch (e) {
-                console.error('Invalid auth token format in cookie', e);
-            }
-        }
-        if (token) {
-            request = request.clone({
-                setHeaders: {
-                    Authorization: 'Bearer ' + token,
-                },
-            });
-        }
-        return next.handle(request).pipe(tap((response) => {
+        });
+        return next.handle(request)
+            .pipe(tap((response) => {
             if (response?.body?.data?.result === 'RESTRICTED-IP') {
                 this.router.navigateByUrl('/error/403-ip');
             }
-        }), catchError((error) => {
+        }))
+            .pipe(catchError((error) => {
             if (error instanceof HttpErrorResponse && error.status === 401) {
+                // If the error is due to unauthorized access, try to refresh the token
                 return this.handle401Error(request, next);
             }
+            // else if (error instanceof HttpErrorResponse && error.status === 403) {
+            //   // If the error is due to unauthorized access, try to refresh the token
+            //  this.router.navigate(['/manage/brands'])
+            // } 
             return throwError(error);
         }));
     }
@@ -11063,44 +10942,70 @@ class HttpAuthInterceptor {
         if (!this.isRefreshingToken) {
             this.isRefreshingToken = true;
             return this.authService.refreshToken().pipe(switchMap((res) => {
-                if (res && res.code === 200 && res.data?.result) {
-                    this.authService.setCookie(this.authlocalStorageToken, JSON.stringify(res.data.result), 1);
-                    const newToken = res.data.result.authenticationToken;
+                if (res && res.code == 200 && res.data.result) {
+                    // Update local storage with the new token
+                    localStorage.setItem(this.authlocalStorageToken, JSON.stringify(res.data.result));
+                    // Clone the request with the new token
                     request = request.clone({
                         setHeaders: {
-                            Authorization: 'Bearer ' + newToken,
-                        },
+                            Authorization: `Bearer ${res.data.result.authenticationToken}`
+                        }
                     });
+                    // Reset the flag for token refreshing
                     this.isRefreshingToken = false;
+                    // Retry the original request with the new token
                     return next.handle(request);
                 }
                 else {
-                    return this.forceLogout('Token Expired. Please login again.');
-                }
-            }), catchError((err) => this.forceLogout(err)));
+                    // Logout user if refresh token fails
+                    this.authService.logout();
+                    const keysToKeep = ['data-mismatch-draft'];
+                    const valuesToKeep = {};
+                    keysToKeep.forEach(key => {
+                        const value = localStorage.getItem(key);
+                        if (value !== null) {
+                            valuesToKeep[key] = value;
+                        }
+                    });
+                    localStorage.clear();
+                    Object.keys(valuesToKeep).forEach(key => {
+                        localStorage.setItem(key, valuesToKeep[key]);
+                    });
+                    this.router.navigate(['/auth/login']);
+                    return throwError('Token Expired Please Login Again!');
+                }
+            }), catchError((error) => {
+                // Logout user if refresh token fails
+                this.authService.logout();
+                const keysToKeep = ['data-mismatch-draft'];
+                const valuesToKeep = {};
+                keysToKeep.forEach(key => {
+                    const value = localStorage.getItem(key);
+                    if (value !== null) {
+                        valuesToKeep[key] = value;
+                    }
+                });
+                localStorage.clear();
+                Object.keys(valuesToKeep).forEach(key => {
+                    localStorage.setItem(key, valuesToKeep[key]);
+                });
+                this.router.navigate(['/auth/login']);
+                return throwError(error);
+            }));
         }
         else {
-            // Optional: implement logic to queue and retry if multiple requests during refresh
-            return throwError('Token refresh already in progress');
+            // If already refreshing the token, queue the request and wait
+            return this.tokenRefreshed.pipe(switchMap(() => {
+                const tokens = JSON.parse(localStorage.getItem(this.authlocalStorageToken) || '{}');
+                request = request.clone({
+                    setHeaders: {
+                        Authorization: 'Bearer ' + tokens.authenticationToken
+                    }
+                });
+                return next.handle(request);
+            }));
         }
     }
-    forceLogout(message) {
-        this.authService.logout();
-        const keysToKeep = ['data-mismatch-draft'];
-        const valuesToKeep = {};
-        keysToKeep.forEach((key) => {
-            const val = localStorage.getItem(key);
-            if (val)
-                valuesToKeep[key] = val;
-        });
-        localStorage.clear();
-        // Object.entries(valuesToKeep).forEach(([k, v]) => {
-        //   return localStorage.setItem(k, v);
-        // });
-        this.authService.deleteCookie(this.authlocalStorageToken);
-        this.router.navigate(['/auth/login']);
-        return throwError(() => message);
-    }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: HttpAuthInterceptor, deps: [{ token: i1.GlobalStateService }, { token: AuthService }, { token: i2.Router }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.12", ngImport: i0, type: HttpAuthInterceptor });
 }