svn commit: r1616917 - in /roller/trunk/app/src/main: java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java java/org/apache/roller/weblogger/ui/struts2/core/Login.java resources/ApplicationResources.properties

[gmazza]

Author: gmazza
Date: Sat Aug  9 02:50:01 2014
New Revision: 1616917

URL: http://svn.apache.org/r1616917
Log:
Added a logging comment when the returned openid url is not the one saved in 
the Roller DB.

Modified:
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
    
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
    roller/trunk/app/src/main/resources/ApplicationResources.properties

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java?rev=1616917&r1=1616916&r2=1616917&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerUserDetailsService.java
 Sat Aug  9 02:50:01 2014
@@ -45,6 +45,10 @@ public class RollerUserDetailsService im
                 }
                 try {
                     userData = umgr.getUserByOpenIdUrl(userName);
+                    if (userData == null) {
+                        log.warn("No user found with OpenID URL: " + userName +
+                                " (OpenID aliased by auth provider?) Confirm 
URL exists in roller_user table");
+                    }
                 } catch (WebloggerException ex) {
                     throw new DataRetrievalFailureException("ERROR in user 
lookup", ex);
                 }

Modified: 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java?rev=1616917&r1=1616916&r2=1616917&view=diff
==============================================================================
--- 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
 (original)
+++ 
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Login.java
 Sat Aug  9 02:50:01 2014
@@ -61,7 +61,11 @@ public class Login extends UIAction {
         
         // set action error message if there was login error
         if(getError() != null) {
-            addError("error.password.mismatch");
+            if (authMethod == AuthMethod.OPENID) {
+                addError("error.unmatched.openid");
+            } else {
+                addError("error.password.mismatch");
+            }
         }
         
         return SUCCESS;

Modified: roller/trunk/app/src/main/resources/ApplicationResources.properties
URL: 
http://svn.apache.org/viewvc/roller/trunk/app/src/main/resources/ApplicationResources.properties?rev=1616917&r1=1616916&r2=1616917&view=diff
==============================================================================
--- roller/trunk/app/src/main/resources/ApplicationResources.properties 
(original)
+++ roller/trunk/app/src/main/resources/ApplicationResources.properties Sat Aug 
 9 02:50:01 2014
@@ -436,6 +436,7 @@ error.upload.filemax=File <b>{0}</b> lar
 error.upload.forbiddenFile=File <b>{0}</b> content-type <b>{1}</b> not allowed
 error.general=ERROR: Unexpected Exception [{0}] has been logged.
 error.password.mismatch=Wrong username and password combination
+error.unmatched.openid=Unknown or invalid OpenID URL
 
 error.trackback=Error sending trackback. Possible cause: incorrect \
 trackback URL. {0}