Browse Source
Merge pull request #15953 from abpframework/auto-merge/rel-7-0/1792
Merge branch rel-7.1 with rel-7.0
pull/15954/head
maliming
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
6 deletions
-
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
-
npm/ng-packs/packages/oauth/src/lib/providers/navigate-to-manage-profile.provider.ts
|
|
|
@ -19,8 +19,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" /> |
|
|
|
<PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.16.1434" /> |
|
|
|
<PackageReference Include="Devart.Data.Oracle.EFCore" Version="10.1.134.7" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -12,10 +12,10 @@ export const NavigateToManageProfileProvider: Provider = { |
|
|
|
console.warn('The oAuthConfig env is missing on environment.ts'); |
|
|
|
return; |
|
|
|
} |
|
|
|
window.open( |
|
|
|
`${env.oAuthConfig.issuer}/Account/Manage?returnUrl=${window.location.href}`, |
|
|
|
'_self', |
|
|
|
); |
|
|
|
|
|
|
|
const { issuer } = env.oAuthConfig; |
|
|
|
const path = issuer.endsWith('/') ? issuer : `${issuer}/`; |
|
|
|
window.open(`${path}Account/Manage?returnUrl=${window.location.href}`, '_self'); |
|
|
|
}; |
|
|
|
}, |
|
|
|
}; |
|
|
|
|