From 00fd49deeb8828027d6f460fa185a48260644848 Mon Sep 17 00:00:00 2001 From: sumeyye Date: Mon, 5 May 2025 17:02:44 +0300 Subject: [PATCH] fix: clean up the query parameters in a more robust way --- .../src/lib/strategies/auth-code-flow-strategy.ts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts index 4c239ac5e3..a86c6caad2 100644 --- a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts +++ b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts @@ -50,14 +50,13 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy { const location = this.windowService.window.location; const history = this.windowService.window.history; - const href = - location.origin + - location.pathname + - location.search - .replace(/iss=[^&$]*/, '') - .replace(/culture=[^&$]*/, '') - .replace(/ui-culture=[^&$]*/, '') + - location.hash; + const query = location.search + .replace(/([?&])iss=[^&]*&?/, '$1') + .replace(/([?&])culture=[^&]*&?/, '$1') + .replace(/([?&])ui-culture=[^&]*&?/, '$1') + .replace(/[?&]+$/, ''); + + const href = location.origin + location.pathname + query + location.hash; history.replaceState(null, '', href); }