Browse Source
Merge pull request #16671 from abpframework/auto-merge/rel-7-0/1963
Merge branch rel-7.1 with rel-7.0
pull/16672/head
Barış Can Yılmaz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
4 deletions
-
npm/ng-packs/packages/components/package.json
-
npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
|
|
|
@ -7,9 +7,8 @@ |
|
|
|
"url": "https://github.com/abpframework/abp.git" |
|
|
|
}, |
|
|
|
"peerDependencies": { |
|
|
|
"@abp/ng.core": ">=7.1.1", |
|
|
|
"@abp/ng.theme.shared": ">=7.1.1", |
|
|
|
"@ng-bootstrap/ng-bootstrap": ">=10.0.0" |
|
|
|
"@abp/ng.core": ">=7.0.3", |
|
|
|
"@abp/ng.theme.shared": ">=7.0.3" |
|
|
|
}, |
|
|
|
"dependencies": { |
|
|
|
"chart.js": "^3.5.1", |
|
|
|
|
|
|
|
@ -15,7 +15,7 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy { |
|
|
|
|
|
|
|
navigateToLogin(queryParams?: Params) { |
|
|
|
let additionalState = ''; |
|
|
|
if (!!queryParams?.returnUrl) { |
|
|
|
if (queryParams?.returnUrl) { |
|
|
|
additionalState = queryParams.returnUrl; |
|
|
|
} |
|
|
|
|
|
|
|
|