[java-identity-provider COMMIT] /trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServl...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun 22 14:08:32 2015
New Revision: 7592

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7592&view=rev
Log:
IDP-748 - Fix a regression in the servlet from an earlier change.

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

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java?rev=7592&r1=7591&r2=7592&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java	(original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java	Mon Jun 22 14:08:32 2015
@@ -258,6 +258,12 @@
                 log.info("User identity not found in request");
                 ExternalAuthentication.finishExternalAuthentication(key, httpRequest, httpResponse);
                 return;
+            }
+
+            final String revokeConsent =
+                    httpRequest.getParameter(ProfileInterceptorFlowDescriptor.REVOKE_CONSENT_PARAM);
+            if (revokeConsent != null && ("1".equals(revokeConsent) || "true".equals(revokeConsent))) {
+                httpRequest.setAttribute(ExternalAuthentication.REVOKECONSENT_KEY, Boolean.TRUE);
             }
             
             if (authnMethodHeader != null) {
@@ -294,14 +300,10 @@
                 }
                 
                 httpRequest.setAttribute(ExternalAuthentication.PRINCIPAL_NAME_KEY, username);
-            }
-            
-            final String revokeConsent =
-                    httpRequest.getParameter(ProfileInterceptorFlowDescriptor.REVOKE_CONSENT_PARAM);
-            if (revokeConsent != null && ("1".equals(revokeConsent) || "true".equals(revokeConsent))) {
-                httpRequest.setAttribute(ExternalAuthentication.REVOKECONSENT_KEY, Boolean.TRUE);
-            }
-            
+            } else {
+                httpRequest.setAttribute(ExternalAuthentication.PRINCIPAL_NAME_KEY, username);
+            }
+                        
             ExternalAuthentication.finishExternalAuthentication(key, httpRequest, httpResponse);
             
         } catch (final ExternalAuthenticationException e) {