[java-idp-oidc] 01/02: Removed unnecessary dependency to outbound message context.

[Henri Mikkonen]

This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=991be6f013285f125d1aa869bc28b528a69bcf26

commit 991be6f013285f125d1aa869bc28b528a69bcf26
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Mon Mar 15 15:43:42 2021 +0200

    Removed unnecessary dependency to outbound message context.
---
 .../AbstractAuthenticationRequestLookupFunction.java        | 13 +++++++------
 .../AbstractAuthenticationRequestLookupFunctionTest.java    | 10 ----------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
index eca55a38..d0efec9a 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunction.java
@@ -51,19 +51,20 @@ public abstract class AbstractAuthenticationRequestLookupFunction<T>
     /** {@inheritDoc} */
     @Nullable
     public T apply(@Nullable final ProfileRequestContext input) {
-        if (input == null || input.getInboundMessageContext() == null || input.getOutboundMessageContext() == null) {
+        if (input == null || input.getInboundMessageContext() == null) {
             return null;
         }
         final Object message = input.getInboundMessageContext().getMessage();
         if (message == null || !(message instanceof AuthenticationRequest)) {
             return null;
         }
-        final OIDCAuthenticationResponseContext ctx =
-                input.getOutboundMessageContext().getSubcontext(OIDCAuthenticationResponseContext.class, false);
-        if (ctx == null) {
-            return null;
+        if (input.getOutboundMessageContext() != null) {
+            final OIDCAuthenticationResponseContext ctx =
+                    input.getOutboundMessageContext().getSubcontext(OIDCAuthenticationResponseContext.class, false);
+            if (ctx != null) {
+                requestObject = ctx.getRequestObject();
+            }
         }
-        requestObject = ctx.getRequestObject();
         
         return doLookup((AuthenticationRequest) message);
     }
diff --git a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
index 40241f57..f18fc85f 100644
--- a/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
+++ b/idp-oidc-extension-api/src/test/java/net/shibboleth/idp/plugin/oidc/op/profile/context/navigate/AbstractAuthenticationRequestLookupFunctionTest.java
@@ -78,16 +78,6 @@ public class AbstractAuthenticationRequestLookupFunctionTest {
         Assert.assertNull(mock.apply(prc));
     }
 
-    @Test
-    public void testNoOutboundCtxts() {
-        // No outbound msg context
-        prc.setOutboundMessageContext(null);
-        Assert.assertNull(mock.apply(prc));
-        // No authentication response context
-        prc.setOutboundMessageContext(new MessageContext());
-        Assert.assertNull(mock.apply(prc));
-    }
-
     class MockOKLookupFunction extends AbstractAuthenticationRequestLookupFunction<String> {
 
         @Override

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.