Changeset 358:388a792d7e89

Timestamp:

09/22/11 18:43:14 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2792

Message:

modified LoginCallback interface.

Location:

kraken-dom

Files:

• pom.xml (modified) (1 diff)
• src/main/java/org/krakenapps/dom/api/LoginCallback.java (modified) (2 diffs)
• src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java (modified) (2 diffs)

kraken-dom/pom.xml

@@ -11 +11 @@
         <groupId>org.krakenapps</groupId>
         <artifactId>kraken-dom</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.1</version>
         <packaging>bundle</packaging>
         <name>Kraken DOM</name>

kraken-dom/src/main/java/org/krakenapps/dom/api/LoginCallback.java

@@ -1 +1 @@
 package org.krakenapps.dom.api;
 
+import org.krakenapps.dom.exception.LoginFailedException;
 import org.krakenapps.dom.model.Admin;
 import org.krakenapps.msgbus.Session;
@@ -7 +8 @@
         void onLoginSuccess(Admin admin, Session session);
 
-        void onLoginFailed(Admin admin, Session session);
+        void onLoginFailed(Admin admin, Session session, LoginFailedException e);
 
         void onLoginLocked(Admin admin, Session session);

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java

@@ -120 +120 @@
                 } else {
                         updateLoginFailures(admin, false);
+                        LoginFailedException e = null;
+                        if (admin.isUseOtp())
+                                e = new InvalidOtpPasswordException();
+                        else
+                                e = new InvalidPasswordException();
                         for (LoginCallback callback : callbacks)
-                                callback.onLoginFailed(admin, session);
-                        if (admin.isUseOtp())
-                                throw new InvalidOtpPasswordException();
-                        else
-                                throw new InvalidPasswordException();
+                                callback.onLoginFailed(admin, session, e);
+                        throw e;
                 }
         }
@@ -140 +142 @@
                         if (!found) {
                                 updateLoginFailures(admin, false);
-                                throw new AccessControlException();
+                                LoginFailedException e = new AccessControlException();
+                                for (LoginCallback callback : callbacks)
+                                        callback.onLoginFailed(admin, session, e);
+                                throw e;
                         }
                 }