tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #15014 from abpframework/auto-merge/rel-7-0/1555 

Merge branch dev with rel-7.0
pull/15022/head
liangshiwei 4 years ago
committed by GitHub
parent
242cd63dac e1b3a73c8c
commit
da51f1fb92
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 33 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
  2. 22
      modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs
  3. 2
      modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
  4. 2
      modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
  5. 34
      modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs

6
modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
View File

@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenIddict.Server.AspNetCore" Version="4.0.0-preview6.22566.67" /> <PackageReference Include="OpenIddict.Server.AspNetCore" Version="4.0.0-rc1.22607.41" />
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="4.0.0-preview6.22566.67" /> <PackageReference Include="OpenIddict.Validation.AspNetCore" Version="4.0.0-rc1.22607.41" />
<PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="4.0.0-preview6.22566.67" /> <PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="4.0.0-rc1.22607.41" />
</ItemGroup> </ItemGroup>
</Project> </Project>

22
modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs
View File

@ -54,19 +54,19 @@ public class AbpOpenIddictAspNetCoreModule : AbpModule
.AddServer(builder => .AddServer(builder =>
{ {
builder builder
.SetAuthorizationEndpointUris("/connect/authorize", "/connect/authorize/callback") .SetAuthorizationEndpointUris("connect/authorize", "connect/authorize/callback")
// /.well-known/oauth-authorization-server // .well-known/oauth-authorization-server
// /.well-known/openid-configuration // .well-known/openid-configuration
//.SetConfigurationEndpointUris() //.SetConfigurationEndpointUris()
// /.well-known/jwks // .well-known/jwks
//.SetCryptographyEndpointUris() //.SetCryptographyEndpointUris()
.SetDeviceEndpointUris("/device") .SetDeviceEndpointUris("device")
.SetIntrospectionEndpointUris("/connect/introspect") .SetIntrospectionEndpointUris("connect/introspect")
.SetLogoutEndpointUris("/connect/logout") .SetLogoutEndpointUris("connect/logout")
.SetRevocationEndpointUris("/connect/revocat") .SetRevocationEndpointUris("connect/revocat")
.SetTokenEndpointUris("/connect/token") .SetTokenEndpointUris("connect/token")
.SetUserinfoEndpointUris("/connect/userinfo") .SetUserinfoEndpointUris("connect/userinfo")
.SetVerificationEndpointUris("/connect/verify"); .SetVerificationEndpointUris("connect/verify");
builder builder
.AllowAuthorizationCodeFlow() .AllowAuthorizationCodeFlow()

2
modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
View File

@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenIddict.Abstractions" Version="4.0.0-preview6.22566.67" /> <PackageReference Include="OpenIddict.Abstractions" Version="4.0.0-rc1.22607.41" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" />
</ItemGroup> </ItemGroup>

2
modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
View File

@ -17,7 +17,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="OpenIddict.Core" Version="4.0.0-preview6.22566.67" /> <PackageReference Include="OpenIddict.Core" Version="4.0.0-rc1.22607.41" />
</ItemGroup> </ItemGroup>
</Project> </Project>

34
modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs
View File

@ -75,31 +75,31 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase<IOpenIddictA
return (await Repository.FindByClientIdAsync(identifier, cancellationToken: cancellationToken)).ToModel(); return (await Repository.FindByClientIdAsync(identifier, cancellationToken: cancellationToken)).ToModel();
} }
public async IAsyncEnumerable<OpenIddictApplicationModel> FindByPostLogoutRedirectUriAsync(string address, [EnumeratorCancellation] CancellationToken cancellationToken) public async IAsyncEnumerable<OpenIddictApplicationModel> FindByPostLogoutRedirectUriAsync(string uris, [EnumeratorCancellation] CancellationToken cancellationToken)
{ {
Check.NotNullOrEmpty(address, nameof(address)); Check.NotNullOrEmpty(uris, nameof(uris));
var applications = await Repository.FindByPostLogoutRedirectUriAsync(address, cancellationToken); var applications = await Repository.FindByPostLogoutRedirectUriAsync(uris, cancellationToken);
foreach (var application in applications) foreach (var application in applications)
{ {
var addresses = await GetPostLogoutRedirectUrisAsync(application.ToModel(), cancellationToken); var addresses = await GetPostLogoutRedirectUrisAsync(application.ToModel(), cancellationToken);
if (addresses.Contains(address, StringComparer.Ordinal)) if (addresses.Contains(uris, StringComparer.Ordinal))
{ {
yield return application.ToModel(); yield return application.ToModel();
} }
} }
} }
public async IAsyncEnumerable<OpenIddictApplicationModel> FindByRedirectUriAsync(string address, [EnumeratorCancellation] CancellationToken cancellationToken) public async IAsyncEnumerable<OpenIddictApplicationModel> FindByRedirectUriAsync(string uri, [EnumeratorCancellation] CancellationToken cancellationToken)
{ {
Check.NotNullOrEmpty(address, nameof(address)); Check.NotNullOrEmpty(uri, nameof(uri));
var applications = await Repository.FindByRedirectUriAsync(address, cancellationToken); var applications = await Repository.FindByRedirectUriAsync(uri, cancellationToken);
foreach (var application in applications) foreach (var application in applications)
{ {
var addresses = await GetRedirectUrisAsync(application.ToModel(), cancellationToken); var uris = await GetRedirectUrisAsync(application.ToModel(), cancellationToken);
if (addresses.Contains(address, StringComparer.Ordinal)) if (uris.Contains(uri, StringComparer.Ordinal))
{ {
yield return application.ToModel(); yield return application.ToModel();
} }
@ -423,12 +423,12 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase<IOpenIddictA
return default; return default;
} }
public virtual ValueTask SetPostLogoutRedirectUrisAsync(OpenIddictApplicationModel application, ImmutableArray<string> addresses, public virtual ValueTask SetPostLogoutRedirectUrisAsync(OpenIddictApplicationModel application, ImmutableArray<string> uris,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
Check.NotNull(application, nameof(application)); Check.NotNull(application, nameof(application));
if (addresses.IsDefaultOrEmpty) if (uris.IsDefaultOrEmpty)
{ {
application.PostLogoutRedirectUris = null; application.PostLogoutRedirectUris = null;
return default; return default;
@ -437,9 +437,9 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase<IOpenIddictA
application.PostLogoutRedirectUris = WriteStream(writer => application.PostLogoutRedirectUris = WriteStream(writer =>
{ {
writer.WriteStartArray(); writer.WriteStartArray();
foreach (var address in addresses) foreach (var uri in uris)
{ {
writer.WriteStringValue(address); writer.WriteStringValue(uri);
} }
writer.WriteEndArray(); writer.WriteEndArray();
}); });
@ -472,12 +472,12 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase<IOpenIddictA
return default; return default;
} }
public virtual ValueTask SetRedirectUrisAsync(OpenIddictApplicationModel application, ImmutableArray<string> addresses, public virtual ValueTask SetRedirectUrisAsync(OpenIddictApplicationModel application, ImmutableArray<string> uris,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
Check.NotNull(application, nameof(application)); Check.NotNull(application, nameof(application));
if (addresses.IsDefaultOrEmpty) if (uris.IsDefaultOrEmpty)
{ {
application.RedirectUris = null; application.RedirectUris = null;
return default; return default;
@ -486,9 +486,9 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase<IOpenIddictA
application.RedirectUris = WriteStream(writer => application.RedirectUris = WriteStream(writer =>
{ {
writer.WriteStartArray(); writer.WriteStartArray();
foreach (var address in addresses) foreach (var uri in uris)
{ {
writer.WriteStringValue(address); writer.WriteStringValue(uri);
} }
writer.WriteEndArray(); writer.WriteEndArray();
}); });

Write Preview
Loading…
Cancel
Save