From d4427875746d1534a88a6c369204468c6f1814ba Mon Sep 17 00:00:00 2001 From: Alexander Onnikov Date: Wed, 26 Feb 2025 16:49:17 +0300 Subject: [PATCH] UBERF-9526 Fix order of token locations in services (#8101) Signed-off-by: Alexander Onnikov --- server/client/src/token.ts | 2 +- services/print/pod-print/src/server.ts | 4 ++-- services/sign/pod-sign/src/token.ts | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/client/src/token.ts b/server/client/src/token.ts index cef8bcded1..8066dc2e6a 100644 --- a/server/client/src/token.ts +++ b/server/client/src/token.ts @@ -35,7 +35,7 @@ const extractAuthorizationToken = (authorization?: string): Token | null => { export function extractToken (headers: IncomingHttpHeaders): Token | undefined { try { - const token = extractCookieToken(headers.cookie) ?? extractAuthorizationToken(headers.authorization) + const token = extractAuthorizationToken(headers.authorization) ?? extractCookieToken(headers.cookie) return token ?? undefined } catch { diff --git a/services/print/pod-print/src/server.ts b/services/print/pod-print/src/server.ts index a9cccc6a12..4675d7ddda 100644 --- a/services/print/pod-print/src/server.ts +++ b/services/print/pod-print/src/server.ts @@ -80,9 +80,9 @@ const extractQueryToken = (queryParams: any): string | null => { const extractToken = (headers: IncomingHttpHeaders, queryParams: any): string => { try { const token = - extractCookieToken(headers.cookie) ?? extractAuthorizationToken(headers.authorization) ?? - extractQueryToken(queryParams) + extractQueryToken(queryParams) ?? + extractCookieToken(headers.cookie) if (token === null) { throw new ApiError(401) diff --git a/services/sign/pod-sign/src/token.ts b/services/sign/pod-sign/src/token.ts index aeacac7cba..ff171eafed 100644 --- a/services/sign/pod-sign/src/token.ts +++ b/services/sign/pod-sign/src/token.ts @@ -51,9 +51,9 @@ const extractRawQueryToken = (queryParams: any): string | null => { export const extractToken = (headers: IncomingHttpHeaders, queryParams: any): { token: Token, rawToken: string } => { try { const rawToken = - extractRawCookieToken(headers.cookie) ?? extractRawAuthorizationToken(headers.authorization) ?? - extractRawQueryToken(queryParams) + extractRawQueryToken(queryParams) ?? + extractRawCookieToken(headers.cookie) if (rawToken === null) { throw new ApiError(401)