优化scope解析

zhou-hao · zhou-hao · commit 0e2bc85cb892 · 2020-10-11T08:58:21.000+08:00
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/src/main/java/org/hswebframework/web/oauth2/server/code/DefaultAuthorizationCodeGranter.java b/hsweb-authorization/hsweb-authorization-oauth2/src/main/java/org/hswebframework/web/oauth2/server/code/DefaultAuthorizationCodeGranter.java
@@ -63,7 +63,7 @@ static BiPredicate<Permission, String> createPredicate(String scopeStr) {
         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("[:]");
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/src/test/java/org/hswebframework/web/oauth2/server/code/DefaultAuthorizationCodeGranterTest.java b/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();

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ static BiPredicate<Permission, String> createPredicate(String scopeStr) {`
`63`	`63`	`if (StringUtils.isEmpty(scopeStr)) {`
`64`	`64`	`return ((permission, s) -> false);`
`65`	`65`	`}`
`66`		`- String[] scopes = scopeStr.split("[,]");`
	`66`	`+ String[] scopes = scopeStr.split("[ ,\n]");`
`67`	`67`	`Map<String, Set<String>> actions = new HashMap<>();`
`68`	`68`	`for (String scope : scopes) {`
`69`	`69`	`String[] permissions = scope.split("[:]");`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public class DefaultAuthorizationCodeGranterTest {`
`19`	`19`
`20`	`20`	`@Test`
`21`	`21`	`public void testPermission() {`
`22`		`- BiPredicate<Permission, String> predicate = DefaultAuthorizationCodeGranter.createPredicate("user:info,device:query");`
	`22`	`+ BiPredicate<Permission, String> predicate = DefaultAuthorizationCodeGranter.createPredicate("user:info device:query");`
`23`	`23`
`24`	`24`	`{`
`25`	`25`	`SimplePermission permission=new SimplePermission();`