Fix errors and messages

ThreeMammals · Aug 24, 2023 · dc6076f · dc6076f
1 parent b389e86
commit dc6076f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/src/Ocelot/Authorization/ScopesAuthorizer.cs b/src/Ocelot/Authorization/ScopesAuthorizer.cs
@@ -11,7 +11,12 @@ namespace Ocelot.Authorization
     public class ScopesAuthorizer : IScopesAuthorizer
     {
         private const string ScopeClaimKey = "scope";
-        private readonly IClaimsParser _claimsParser;
+        private readonly IClaimsParser _claimsParser;
+
+        public ScopesAuthorizer(IClaimsParser claimsParser)
+        {
+            _claimsParser = claimsParser;
+        }
 
         public Response<bool> Authorize(ClaimsPrincipal claimsPrincipal, List<string> routeAllowedScopes)
         {
@@ -33,16 +38,16 @@ public Response<bool> Authorize(ClaimsPrincipal claimsPrincipal, List<string> ro
             {
                 var scope = userScopes[0];
 
-                if (scope.Contains(" "))
+                if (scope.Contains(' '))
                 {
-                    userScopes = scope.Split(" ", StringSplitOptions.RemoveEmptyEntries);
+                    userScopes = scope.Split(' ', StringSplitOptions.RemoveEmptyEntries);
                 }
             }
 
             if (routeAllowedScopes.Except(userScopes).Any())
             {
                 return new ErrorResponse<bool>(
-                    new ScopeNotAuthorizedError($"User scopes: '{string.Join(",", userScopes)}' do not have all allowed route scopes: '{string.Join(",", routeAllowedScopes)}'"));
+                    new ScopeNotAuthorizedError($"User scopes: '{string.Join(',', userScopes)}' do not have all allowed route scopes: '{string.Join(',', routeAllowedScopes)}'"));
             }
 
             return new OkResponse<bool>(true);

diff --git a/test/Ocelot.UnitTests/Infrastructure/ScopesAuthorizerTests.cs b/test/Ocelot.UnitTests/Infrastructure/ScopesAuthorizerTests.cs
@@ -31,7 +31,7 @@ public ScopesAuthorizerTests()
         }
 
         [Fact]
-        public void should_return_ok_if_no_allowed_scopes()
+        public void Should_return_ok_if_no_allowed_scopes()
         {
             this.Given(_ => GivenTheFollowing(new ClaimsPrincipal()))
             .And(_ => GivenTheFollowing(new List<string>()))
@@ -41,7 +41,7 @@ public void should_return_ok_if_no_allowed_scopes()
         }
 
         [Fact]
-        public void should_return_ok_if_null_allowed_scopes()
+        public void Should_return_ok_if_null_allowed_scopes()
         {
             this.Given(_ => GivenTheFollowing(new ClaimsPrincipal()))
             .And(_ => GivenTheFollowing((List<string>)null))
@@ -51,7 +51,7 @@ public void should_return_ok_if_null_allowed_scopes()
         }
 
         [Fact]
-        public void should_return_error_if_claims_parser_returns_error()
+        public void Should_return_error_if_claims_parser_returns_error()
         {
             var fakeError = new FakeError();
             this.Given(_ => GivenTheFollowing(new ClaimsPrincipal()))
@@ -63,7 +63,7 @@ public void should_return_error_if_claims_parser_returns_error()
         }
 
         [Fact]
-        public void should_match_scopes_and_return_ok_result()
+        public void Should_match_scopes_and_return_ok_result()
         {
             var claimsPrincipal = new ClaimsPrincipal();
             var allowedScopes = new List<string> { "someScope" };
@@ -77,7 +77,7 @@ public void should_match_scopes_and_return_ok_result()
         }
 
         [Fact]
-        public void should_not_match_scopes_and_return_error_result()
+        public void Should_not_match_scopes_and_return_error_result()
         {
             var fakeError = new FakeError();
             var claimsPrincipal = new ClaimsPrincipal();