diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
index ea725aa21f..b095446804 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
@@ -20,8 +20,8 @@
-
-
-
+
+
+
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs
index e8196627ce..d7eacfa498 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/AbpOpenIddictAspNetCoreModule.cs
@@ -54,19 +54,19 @@ public class AbpOpenIddictAspNetCoreModule : AbpModule
.AddServer(builder =>
{
builder
- .SetAuthorizationEndpointUris("/connect/authorize", "/connect/authorize/callback")
- // /.well-known/oauth-authorization-server
- // /.well-known/openid-configuration
+ .SetAuthorizationEndpointUris("connect/authorize", "connect/authorize/callback")
+ // .well-known/oauth-authorization-server
+ // .well-known/openid-configuration
//.SetConfigurationEndpointUris()
- // /.well-known/jwks
+ // .well-known/jwks
//.SetCryptographyEndpointUris()
- .SetDeviceEndpointUris("/device")
- .SetIntrospectionEndpointUris("/connect/introspect")
- .SetLogoutEndpointUris("/connect/logout")
- .SetRevocationEndpointUris("/connect/revocat")
- .SetTokenEndpointUris("/connect/token")
- .SetUserinfoEndpointUris("/connect/userinfo")
- .SetVerificationEndpointUris("/connect/verify");
+ .SetDeviceEndpointUris("device")
+ .SetIntrospectionEndpointUris("connect/introspect")
+ .SetLogoutEndpointUris("connect/logout")
+ .SetRevocationEndpointUris("connect/revocat")
+ .SetTokenEndpointUris("connect/token")
+ .SetUserinfoEndpointUris("connect/userinfo")
+ .SetVerificationEndpointUris("connect/verify");
builder
.AllowAuthorizationCodeFlow()
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
index 040d7a986f..e71bfbb209 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
index 3da97bf272..66a5626545 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs
index 1f740ecfcd..eb0c4033f9 100644
--- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs
+++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/Applications/AbpOpenIddictApplicationStore.cs
@@ -75,31 +75,31 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase FindByPostLogoutRedirectUriAsync(string address, [EnumeratorCancellation] CancellationToken cancellationToken)
+ public async IAsyncEnumerable 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)
{
var addresses = await GetPostLogoutRedirectUrisAsync(application.ToModel(), cancellationToken);
- if (addresses.Contains(address, StringComparer.Ordinal))
+ if (addresses.Contains(uris, StringComparer.Ordinal))
{
yield return application.ToModel();
}
}
}
- public async IAsyncEnumerable FindByRedirectUriAsync(string address, [EnumeratorCancellation] CancellationToken cancellationToken)
+ public async IAsyncEnumerable 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)
{
- var addresses = await GetRedirectUrisAsync(application.ToModel(), cancellationToken);
- if (addresses.Contains(address, StringComparer.Ordinal))
+ var uris = await GetRedirectUrisAsync(application.ToModel(), cancellationToken);
+ if (uris.Contains(uri, StringComparer.Ordinal))
{
yield return application.ToModel();
}
@@ -423,12 +423,12 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase addresses,
+ public virtual ValueTask SetPostLogoutRedirectUrisAsync(OpenIddictApplicationModel application, ImmutableArray uris,
CancellationToken cancellationToken)
{
Check.NotNull(application, nameof(application));
- if (addresses.IsDefaultOrEmpty)
+ if (uris.IsDefaultOrEmpty)
{
application.PostLogoutRedirectUris = null;
return default;
@@ -437,9 +437,9 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase
{
writer.WriteStartArray();
- foreach (var address in addresses)
+ foreach (var uri in uris)
{
- writer.WriteStringValue(address);
+ writer.WriteStringValue(uri);
}
writer.WriteEndArray();
});
@@ -472,12 +472,12 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase addresses,
+ public virtual ValueTask SetRedirectUrisAsync(OpenIddictApplicationModel application, ImmutableArray uris,
CancellationToken cancellationToken)
{
Check.NotNull(application, nameof(application));
- if (addresses.IsDefaultOrEmpty)
+ if (uris.IsDefaultOrEmpty)
{
application.RedirectUris = null;
return default;
@@ -486,9 +486,9 @@ public class AbpOpenIddictApplicationStore : AbpOpenIddictStoreBase
{
writer.WriteStartArray();
- foreach (var address in addresses)
+ foreach (var uri in uris)
{
- writer.WriteStringValue(address);
+ writer.WriteStringValue(uri);
}
writer.WriteEndArray();
});