From b44301bd65684ae4a9f63982a69eb78b116b0792 Mon Sep 17 00:00:00 2001
From: Masum ULU <masum.ulu@hotmail.com>
Date: Tue, 16 May 2023 22:13:58 +0300
Subject: [PATCH] navigateToLogin refactored

---
 .../src/lib/strategies/auth-code-flow-strategy.ts   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 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 ab70febb3c..184ef59dca 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
@@ -14,10 +14,10 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy {
   }
 
   navigateToLogin(queryParams?: Params) {
-    this.oAuthService.initCodeFlow(
-      this.getAdditionalState(queryParams),
-      this.getCultureParams(queryParams),
-    );
+    const additionalState = queryParams.returnUrl;
+    const cultureParams = this.getCultureParams(queryParams);
+
+    this.oAuthService.initCodeFlow(additionalState, cultureParams);
   }
 
   checkIfInternalAuth(queryParams?: Params) {
@@ -34,11 +34,6 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy {
     return of(null);
   }
 
-  private getAdditionalState(queryParams?: Params): string {
-    const { returnUrl } = queryParams;
-    return returnUrl;
-  }
-
   private getCultureParams(queryParams?: Params) {
     const lang = this.sessionState.getLanguage();
     const culture = { culture: lang, 'ui-culture': lang };