Fallback for transition to new WebDAV password: If no password has been created,...

[pithos] / src / gr / ebs / gss / server / webdav / login / GssWebDAVLoginModule.java

diff --git a/src/gr/ebs/gss/server/webdav/login/GssWebDAVLoginModule.java b/src/gr/ebs/gss/server/webdav/login/GssWebDAVLoginModule.java
index e89ae1f..6feb4b4 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/login/GssWebDAVLoginModule.java
+++ b/src/gr/ebs/gss/server/webdav/login/GssWebDAVLoginModule.java
@@ -75,6 +75,9 @@ public class GssWebDAVLoginModule extends UsernamePasswordLoginModule {
                try {\r
                        User user = getService().findUser(username);\r
                        if (user==null) throw new FailedLoginException("User '"+username+"' not found.");\r
+                       if (user.getWebDAVPassword()!=null && user.getWebDAVPassword().length()>0)\r
+                               return user.getWebDAVPassword();\r
+                       // If no password has ever been generated, use token instead\r
                        String tokenEncoded = new String(Base64.encodeBase64(user.getAuthToken()), "US-ASCII");\r
                        return tokenEncoded;\r
                } catch (RpcException e) {\r
@@ -82,8 +85,8 @@ public class GssWebDAVLoginModule extends UsernamePasswordLoginModule {
                        logger.error(error, e);\r
                        throw new LoginException(e.getMessage());\r
                } catch (UnsupportedEncodingException e) {\r
-                       logger.error("", e);\r
-                       throw new LoginException(e.getMessage());\r
+            logger.error("", e);\r
+            throw new LoginException(e.getMessage());\r
                }\r
        }\r
 \r