From 1e87e917a688087d8612a6adab4c203b95f9187f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Tue, 22 Sep 2020 18:59:09 +0200 Subject: [PATCH] Use static OpenIddict.Abstractions.OpenIddictConstants where appropriate --- ...IddictEntityFrameworkAuthorizationStore.cs | 5 +- ...ctEntityFrameworkCoreAuthorizationStore.cs | 5 +- .../OpenIddictMongoDbAuthorizationStore.cs | 5 +- .../Primitives/OpenIddictMessageTests.cs | 21 ++--- .../Primitives/OpenIddictRequestTests.cs | 83 ++++++++++--------- .../Primitives/OpenIddictResponseTests.cs | 27 +++--- .../OpenIddictServerIntegrationTestClient.cs | 3 +- .../OpenIddictServerBuilderTests.cs | 22 +++-- 8 files changed, 91 insertions(+), 80 deletions(-) diff --git a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs index aee02c36..d7c6715e 100644 --- a/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs +++ b/src/OpenIddict.EntityFramework/Stores/OpenIddictEntityFrameworkAuthorizationStore.cs @@ -23,6 +23,7 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Options; using OpenIddict.Abstractions; using OpenIddict.EntityFramework.Models; +using static OpenIddict.Abstractions.OpenIddictConstants; using SR = OpenIddict.Abstractions.OpenIddictResources; namespace OpenIddict.EntityFramework @@ -622,8 +623,8 @@ namespace OpenIddict.EntityFramework var authorizations = await (from authorization in Authorizations.Include(authorization => authorization.Tokens) where authorization.CreationDate < threshold - where authorization.Status != OpenIddictConstants.Statuses.Valid || - (authorization.Type == OpenIddictConstants.AuthorizationTypes.AdHoc && !authorization.Tokens.Any()) + where authorization.Status != Statuses.Valid || + (authorization.Type == AuthorizationTypes.AdHoc && !authorization.Tokens.Any()) orderby authorization.Id select authorization).Skip(offset).Take(1_000).ToListAsync(cancellationToken); diff --git a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs index dc817452..8b5dfb68 100644 --- a/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs +++ b/src/OpenIddict.EntityFrameworkCore/Stores/OpenIddictEntityFrameworkCoreAuthorizationStore.cs @@ -24,6 +24,7 @@ using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Options; using OpenIddict.Abstractions; using OpenIddict.EntityFrameworkCore.Models; +using static OpenIddict.Abstractions.OpenIddictConstants; using SR = OpenIddict.Abstractions.OpenIddictResources; namespace OpenIddict.EntityFrameworkCore @@ -702,8 +703,8 @@ namespace OpenIddict.EntityFrameworkCore var authorizations = await (from authorization in Authorizations.Include(authorization => authorization.Tokens).AsTracking() where authorization.CreationDate < threshold - where authorization.Status != OpenIddictConstants.Statuses.Valid || - (authorization.Type == OpenIddictConstants.AuthorizationTypes.AdHoc && !authorization.Tokens.Any()) + where authorization.Status != Statuses.Valid || + (authorization.Type == AuthorizationTypes.AdHoc && !authorization.Tokens.Any()) orderby authorization.Id select authorization).Skip(offset).Take(1_000).ToListAsync(cancellationToken); diff --git a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs index 56a7f5a4..145d14c8 100644 --- a/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs +++ b/src/OpenIddict.MongoDb/Stores/OpenIddictMongoDbAuthorizationStore.cs @@ -21,6 +21,7 @@ using MongoDB.Driver; using MongoDB.Driver.Linq; using OpenIddict.Abstractions; using OpenIddict.MongoDb.Models; +using static OpenIddict.Abstractions.OpenIddictConstants; using SR = OpenIddict.Abstractions.OpenIddictResources; namespace OpenIddict.MongoDb @@ -537,8 +538,8 @@ namespace OpenIddict.MongoDb join token in database.GetCollection(Options.CurrentValue.TokensCollectionName).AsQueryable() on authorization.Id equals token.AuthorizationId into tokens where authorization.CreationDate < threshold.UtcDateTime - where authorization.Status != OpenIddictConstants.Statuses.Valid || - (authorization.Type == OpenIddictConstants.AuthorizationTypes.AdHoc && !tokens.Any()) + where authorization.Status != Statuses.Valid || + (authorization.Type == AuthorizationTypes.AdHoc && !tokens.Any()) select authorization.Id).ToListAsync(cancellationToken); // Note: to avoid generating delete requests with very large filters, a buffer is used here and the diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs index 1a0ea1c1..a1f060de 100644 --- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs +++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictMessageTests.cs @@ -11,6 +11,7 @@ using System.Text; using System.Text.Encodings.Web; using System.Text.Json; using Xunit; +using static OpenIddict.Abstractions.OpenIddictConstants; using SR = OpenIddict.Abstractions.OpenIddictResources; namespace OpenIddict.Abstractions.Tests.Primitives @@ -461,16 +462,16 @@ namespace OpenIddict.Abstractions.Tests.Primitives } [Theory] - [InlineData(OpenIddictConstants.Parameters.AccessToken)] - [InlineData(OpenIddictConstants.Parameters.Assertion)] - [InlineData(OpenIddictConstants.Parameters.ClientAssertion)] - [InlineData(OpenIddictConstants.Parameters.ClientSecret)] - [InlineData(OpenIddictConstants.Parameters.Code)] - [InlineData(OpenIddictConstants.Parameters.IdToken)] - [InlineData(OpenIddictConstants.Parameters.IdTokenHint)] - [InlineData(OpenIddictConstants.Parameters.Password)] - [InlineData(OpenIddictConstants.Parameters.RefreshToken)] - [InlineData(OpenIddictConstants.Parameters.Token)] + [InlineData(Parameters.AccessToken)] + [InlineData(Parameters.Assertion)] + [InlineData(Parameters.ClientAssertion)] + [InlineData(Parameters.ClientSecret)] + [InlineData(Parameters.Code)] + [InlineData(Parameters.IdToken)] + [InlineData(Parameters.IdTokenHint)] + [InlineData(Parameters.Password)] + [InlineData(Parameters.RefreshToken)] + [InlineData(Parameters.Token)] public void ToString_ExcludesSensitiveParameters(string parameter) { // Arrange diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictRequestTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictRequestTests.cs index 33e9cde0..201c905a 100644 --- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictRequestTests.cs +++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictRequestTests.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.Text.Json; using Xunit; +using static OpenIddict.Abstractions.OpenIddictConstants; namespace OpenIddict.Abstractions.Tests.Primitives { @@ -19,287 +20,287 @@ namespace OpenIddict.Abstractions.Tests.Primitives yield return new object[] { /* property: */ nameof(OpenIddictRequest.AccessToken), - /* name: */ OpenIddictConstants.Parameters.AccessToken, + /* name: */ Parameters.AccessToken, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.AcrValues), - /* name: */ OpenIddictConstants.Parameters.AcrValues, + /* name: */ Parameters.AcrValues, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Assertion), - /* name: */ OpenIddictConstants.Parameters.Assertion, + /* name: */ Parameters.Assertion, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Audiences), - /* name: */ OpenIddictConstants.Parameters.Audience, + /* name: */ Parameters.Audience, /* value: */ new OpenIddictParameter(new[] { "Fabrikam", "Contoso" }) }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Claims), - /* name: */ OpenIddictConstants.Parameters.Claims, + /* name: */ Parameters.Claims, /* value: */ new OpenIddictParameter(JsonSerializer.Deserialize(@"{""userinfo"": {}}")) }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ClaimsLocales), - /* name: */ OpenIddictConstants.Parameters.ClaimsLocales, + /* name: */ Parameters.ClaimsLocales, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ClientAssertion), - /* name: */ OpenIddictConstants.Parameters.ClientAssertion, + /* name: */ Parameters.ClientAssertion, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ClientAssertionType), - /* name: */ OpenIddictConstants.Parameters.ClientAssertionType, + /* name: */ Parameters.ClientAssertionType, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ClientId), - /* name: */ OpenIddictConstants.Parameters.ClientId, + /* name: */ Parameters.ClientId, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ClientSecret), - /* name: */ OpenIddictConstants.Parameters.ClientSecret, + /* name: */ Parameters.ClientSecret, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Code), - /* name: */ OpenIddictConstants.Parameters.Code, + /* name: */ Parameters.Code, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.CodeChallenge), - /* name: */ OpenIddictConstants.Parameters.CodeChallenge, + /* name: */ Parameters.CodeChallenge, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.CodeChallengeMethod), - /* name: */ OpenIddictConstants.Parameters.CodeChallengeMethod, + /* name: */ Parameters.CodeChallengeMethod, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.CodeVerifier), - /* name: */ OpenIddictConstants.Parameters.CodeVerifier, + /* name: */ Parameters.CodeVerifier, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.DeviceCode), - /* name: */ OpenIddictConstants.Parameters.DeviceCode, + /* name: */ Parameters.DeviceCode, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Display), - /* name: */ OpenIddictConstants.Parameters.Display, + /* name: */ Parameters.Display, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.GrantType), - /* name: */ OpenIddictConstants.Parameters.GrantType, + /* name: */ Parameters.GrantType, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.IdentityProvider), - /* name: */ OpenIddictConstants.Parameters.IdentityProvider, + /* name: */ Parameters.IdentityProvider, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.IdTokenHint), - /* name: */ OpenIddictConstants.Parameters.IdTokenHint, + /* name: */ Parameters.IdTokenHint, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.LoginHint), - /* name: */ OpenIddictConstants.Parameters.LoginHint, + /* name: */ Parameters.LoginHint, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Nonce), - /* name: */ OpenIddictConstants.Parameters.Nonce, + /* name: */ Parameters.Nonce, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.MaxAge), - /* name: */ OpenIddictConstants.Parameters.MaxAge, + /* name: */ Parameters.MaxAge, /* value: */ new OpenIddictParameter((long?) 42) }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Password), - /* name: */ OpenIddictConstants.Parameters.Password, + /* name: */ Parameters.Password, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.PostLogoutRedirectUri), - /* name: */ OpenIddictConstants.Parameters.PostLogoutRedirectUri, + /* name: */ Parameters.PostLogoutRedirectUri, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Prompt), - /* name: */ OpenIddictConstants.Parameters.Prompt, + /* name: */ Parameters.Prompt, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.RedirectUri), - /* name: */ OpenIddictConstants.Parameters.RedirectUri, + /* name: */ Parameters.RedirectUri, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.RefreshToken), - /* name: */ OpenIddictConstants.Parameters.RefreshToken, + /* name: */ Parameters.RefreshToken, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Registration), - /* name: */ OpenIddictConstants.Parameters.Registration, + /* name: */ Parameters.Registration, /* value: */ new OpenIddictParameter(JsonSerializer.Deserialize(@"{""policy_uri"": ""http://www.fabrikam.com/policy""}")) }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Request), - /* name: */ OpenIddictConstants.Parameters.Request, + /* name: */ Parameters.Request, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.RequestId), - /* name: */ OpenIddictConstants.Parameters.RequestId, + /* name: */ Parameters.RequestId, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.RequestUri), - /* name: */ OpenIddictConstants.Parameters.RequestUri, + /* name: */ Parameters.RequestUri, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Resources), - /* name: */ OpenIddictConstants.Parameters.Resource, + /* name: */ Parameters.Resource, /* value: */ new OpenIddictParameter(new[] { "https://fabrikam.com/", "https://contoso.com/" }) }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ResponseMode), - /* name: */ OpenIddictConstants.Parameters.ResponseMode, + /* name: */ Parameters.ResponseMode, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.ResponseType), - /* name: */ OpenIddictConstants.Parameters.ResponseType, + /* name: */ Parameters.ResponseType, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Scope), - /* name: */ OpenIddictConstants.Parameters.Scope, + /* name: */ Parameters.Scope, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.State), - /* name: */ OpenIddictConstants.Parameters.State, + /* name: */ Parameters.State, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Token), - /* name: */ OpenIddictConstants.Parameters.Token, + /* name: */ Parameters.Token, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.TokenTypeHint), - /* name: */ OpenIddictConstants.Parameters.TokenTypeHint, + /* name: */ Parameters.TokenTypeHint, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.UiLocales), - /* name: */ OpenIddictConstants.Parameters.UiLocales, + /* name: */ Parameters.UiLocales, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.UserCode), - /* name: */ OpenIddictConstants.Parameters.UserCode, + /* name: */ Parameters.UserCode, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictRequest.Username), - /* name: */ OpenIddictConstants.Parameters.Username, + /* name: */ Parameters.Username, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; } diff --git a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictResponseTests.cs b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictResponseTests.cs index a96c5596..3f8f089c 100644 --- a/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictResponseTests.cs +++ b/test/OpenIddict.Abstractions.Tests/Primitives/OpenIddictResponseTests.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using Xunit; +using static OpenIddict.Abstractions.OpenIddictConstants; namespace OpenIddict.Abstractions.Tests.Primitives { @@ -18,91 +19,91 @@ namespace OpenIddict.Abstractions.Tests.Primitives yield return new object[] { /* property: */ nameof(OpenIddictResponse.AccessToken), - /* name: */ OpenIddictConstants.Parameters.AccessToken, + /* name: */ Parameters.AccessToken, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.Code), - /* name: */ OpenIddictConstants.Parameters.Code, + /* name: */ Parameters.Code, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.DeviceCode), - /* name: */ OpenIddictConstants.Parameters.DeviceCode, + /* name: */ Parameters.DeviceCode, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.Error), - /* name: */ OpenIddictConstants.Parameters.Error, + /* name: */ Parameters.Error, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.ErrorDescription), - /* name: */ OpenIddictConstants.Parameters.ErrorDescription, + /* name: */ Parameters.ErrorDescription, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.ErrorUri), - /* name: */ OpenIddictConstants.Parameters.ErrorUri, + /* name: */ Parameters.ErrorUri, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.ExpiresIn), - /* name: */ OpenIddictConstants.Parameters.ExpiresIn, + /* name: */ Parameters.ExpiresIn, /* value: */ new OpenIddictParameter((long?) 42) }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.IdToken), - /* name: */ OpenIddictConstants.Parameters.IdToken, + /* name: */ Parameters.IdToken, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.RefreshToken), - /* name: */ OpenIddictConstants.Parameters.RefreshToken, + /* name: */ Parameters.RefreshToken, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.Scope), - /* name: */ OpenIddictConstants.Parameters.Scope, + /* name: */ Parameters.Scope, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.State), - /* name: */ OpenIddictConstants.Parameters.State, + /* name: */ Parameters.State, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.TokenType), - /* name: */ OpenIddictConstants.Parameters.TokenType, + /* name: */ Parameters.TokenType, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; yield return new object[] { /* property: */ nameof(OpenIddictResponse.UserCode), - /* name: */ OpenIddictConstants.Parameters.UserCode, + /* name: */ Parameters.UserCode, /* value: */ new OpenIddictParameter("802A3E3E-DCCA-4EFC-89FA-7D82FE8C27E4") }; } diff --git a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs index b6ca921a..f3620734 100644 --- a/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs +++ b/test/OpenIddict.Server.IntegrationTests/OpenIddictServerIntegrationTestClient.cs @@ -16,6 +16,7 @@ using System.Threading.Tasks; using AngleSharp.Html.Parser; using Microsoft.Extensions.Primitives; using OpenIddict.Abstractions; +using static OpenIddict.Abstractions.OpenIddictConstants; namespace OpenIddict.Server.IntegrationTests { @@ -381,7 +382,7 @@ namespace OpenIddict.Server.IntegrationTests // this is required for derived drafts like the OAuth2 token exchange specification. var parameters = new List>(); - foreach (var element in new StringTokenizer(payload, OpenIddictConstants.Separators.Ampersand)) + foreach (var element in new StringTokenizer(payload, Separators.Ampersand)) { var segment = element; if (segment.Length == 0) diff --git a/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs b/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs index d6836550..1deff62c 100644 --- a/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs +++ b/test/OpenIddict.Server.Tests/OpenIddictServerBuilderTests.cs @@ -7,6 +7,7 @@ using Microsoft.IdentityModel.Tokens; using Moq; using OpenIddict.Abstractions; using Xunit; +using static OpenIddict.Abstractions.OpenIddictConstants; using static OpenIddict.Server.OpenIddictServerEvents; using SR = OpenIddict.Abstractions.OpenIddictResources; @@ -428,7 +429,7 @@ namespace OpenIddict.Server.Tests var options = GetOptions(services); // Assert - Assert.Contains(OpenIddictConstants.GrantTypes.AuthorizationCode, options.GrantTypes); + Assert.Contains(GrantTypes.AuthorizationCode, options.GrantTypes); } [Fact] @@ -444,7 +445,7 @@ namespace OpenIddict.Server.Tests var options = GetOptions(services); // Assert - Assert.Contains(OpenIddictConstants.GrantTypes.ClientCredentials, options.GrantTypes); + Assert.Contains(GrantTypes.ClientCredentials, options.GrantTypes); } [Fact] @@ -474,7 +475,8 @@ namespace OpenIddict.Server.Tests // Act and assert var exception = Assert.Throws(() => builder.AllowCustomFlow(type)); - Assert.Equal(nameof(type), exception.ParamName); + + Assert.Equal("type", exception.ParamName); Assert.Contains("The grant type cannot be null or empty.", exception.Message); } @@ -491,7 +493,7 @@ namespace OpenIddict.Server.Tests var options = GetOptions(services); // Assert - Assert.Contains(OpenIddictConstants.GrantTypes.Implicit, options.GrantTypes); + Assert.Contains(GrantTypes.Implicit, options.GrantTypes); } [Fact] @@ -507,7 +509,7 @@ namespace OpenIddict.Server.Tests var options = GetOptions(services); // Assert - Assert.Contains(OpenIddictConstants.GrantTypes.Password, options.GrantTypes); + Assert.Contains(GrantTypes.Password, options.GrantTypes); } [Fact] @@ -523,7 +525,7 @@ namespace OpenIddict.Server.Tests var options = GetOptions(services); // Assert - Assert.Contains(OpenIddictConstants.GrantTypes.RefreshToken, options.GrantTypes); + Assert.Contains(GrantTypes.RefreshToken, options.GrantTypes); } [Fact] @@ -619,7 +621,7 @@ namespace OpenIddict.Server.Tests var options = GetOptions(services); // Assert - Assert.Contains(OpenIddictConstants.GrantTypes.DeviceCode, options.GrantTypes); + Assert.Contains(GrantTypes.DeviceCode, options.GrantTypes); } [Fact] @@ -1740,7 +1742,8 @@ namespace OpenIddict.Server.Tests // Act and assert var exception = Assert.Throws(() => builder.RegisterClaims(claims)); - Assert.Equal(nameof(claims), exception.ParamName); + + Assert.Equal("claims", exception.ParamName); Assert.Contains("Claims cannot be null or empty.", exception.Message); } @@ -1785,7 +1788,8 @@ namespace OpenIddict.Server.Tests // Act and assert var exception = Assert.Throws(() => builder.RegisterScopes(scopes)); - Assert.Equal(nameof(scopes), exception.ParamName); + + Assert.Equal("scopes", exception.ParamName); Assert.Contains("Scopes cannot be null or empty.", exception.Message); }