From 725265e04ea18a4db4c789b08637a80a0d02ad91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Fri, 9 Oct 2020 15:47:16 +0200 Subject: [PATCH] Update the MongoDB stores to use ImmutableList instead of ImmutableArray --- samples/Mvc.Server/Worker.cs | 9 +++++++++ .../OpenIddictMongoDbApplication.cs | 8 ++++---- .../OpenIddictMongoDbAuthorization.cs | 2 +- .../OpenIddictMongoDbScope.cs | 2 +- .../Stores/OpenIddictMongoDbApplicationStore.cs | 16 ++++++++-------- .../OpenIddictMongoDbAuthorizationStore.cs | 4 ++-- .../Stores/OpenIddictMongoDbScopeStore.cs | 4 ++-- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/samples/Mvc.Server/Worker.cs b/samples/Mvc.Server/Worker.cs index d5c10074..5a188b76 100644 --- a/samples/Mvc.Server/Worker.cs +++ b/samples/Mvc.Server/Worker.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; @@ -38,6 +39,10 @@ namespace Mvc.Server ClientSecret = "901564A5-E7FE-42CB-B10D-61EF6A8F3654", ConsentType = ConsentTypes.Explicit, DisplayName = "MVC client application", + DisplayNames = + { + [CultureInfo.GetCultureInfo("fr-FR")] = "Application cliente MVC" + }, PostLogoutRedirectUris = { new Uri("http://localhost:53507/signout-callback-oidc") @@ -111,6 +116,10 @@ namespace Mvc.Server await manager.CreateAsync(new OpenIddictScopeDescriptor { DisplayName = "Demo API access", + DisplayNames = + { + [CultureInfo.GetCultureInfo("fr-FR")] = "Accès à l'API de démo" + }, Name = "demo_api", Resources = { diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs index 73180c99..20892af2 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbApplication.cs @@ -69,13 +69,13 @@ namespace OpenIddict.MongoDb.Models /// Gets or sets the permissions associated with the current application. /// [BsonElement("permissions"), BsonIgnoreIfDefault] - public virtual IReadOnlyList Permissions { get; set; } = ImmutableArray.Create(); + public virtual IReadOnlyList Permissions { get; set; } = ImmutableList.Create(); /// /// Gets or sets the logout callback URLs associated with the current application. /// [BsonElement("post_logout_redirect_uris"), BsonIgnoreIfDefault] - public virtual IReadOnlyList PostLogoutRedirectUris { get; set; } = ImmutableArray.Create(); + public virtual IReadOnlyList PostLogoutRedirectUris { get; set; } = ImmutableList.Create(); /// /// Gets or sets the additional properties associated with the current application. @@ -87,13 +87,13 @@ namespace OpenIddict.MongoDb.Models /// Gets or sets the callback URLs associated with the current application. /// [BsonElement("redirect_uris"), BsonIgnoreIfDefault] - public virtual IReadOnlyList RedirectUris { get; set; } = ImmutableArray.Create(); + public virtual IReadOnlyList RedirectUris { get; set; } = ImmutableList.Create(); /// /// Gets or sets the requirements associated with the current application. /// [BsonElement("requirements"), BsonIgnoreIfDefault] - public virtual IReadOnlyList Requirements { get; set; } = ImmutableArray.Create(); + public virtual IReadOnlyList Requirements { get; set; } = ImmutableList.Create(); /// /// Gets or sets the application type diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs index 93b01a5e..64b51b5f 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbAuthorization.cs @@ -52,7 +52,7 @@ namespace OpenIddict.MongoDb.Models /// Gets or sets the scopes associated with the current authorization. /// [BsonElement("scopes"), BsonIgnoreIfDefault] - public virtual IReadOnlyList Scopes { get; set; } = ImmutableArray.Create(); + public virtual IReadOnlyList Scopes { get; set; } = ImmutableList.Create(); /// /// Gets or sets the status of the current authorization. diff --git a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs index 7d61a902..67521333 100644 --- a/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs +++ b/src/OpenIddict.MongoDb.Models/OpenIddictMongoDbScope.cs @@ -74,6 +74,6 @@ namespace OpenIddict.MongoDb.Models /// Gets or sets the resources associated with the current scope. /// [BsonElement("resources"), BsonIgnoreIfDefault] - public virtual IReadOnlyList Resources { get; set; } = ImmutableArray.Create(); + public virtual IReadOnlyList Resources { get; set; } = ImmutableList.Create(); } } diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs index 75de228b..68d83e06 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbApplicationStore.cs @@ -540,12 +540,12 @@ namespace OpenIddict.MongoDb if (permissions.IsDefaultOrEmpty) { - application.Permissions = ImmutableArray.Create(); + application.Permissions = ImmutableList.Create(); return default; } - application.Permissions = permissions; + application.Permissions = permissions.ToImmutableList(); return default; } @@ -561,12 +561,12 @@ namespace OpenIddict.MongoDb if (addresses.IsDefaultOrEmpty) { - application.PostLogoutRedirectUris = ImmutableArray.Create(); + application.PostLogoutRedirectUris = ImmutableList.Create(); return default; } - application.PostLogoutRedirectUris = addresses; + application.PostLogoutRedirectUris = addresses.ToImmutableList(); return default; } @@ -621,12 +621,12 @@ namespace OpenIddict.MongoDb if (addresses.IsDefaultOrEmpty) { - application.RedirectUris = ImmutableArray.Create(); + application.RedirectUris = ImmutableList.Create(); return default; } - application.RedirectUris = addresses; + application.RedirectUris = addresses.ToImmutableList(); return default; } @@ -642,12 +642,12 @@ namespace OpenIddict.MongoDb if (requirements.IsDefaultOrEmpty) { - application.Requirements = ImmutableArray.Create(); + application.Requirements = ImmutableList.Create(); return default; } - application.Requirements = requirements; + application.Requirements = requirements.ToImmutableList(); return default; } diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs index 7d77b5d5..0510a722 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs @@ -664,12 +664,12 @@ namespace OpenIddict.MongoDb if (scopes.IsDefaultOrEmpty) { - authorization.Scopes = ImmutableArray.Create(); + authorization.Scopes = ImmutableList.Create(); return default; } - authorization.Scopes = scopes; + authorization.Scopes = scopes.ToImmutableList(); return default; } diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs index 991d6da9..ee97b991 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbScopeStore.cs @@ -494,12 +494,12 @@ namespace OpenIddict.MongoDb if (resources.IsDefaultOrEmpty) { - scope.Resources = ImmutableArray.Create(); + scope.Resources = ImmutableList.Create(); return default; } - scope.Resources = resources; + scope.Resources = resources.ToImmutableList(); return default; }