Browse Source

优化scope解析

zhouhao 4 years ago
parent
commit
0e2bc85cb8

+ 1 - 1
hsweb-authorization/hsweb-authorization-oauth2/src/main/java/org/hswebframework/web/oauth2/server/code/DefaultAuthorizationCodeGranter.java

@@ -63,7 +63,7 @@ public class DefaultAuthorizationCodeGranter implements AuthorizationCodeGranter
         if (StringUtils.isEmpty(scopeStr)) {
             return ((permission, s) -> false);
         }
-        String[] scopes = scopeStr.split("[,]");
+        String[] scopes = scopeStr.split("[ ,\n]");
         Map<String, Set<String>> actions = new HashMap<>();
         for (String scope : scopes) {
             String[] permissions = scope.split("[:]");

+ 1 - 1
hsweb-authorization/hsweb-authorization-oauth2/src/test/java/org/hswebframework/web/oauth2/server/code/DefaultAuthorizationCodeGranterTest.java

@@ -19,7 +19,7 @@ public class DefaultAuthorizationCodeGranterTest {
 
     @Test
     public void testPermission() {
-        BiPredicate<Permission, String> predicate = DefaultAuthorizationCodeGranter.createPredicate("user:info,device:query");
+        BiPredicate<Permission, String> predicate = DefaultAuthorizationCodeGranter.createPredicate("user:info device:query");
 
         {
             SimplePermission permission=new SimplePermission();