From 8f9bd0113d260dc3337c836136b9403345d2d1b3 Mon Sep 17 00:00:00 2001 From: Lyubov Voloshko Date: Thu, 7 May 2026 15:13:46 +0000 Subject: [PATCH] token interceptor: send extra headers only on RA requests --- .../src/app/services/token.interceptor.ts | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/services/token.interceptor.ts b/frontend/src/app/services/token.interceptor.ts index dfdc63ec3..4ea8c77a9 100644 --- a/frontend/src/app/services/token.interceptor.ts +++ b/frontend/src/app/services/token.interceptor.ts @@ -35,25 +35,33 @@ export class TokenInterceptor implements HttpInterceptor { intercept(request: HttpRequest, next: HttpHandler): Observable> { this.config = this._configuration.getConfig(); - const autoadmin_gclid_cookie = this.cookieService.get('autoadmin_gclid'); const connectionID = this._connections.currentConnectionID; + const url = new URL(request.url, location.origin); + const isApiRequest = url.origin === location.origin || url.origin == 'https://app.rocketadmin.com'; request = request.clone({ url: this.normalizeURL(request.url, environment.apiRoot || this.config.baseURL, environment.saasURL), - setHeaders: { - GCLID: autoadmin_gclid_cookie, - }, - withCredentials: true, }); - if (connectionID && !request.headers.has('masterpwd')) { - const masterKey = localStorage.getItem(`${connectionID}__masterKey`) || ''; + if (isApiRequest) { + const autoadmin_gclid_cookie = this.cookieService.get('autoadmin_gclid'); request = request.clone({ setHeaders: { - masterpwd: masterKey, + GCLID: autoadmin_gclid_cookie, }, + withCredentials: true, }); + + if (connectionID && !request.headers.has('masterpwd')) { + const masterKey = localStorage.getItem(`${connectionID}__masterKey`) || ''; + request = request.clone({ + setHeaders: { + masterpwd: masterKey, + }, + }); + } } + return next.handle(request).pipe( catchError((error: HttpErrorResponse) => { if (error.status === 401) {