smoyer64 closed pull request #16: Making SelfIdResolver optional
URL: https://github.com/apache/directory-scimple/pull/16
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
index 1405447..00b3b78 100644
---
a/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
+++
b/scim-server/scim-server-common/src/main/java/org/apache/directory/scim/server/rest/SelfResourceImpl.java
@@ -24,12 +24,12 @@
import javax.annotation.Resource;
import javax.ejb.SessionContext;
import javax.ejb.Stateless;
+import javax.enterprise.inject.Instance;
import javax.inject.Inject;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.directory.scim.server.exception.UnableToResolveIdException;
-import org.apache.directory.scim.server.provider.ProviderRegistry;
import org.apache.directory.scim.server.provider.SelfIdResolver;
import org.apache.directory.scim.spec.protocol.SelfResource;
import org.apache.directory.scim.spec.protocol.UserResource;
@@ -44,17 +44,14 @@
@Stateless
public class SelfResourceImpl implements SelfResource {
- @Inject
- ProviderRegistry providerRegistry;
-
@Inject
UserResource userResource;
@Inject
- SelfIdResolver selfIdResolver;
+ Instance<SelfIdResolver> selfIdResolver;
@Resource
- private SessionContext sessionContext;
+ SessionContext sessionContext;
@Override
public Response getSelf(AttributeReferenceListWrapper attributes,
AttributeReferenceListWrapper excludedAttributes) {
@@ -128,13 +125,15 @@ private String getInternalId() throws
UnableToResolveIdException {
Principal callerPrincipal = sessionContext.getCallerPrincipal();
if (callerPrincipal != null) {
- log.info("Resolved SelfResource principal to : {}",
callerPrincipal.getName());
+ log.debug("Resolved SelfResource principal to : {}",
callerPrincipal.getName());
} else {
throw new UnableToResolveIdException(Status.UNAUTHORIZED,
"Unauthorized");
}
- String internalId = selfIdResolver.resolveToInternalId(callerPrincipal);
- return internalId;
- }
+ if (selfIdResolver.isUnsatisfied()) {
+ throw new UnableToResolveIdException(Status.NOT_IMPLEMENTED, "Caller
SelfIdResolver not available");
+ }
+ return selfIdResolver.get().resolveToInternalId(callerPrincipal);
+ }
}
diff --git
a/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
b/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
new file mode 100644
index 0000000..30f5526
--- /dev/null
+++
b/scim-server/scim-server-common/src/test/java/org/apache/directory/scim/server/rest/SelfResourceImplTest.java
@@ -0,0 +1,75 @@
+package org.apache.directory.scim.server.rest;
+
+import org.apache.directory.scim.server.exception.UnableToResolveIdException;
+import org.apache.directory.scim.server.provider.SelfIdResolver;
+import org.apache.directory.scim.spec.protocol.UserResource;
+import org.apache.directory.scim.spec.protocol.data.ErrorResponse;
+import org.apache.directory.scim.spec.protocol.exception.ScimException;
+import org.junit.Test;
+
+import javax.ejb.SessionContext;
+import javax.enterprise.inject.Instance;
+import javax.ws.rs.core.Response;
+import java.security.Principal;
+import java.util.List;
+
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+
+public class SelfResourceImplTest {
+
+ @Test
+ public void noSelfIdResolverTest() {
+
+ Principal principal = mock(Principal.class);
+ SessionContext sessionContext = mock(SessionContext.class);
+ Instance selfIdResolverInstance = mock(Instance.class);
+
+ when(sessionContext.getCallerPrincipal()).thenReturn(principal);
+ when(principal.getName()).thenReturn("test-user");
+ when(selfIdResolverInstance.isUnsatisfied()).thenReturn(true);
+
+ SelfResourceImpl selfResource = new SelfResourceImpl();
+ selfResource.selfIdResolver = selfIdResolverInstance;
+ selfResource.sessionContext = sessionContext;
+
+ Response response = selfResource.getSelf(null, null);
+ assertThat(response.getEntity(), instanceOf(ErrorResponse.class));
+ List<String> messages =
((ErrorResponse)response.getEntity()).getErrorMessageList();
+ assertThat(messages, hasItem("Caller SelfIdResolver not available"));
+ assertThat(messages, hasSize(1));
+ }
+
+ @Test
+ public void withSelfIdResolverTest() throws UnableToResolveIdException,
ScimException {
+
+ String internalId = "test-user-resolved";
+ Principal principal = mock(Principal.class);
+ SessionContext sessionContext = mock(SessionContext.class);
+ Instance selfIdResolverInstance = mock(Instance.class);
+ SelfIdResolver selfIdResolver = mock(SelfIdResolver.class);
+ UserResource userResource = mock(UserResource.class);
+ Response mockResponse = mock(Response.class);
+
+ when(sessionContext.getCallerPrincipal()).thenReturn(principal);
+ when(principal.getName()).thenReturn("test-user");
+ when(selfIdResolverInstance.isUnsatisfied()).thenReturn(false);
+ when(selfIdResolverInstance.get()).thenReturn(selfIdResolver);
+ when(selfIdResolver.resolveToInternalId(principal)).thenReturn(internalId);
+ when(userResource.getById(internalId, null,
null)).thenReturn(mockResponse);
+
+ SelfResourceImpl selfResource = new SelfResourceImpl();
+ selfResource.selfIdResolver = selfIdResolverInstance;
+ selfResource.sessionContext = sessionContext;
+ selfResource.userResource = userResource;
+
+ // the response is just a passed along from the UserResource, so just
validate it is the same instance.
+ assertThat(selfResource.getSelf(null, null), sameInstance(mockResponse));
+ }
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
