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

serialize structured scopes properly (with tests)

pull/516/head
Justin Richer 2013-08-30 15:15:55 -04:00
parent 72f0ab631d
commit 6152a943d8
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
@ -95,10 +96,14 @@ public class DefaultSystemScopeService implements SystemScopeService {
public String apply(SystemScope input) { public String apply(SystemScope input) {
if (input == null) { if (input == null) {
return null; return null;
} else {
if (input.isStructured() && !Strings.isNullOrEmpty(input.getStructuredValue())) {
return Joiner.on(":").join(input.getValue(), input.getStructuredValue());
} else { } else {
return input.getValue(); return input.getValue();
} }
} }
}
}; };
/* (non-Javadoc) /* (non-Javadoc)

40
openid-connect-server/src/test/java/org/mitre/oauth2/service/impl/TestDefaultSystemScopeService.java
View File

@ -51,6 +51,8 @@ public class TestDefaultSystemScopeService {
private SystemScope defaultScope2; private SystemScope defaultScope2;
private SystemScope dynScope1; private SystemScope dynScope1;
private SystemScope extraScope1; private SystemScope extraScope1;
private SystemScope structuredScope1;
private SystemScope structuredScope1Value;
private String defaultDynScope1String = "defaultDynScope1"; private String defaultDynScope1String = "defaultDynScope1";
private String defaultDynScope2String = "defaultDynScope2"; private String defaultDynScope2String = "defaultDynScope2";
@ -58,6 +60,8 @@ public class TestDefaultSystemScopeService {
private String defaultScope2String = "defaultScope2"; private String defaultScope2String = "defaultScope2";
private String dynScope1String = "dynScope1"; private String dynScope1String = "dynScope1";
private String extraScope1String = "extraScope1"; private String extraScope1String = "extraScope1";
private String structuredScope1String = "structuredScope1";
private String structuredValue = "structuredValue";
private Set<SystemScope> allScopes; private Set<SystemScope> allScopes;
private Set<String> allScopeStrings; private Set<String> allScopeStrings;
@ -97,8 +101,34 @@ public class TestDefaultSystemScopeService {
// extraScope1 : extra scope that is neither (defaults to false/false) // extraScope1 : extra scope that is neither (defaults to false/false)
extraScope1 = new SystemScope(extraScope1String); extraScope1 = new SystemScope(extraScope1String);
allScopes = Sets.newHashSet(defaultDynScope1, defaultDynScope2, defaultScope1, defaultScope2, dynScope1, extraScope1); // structuredScope1 : structured scope
allScopeStrings = Sets.newHashSet(defaultDynScope1String, defaultDynScope2String, defaultScope1String, defaultScope2String, dynScope1String, extraScope1String); structuredScope1 = new SystemScope(structuredScope1String);
structuredScope1.setStructured(true);
// structuredScope1Value : structured scope with value
structuredScope1Value = new SystemScope(structuredScope1String);
structuredScope1Value.setStructured(true);
structuredScope1Value.setStructuredValue(structuredValue);
allScopes = Sets.newHashSet(defaultDynScope1, defaultDynScope2, defaultScope1, defaultScope2, dynScope1, extraScope1, structuredScope1, structuredScope1Value);
allScopeStrings = Sets.newHashSet(defaultDynScope1String, defaultDynScope2String, defaultScope1String, defaultScope2String, dynScope1String, extraScope1String, structuredScope1String, structuredScope1String + ":" + structuredValue);
Mockito.when(repository.getByValue(defaultDynScope1String)).thenReturn(defaultDynScope1);
Mockito.when(repository.getByValue(defaultDynScope2String)).thenReturn(defaultDynScope2);
Mockito.when(repository.getByValue(defaultScope1String)).thenReturn(defaultScope1);
Mockito.when(repository.getByValue(defaultScope2String)).thenReturn(defaultScope2);
Mockito.when(repository.getByValue(dynScope1String)).thenReturn(dynScope1);
Mockito.when(repository.getByValue(extraScope1String)).thenReturn(extraScope1);
// we re-use this value so we've got to use thenAnswer instead
Mockito.when(repository.getByValue(structuredScope1String)).thenAnswer(new Answer<SystemScope>() {
@Override
public SystemScope answer(InvocationOnMock invocation) throws Throwable {
SystemScope s = new SystemScope(structuredScope1String);
s.setStructured(true);
return s;
}
});
Mockito.when(repository.getAll()).thenReturn(allScopes); Mockito.when(repository.getAll()).thenReturn(allScopes);
} }
@ -131,12 +161,6 @@ public class TestDefaultSystemScopeService {
// check null condition // check null condition
assertThat(service.fromStrings(null), is(nullValue())); assertThat(service.fromStrings(null), is(nullValue()));
// reinitialize the set of SystemScope objects to clear boolean flags..
allScopes = Sets.newHashSet();
for (String scope : allScopeStrings) {
allScopes.add(new SystemScope(scope));
}
assertThat(service.fromStrings(allScopeStrings), equalTo(allScopes)); assertThat(service.fromStrings(allScopeStrings), equalTo(allScopes));
} }