test/jap
1
0
Fork 0
mirror of https://gitee.com/fujieid/jap.git synced 2024-11-30 10:37:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔇 Remove IdsScopeProvider#initScopes(List<IdsScope>).

Browse Source
This commit is contained in:
yadong.zhang 2021-05-06 21:14:08 +08:00
parent 0391ff5e40
commit 068fc36201
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jap-ids/src/main/java/com/fujieid/jap/ids/provider/IdsScopeProvider.java
View File

@ -26,8 +26,6 @@ import java.util.stream.Collectors;
* Read, write, openid, email, and phone are supported by default.
* If developers need to modify the scope, they can use the following methods:
* <p>
* {@link com.fujieid.jap.ids.provider.IdsScopeProvider#initScopes(List)}
* <p>
* {@link com.fujieid.jap.ids.provider.IdsScopeProvider#addScope(IdsScope)}
* <p>
* Note: Whether it is a custom scope or a system built-in scope, openid must be included, which is a required option for enabling OIDC
@ -38,11 +36,9 @@ import java.util.stream.Collectors;
*/
public class IdsScopeProvider {
private static List<IdsScope> scopes = new ArrayList<>();
private static final List<IdsScope> SCOPES = new ArrayList<>();
static {
addScope(new IdsScope().setCode("read").setDescription("Allows to read resources, including users, protected resources, etc."));
addScope(new IdsScope().setCode("write").setDescription("Allows to modify resources, including adding, deleting, and modifying resources such as users and protected resources."));
addScope(new IdsScope().setCode("openid").setDescription("OpenID connect must include scope."));
addScope(new IdsScope().setCode("profile").setDescription("Allow access to user's basic information."));
addScope(new IdsScope().setCode("email").setDescription("Allow access to user's mailbox."));
@ -50,19 +46,6 @@ public class IdsScopeProvider {
addScope(new IdsScope().setCode("address").setDescription("Allow access to the user's address."));
}
/**
* Initialize scope
* <p>
* Note: This method will reset the existing scope collection
*
* @param idsScopes scope collection
*/
public static void initScopes(List<IdsScope> idsScopes) {
if (ObjectUtil.isNotEmpty(idsScopes)) {
scopes = idsScopes;
}
}
/**
* Add a single scope.
* Note: This method is to add data to the existing scope collection
@ -70,7 +53,7 @@ public class IdsScopeProvider {
* @param idsScope single scope
*/
public static void addScope(IdsScope idsScope) {
scopes.add(idsScope);
SCOPES.add(idsScope);
}
/**
@ -79,7 +62,7 @@ public class IdsScopeProvider {
* @return Unique scope collection
*/
public static List<IdsScope> getScopes() {
return scopes.stream().collect(Collectors.collectingAndThen(
return SCOPES.stream().collect(Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(
Comparator.comparing(
IdsScope::getCode))), ArrayList::new));
@ -95,7 +78,7 @@ public class IdsScopeProvider {
if (ObjectUtil.isEmpty(codes)) {
return new ArrayList<>(0);
}
return Optional.ofNullable(scopes.stream().filter((scope) -> codes.contains(scope.getCode()))
return Optional.ofNullable(SCOPES.stream().filter((scope) -> codes.contains(scope.getCode()))
.collect(Collectors.collectingAndThen(
Collectors.toCollection(() -> new TreeSet<>(
Comparator.comparing(
@ -109,7 +92,7 @@ public class IdsScopeProvider {
* @return code of all scopes
*/
public static List<String> getScopeCodes() {
return scopes.stream().map(IdsScope::getCode).distinct().collect(Collectors.toList());
return SCOPES.stream().map(IdsScope::getCode).distinct().collect(Collectors.toList());
}
}

7
jap-ids/src/test/java/com/fujieid/jap/ids/provider/IdsScopeProviderTest.java
View File

@ -9,13 +9,6 @@ import java.util.List;
public class IdsScopeProviderTest {
@Test
public void initScopes() {
IdsScopeProvider.initScopes(Collections.singletonList(new IdsScope().setCode("code").setDescription("aasdasd")));
Assert.assertEquals(1, IdsScopeProvider.getScopes().size());
Assert.assertEquals("code", IdsScopeProvider.getScopes().get(0).getCode());
}
@Test
public void addScope() {
IdsScopeProvider.addScope(new IdsScope().setCode("code").setDescription("aasdasd"));