[Identity-dev] svn commit r14751 - in trunk/solutions/identity/modules: identity-provider/src/main/java/org/wso2/solutions/identity/openid user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action user-ui/src/main/webapp/jsp

[svn]

Author: prabath
Date: Wed Mar 12 21:56:38 2008
New Revision: 14751

Log:

fixes as per OSIS_User-Centric_Interop_Plan_through_RSA doc

Modified:
   
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
   
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
   
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp

Modified: 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
==============================================================================
--- 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
     (original)
+++ 
trunk/solutions/identity/modules/identity-provider/src/main/java/org/wso2/solutions/identity/openid/OpenIDProvider.java
     Wed Mar 12 21:56:38 2008
@@ -278,7 +278,7 @@
                 }
             }
 
-            return message.getDestinationUrl(true);
+            return message.getDestinationUrl(false);
         }
     }
 

Modified: 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
==============================================================================
--- 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
   (original)
+++ 
trunk/solutions/identity/modules/user-ui/src/main/java/org/wso2/solutions/identity/user/ui/action/OpenIDAuthenticationAction.java
   Wed Mar 12 21:56:38 2008
@@ -66,7 +66,7 @@
                     
.removeAttribute("multiFactorAuthenticationWithUsernamePassword");
         }
 
-        if (!multiFactorAuthenticationWithUsernamePassword) {
+        if (multiFactorAuthenticationWithUsernamePassword) {
             return SUCCESS;
         }
 
@@ -122,7 +122,7 @@
             }
 
             if (rememberme && openidurl != null && openidurl.equals(openID)
-                    && password != null && !phishingResistanceAuthentication) {
+                    && password != null && !phishingResistanceAuthentication 
&& !multiFactorAuthentication) {
                 session.setAttribute("password", password);
                 response.sendRedirect("OpenIDAuthVerification.action");
             }

Modified: 
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
==============================================================================
--- 
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
       (original)
+++ 
trunk/solutions/identity/modules/user-ui/src/main/webapp/jsp/openidauthentication.jsp
       Wed Mar 12 21:56:38 2008
@@ -94,7 +94,7 @@
                                        <table>
                                                <tr>
                                                        <s:if 
test="%{!(multiFactorPhysicalAuthentication)}">
-                                                               <s:if 
test="%{!phishingResistanceAuthentication}">
+                                                               <s:if 
test="%{!(phishingResistanceAuthentication || multiFactorAuthentication)}">
                                                                        <td 
width="40%">
                                                                        <table 
cellpadding="0" cellspacing="10" border="0"
                                                                                
class="form-table">
@@ -120,7 +120,7 @@
                                                                </s:if>
 
                                                                <s:if
-                                                                       
test="%{!(multiFactorAuthenticationWithUsernamePassword || 
phishingResistanceAuthentication)}">
+                                                                       
test="%{!(multiFactorAuthenticationWithUsernamePassword || 
phishingResistanceAuthentication || multiFactorAuthentication)}">
                                                                        
<td><img src="images/line-sep.png" height="150" width="2" /></td>
                                                                        <td 
valign="middle" align="center" width="5%"><strong>OR</strong></td>
                                                                        
<td><img src="images/line-sep.png" height="150" width="2" /></td>

_______________________________________________
Identity-dev mailing list
Identity-dev@wso2.org
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev