ng-easycommerce-v18 0.6.29 → 0.6.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/esm2022/lib/interceptors/auth.interceptor.mjs +15 -9
- package/fesm2022/ng-easycommerce-v18.mjs +14 -8
- package/fesm2022/ng-easycommerce-v18.mjs.map +1 -1
- package/lib/ec-components/checkout-ec/dataform-ec/dataform-ec-single/dataform-ec-single.component.d.ts +1 -1
- package/lib/ec-components/checkout-ec/dataform-ec/dataform-ec.component.d.ts +1 -1
- package/lib/ec-services/analytics/google-analytics.service.d.ts +1 -1
- package/lib/ec-services/analytics/gtm.service.d.ts +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -5,7 +5,7 @@ import { ApiConstantsService } from '../constants';
|
|
|
5
5
|
import { catchError, throwError } from 'rxjs';
|
|
6
6
|
export const authInterceptor = (req, next) => {
|
|
7
7
|
const constants = inject(ApiConstantsService);
|
|
8
|
-
const authTokenService = inject(AuthStorageService);
|
|
8
|
+
const authTokenService = inject(AuthStorageService);
|
|
9
9
|
const authToken = authTokenService.getAuthToken();
|
|
10
10
|
const injector = inject(Injector);
|
|
11
11
|
const router = inject(Router);
|
|
@@ -36,10 +36,16 @@ export const authInterceptor = (req, next) => {
|
|
|
36
36
|
localStorage.removeItem('CUSTOMER');
|
|
37
37
|
localStorage.removeItem('MASTER_CHANNEL');
|
|
38
38
|
};
|
|
39
|
-
|
|
39
|
+
// Le pasamos la petición actual (currentReq) a la función de error
|
|
40
|
+
const handleAuthError = (err, currentReq) => {
|
|
40
41
|
if (err.status === 401 || err.status === 403) {
|
|
41
|
-
//
|
|
42
|
-
//
|
|
42
|
+
// Si el error 401 viene de un intento de login, devolvemos el error al componente directamente
|
|
43
|
+
// y evitamos que limpie el estado o redirija. Esto funciona tanto para el modal como para la vista.
|
|
44
|
+
if (currentReq.url.includes('login-check') || currentReq.url.includes('login')) {
|
|
45
|
+
return throwError(() => err);
|
|
46
|
+
}
|
|
47
|
+
// Si es un 401 de cualquier otra petición (ej: token caducado haciendo otra cosa),
|
|
48
|
+
// entonces sí limpiamos y expulsamos al usuario
|
|
43
49
|
try {
|
|
44
50
|
injector.get(AuthService).doLogoutUser();
|
|
45
51
|
}
|
|
@@ -64,14 +70,14 @@ export const authInterceptor = (req, next) => {
|
|
|
64
70
|
if (customer?.id) {
|
|
65
71
|
headers.setHeaders['customer'] = String(customer.id);
|
|
66
72
|
}
|
|
67
|
-
// Don't set Content-Type for multipart requests (FormData) or contact forms —
|
|
68
|
-
// Angular HttpClient must set it automatically so the boundary is included.
|
|
69
73
|
if (req.url.includes('contact-form/response') || req.body instanceof FormData) {
|
|
70
74
|
delete headers.setHeaders['Content-Type'];
|
|
71
75
|
}
|
|
72
76
|
let authReq = req.clone(headers);
|
|
73
|
-
|
|
77
|
+
// Pasamos authReq al manejador de errores
|
|
78
|
+
return next(authReq).pipe(catchError((err) => handleAuthError(err, authReq)));
|
|
74
79
|
}
|
|
75
|
-
|
|
80
|
+
// Pasamos req al manejador de errores
|
|
81
|
+
return next(req).pipe(catchError((err) => handleAuthError(err, req)));
|
|
76
82
|
};
|
|
77
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
83
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.interceptor.js","sourceRoot":"","sources":["../../../../../projects/ng-easycommerce-v18/src/lib/interceptors/auth.interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse, HttpEvent, HttpHandlerFn, HttpInterceptorFn, HttpRequest } from '@angular/common/http';\nimport { inject, Injector } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { AuthService, AuthStorageService, LocalStorageService } from '../ec-services';\nimport { ApiConstantsService } from '../constants';\nimport { catchError, Observable, throwError } from 'rxjs';\n\nexport const authInterceptor: HttpInterceptorFn = (req: HttpRequest<unknown>, next: HttpHandlerFn): Observable<HttpEvent<unknown>> => {\n    const constants = inject(ApiConstantsService);    \n    const authTokenService = inject(AuthStorageService); \n    const authToken = authTokenService.getAuthToken();\n    const injector = inject(Injector);\n    const router = inject(Router);\n    const localStorage = inject(LocalStorageService);\n\n    const getStoredCustomer = () => {\n        const stored = localStorage.getItem('CUSTOMER');\n        if (!stored) return null;\n        try {\n            return JSON.parse(stored);\n        } catch {\n            return null;\n        }\n    };\n\n    const clearAuthState = () => {\n        authTokenService.setAuthToken(null);\n        localStorage.removeItem('USER');\n        localStorage.removeItem('EXPIRATES_IN');\n        localStorage.removeItem('JWT_TOKEN');\n        localStorage.removeItem('REFRESH_TOKEN');\n        localStorage.removeItem('cart_token');\n        localStorage.removeItem('cart_owner');\n        localStorage.removeItem('mail');\n        localStorage.removeItem('CHANNEL');\n        localStorage.removeItem('CHANNELSELLER');\n        localStorage.removeItem('LOCALE');\n        localStorage.removeItem('CUSTOMER');\n        localStorage.removeItem('MASTER_CHANNEL');\n    };\n    \n    // Le pasamos la petición actual (currentReq) a la función de error\n    const handleAuthError = (err: HttpErrorResponse, currentReq: HttpRequest<unknown>) => {\n        if (err.status === 401 || err.status === 403) {\n            \n            // Si el error 401 viene de un intento de login, devolvemos el error al componente directamente\n            // y evitamos que limpie el estado o redirija. Esto funciona tanto para el modal como para la vista.\n            if (currentReq.url.includes('login-check') || currentReq.url.includes('login')) {\n                return throwError(() => err);\n            }\n\n            // Si es un 401 de cualquier otra petición (ej: token caducado haciendo otra cosa),\n            // entonces sí limpiamos y expulsamos al usuario\n            try {\n                injector.get(AuthService).doLogoutUser();\n            } catch {\n                // fallback: al menos limpiar storage y token si AuthService no está disponible.\n            }\n            clearAuthState();\n            if (!router.url.startsWith('/auth/login')) {\n                router.navigate(['/auth/login']);\n            }\n        }\n        return throwError(() => err);\n    };\n\n    if(authToken && req.url.includes(constants.getUrlBase()) && !req.url.includes('shop-api/login-check')){\n        const customer = getStoredCustomer();\n        let headers = {\n            setHeaders: {\n                'Content-Type': 'application/json',\n                Authorization: `Bearer ${authToken}`\n            }\n        }\n        if (customer?.id) {\n            (headers as any).setHeaders['customer'] = String(customer.id);\n        }\n\n        if (req.url.includes('contact-form/response') || req.body instanceof FormData) {\n            delete (headers as any).setHeaders['Content-Type']\n        }\n        let authReq:HttpRequest<any> = req.clone(headers)\n\n        // Pasamos authReq al manejador de errores\n        return next(authReq).pipe(catchError((err) => handleAuthError(err, authReq)));\n    }\n\n    // Pasamos req al manejador de errores\n    return next(req).pipe(catchError((err) => handleAuthError(err, req)));\n};"]}
|
|
@@ -23670,7 +23670,7 @@ const authGuard = (route, state) => {
|
|
|
23670
23670
|
|
|
23671
23671
|
const authInterceptor = (req, next) => {
|
|
23672
23672
|
const constants = inject(ApiConstantsService);
|
|
23673
|
-
const authTokenService = inject(AuthStorageService);
|
|
23673
|
+
const authTokenService = inject(AuthStorageService);
|
|
23674
23674
|
const authToken = authTokenService.getAuthToken();
|
|
23675
23675
|
const injector = inject(Injector);
|
|
23676
23676
|
const router = inject(Router);
|
|
@@ -23701,10 +23701,16 @@ const authInterceptor = (req, next) => {
|
|
|
23701
23701
|
localStorage.removeItem('CUSTOMER');
|
|
23702
23702
|
localStorage.removeItem('MASTER_CHANNEL');
|
|
23703
23703
|
};
|
|
23704
|
-
|
|
23704
|
+
// Le pasamos la petición actual (currentReq) a la función de error
|
|
23705
|
+
const handleAuthError = (err, currentReq) => {
|
|
23705
23706
|
if (err.status === 401 || err.status === 403) {
|
|
23706
|
-
//
|
|
23707
|
-
//
|
|
23707
|
+
// Si el error 401 viene de un intento de login, devolvemos el error al componente directamente
|
|
23708
|
+
// y evitamos que limpie el estado o redirija. Esto funciona tanto para el modal como para la vista.
|
|
23709
|
+
if (currentReq.url.includes('login-check') || currentReq.url.includes('login')) {
|
|
23710
|
+
return throwError(() => err);
|
|
23711
|
+
}
|
|
23712
|
+
// Si es un 401 de cualquier otra petición (ej: token caducado haciendo otra cosa),
|
|
23713
|
+
// entonces sí limpiamos y expulsamos al usuario
|
|
23708
23714
|
try {
|
|
23709
23715
|
injector.get(AuthService).doLogoutUser();
|
|
23710
23716
|
}
|
|
@@ -23729,15 +23735,15 @@ const authInterceptor = (req, next) => {
|
|
|
23729
23735
|
if (customer?.id) {
|
|
23730
23736
|
headers.setHeaders['customer'] = String(customer.id);
|
|
23731
23737
|
}
|
|
23732
|
-
// Don't set Content-Type for multipart requests (FormData) or contact forms —
|
|
23733
|
-
// Angular HttpClient must set it automatically so the boundary is included.
|
|
23734
23738
|
if (req.url.includes('contact-form/response') || req.body instanceof FormData) {
|
|
23735
23739
|
delete headers.setHeaders['Content-Type'];
|
|
23736
23740
|
}
|
|
23737
23741
|
let authReq = req.clone(headers);
|
|
23738
|
-
|
|
23742
|
+
// Pasamos authReq al manejador de errores
|
|
23743
|
+
return next(authReq).pipe(catchError$1((err) => handleAuthError(err, authReq)));
|
|
23739
23744
|
}
|
|
23740
|
-
|
|
23745
|
+
// Pasamos req al manejador de errores
|
|
23746
|
+
return next(req).pipe(catchError$1((err) => handleAuthError(err, req)));
|
|
23741
23747
|
};
|
|
23742
23748
|
|
|
23743
23749
|
/**
|