github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

DefaultSystemScopeService: Fix new logic

pull/1502/head
Thomas Meyer 2019-08-03 15:04:23 +02:00
parent 7dc3b8ec3a
commit 742620a29c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultSystemScopeService.java
View File

@ -22,6 +22,7 @@ package org.mitre.oauth2.service.impl;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@ -136,15 +137,15 @@ public class DefaultSystemScopeService implements SystemScopeService {
if (scope == null) {
return null;
} else {
Set<String> scopeValues = scope.stream().filter(s -> s != null).collect(Collectors.toSet());
Set<String> scopeValues = scope.stream().filter(Objects::nonNull).collect(Collectors.toSet());
Set<SystemScope> scopesFromDB = getByValues(scopeValues);
Set<String> scopesFromDBValues = scopesFromDB.stream().map(SystemScope::getValue).collect(Collectors.toSet());
Set<SystemScope> missingScopesFromDB = scopesFromDB
Set<SystemScope> missingScopesFromDB = scopeValues
.stream()
.map(SystemScope::getValue)
.filter(sv -> !scopesFromDBValues.contains(sv))
.map(sv -> new SystemScope(sv))
.collect(Collectors.toSet());
Set<SystemScope> allScopes = new HashSet<SystemScope>();
allScopes.addAll(scopesFromDB);
allScopes.addAll(missingScopesFromDB);