Merge pull request #16662 from abpframework/auto-merge/rel-7-0/1960

Merge branch rel-7.1 with rel-7.0

npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts

@@ -14,9 +14,12 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy {
   }
 
   navigateToLogin(queryParams?: Params) {
-    const additionalState = queryParams.returnUrl;
-    const cultureParams = this.getCultureParams(queryParams);
+    let additionalState = '';
+    if (!!queryParams?.returnUrl) {
+      additionalState = queryParams.returnUrl;
+    }
 
+    const cultureParams = this.getCultureParams(queryParams);
     this.oAuthService.initCodeFlow(additionalState, cultureParams);
   }