[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthentica...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 26 13:05:45 2016
New Revision: 8261

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8261&view=rev
Log:
IDP-962 - Login flow or framework for combining authentication factors

Back out flow parameter feature, already supported via simpler approach.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/MultiFactorAuthenticationContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthentication.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java?rev=8261&r1=8260&r2=8261&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/MultiFactorAuthenticationTransition.java	Thu May 26 13:05:45 2016
@@ -70,15 +70,11 @@
     /** A function that determines the next flow to execute. */
     @Nonnull @NonnullElements private Map<String,Function<ProfileRequestContext,String>> nextFlowStrategyMap;
     
-    /** A map of parameters for input to flow(s) that may be run. */
-    @Nonnull private Map<String,Object> flowParameterMap;
-    
     /** Constructor. */
     public MultiFactorAuthenticationTransition() {
         completionCondition = new DefaultCompletionCondition();
         resultMergingStrategy = new DefaultResultMergingStrategy();
         nextFlowStrategyMap = new HashMap<>();
-        flowParameterMap = Collections.emptyMap();
     }
     
     /**
@@ -191,28 +187,6 @@
      */
     public void setNextFlow(@Nullable @NotEmpty final String flowId) {
         setNextFlowStrategyMap(Collections.<String,Object>singletonMap("proceed", flowId));
-    }
-    
-    /**
-     * Get the mutable map of parameters for passage into flows that may be run.
-     * 
-     * @return mutable parameter map
-     */
-    @Nonnull @Live public Map<String,Object> getFlowParameterMap() {
-        return flowParameterMap;
-    }
-    
-    /**
-     * Set the map of parameters for passage into flows that may be run.
-     * 
-     * @param map parameter map
-     */
-    public void setFlowParameterMap(@Nullable final Map<String,Object> map) {
-        if (map != null) {
-            flowParameterMap = new HashMap<>(map);
-        } else {
-            flowParameterMap = Collections.emptyMap();
-        }
     }
 
     /**

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/MultiFactorAuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/MultiFactorAuthenticationContext.java?rev=8261&r1=8260&r2=8261&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/MultiFactorAuthenticationContext.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/MultiFactorAuthenticationContext.java	Thu May 26 13:05:45 2016
@@ -17,7 +17,6 @@
 
 package net.shibboleth.idp.authn.context;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -58,14 +57,10 @@
     /** The next flow due to execute (or the currently executing flow during subflow execution). */
     @Nullable @NotEmpty private String nextFlowId;
     
-    /** Map of parameters into or out of flows. */
-    @Nonnull private Map<String,Object> flowParameterMap;
-    
     /** Constructor. */
     public MultiFactorAuthenticationContext() {
         transitionMap = new HashMap<>();
         activeResults = new HashMap<>();
-        flowParameterMap = Collections.emptyMap();
     }
 
     /**
@@ -152,31 +147,5 @@
         
         return this;
     }
-    
-    /**
-     * Get the mutable map of parameters for passage into flows that may be run.
-     * 
-     * @return mutable parameter map
-     */
-    @Nonnull @Live Map<String,Object> getFlowParameterMap() {
-        return flowParameterMap;
-    }
-    
-    /**
-     * Set the map of parameters for passage into flows that may be run.
-     * 
-     * @param map parameter map
-     * 
-     * @return this context
-     */
-    @Nonnull public MultiFactorAuthenticationContext setFlowParameterMap(@Nullable final Map<String,Object> map) {
-        if (map != null) {
-            flowParameterMap = new HashMap<>(map);
-        } else {
-            flowParameterMap = Collections.emptyMap();
-        }
-        
-        return this;
-    }
 
 }

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/TransitionMultiFactorAuthentication.java

[... 21 lines stripped ...]