Changeset 294:3b11cfe29bf1

Timestamp:

09/04/11 22:20:56 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

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

Message:

fixed set otp bug.

Location:

kraken-dom/src/main/java/org/krakenapps/dom

Files:

• api/impl/AdminApiImpl.java (modified) (1 diff)
• msgbus/AdminPlugin.java (modified) (2 diffs)

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

@@ -243 +243 @@
                         admin.setIdleTimeout(targetAdmin.getIdleTimeout());
                         admin.setLoginLockCount(targetAdmin.getLoginLockCount());
+                        admin.setUseOtp(targetAdmin.isUseOtp());
+                        admin.setOtpSeed(targetAdmin.getOtpSeed());
 
                         if (!admin.isEnabled() && targetAdmin.isEnabled())

kraken-dom/src/main/java/org/krakenapps/dom/msgbus/AdminPlugin.java

@@ -96 +96 @@
 
                 Admin admin = toAdmin(req);
-                if (admin.isUseOtp())
-                        admin.setOtpSeed(createOtpSeed());
                 admin.setUser(user);
                 adminApi.createAdmin(req.getOrgId(), req.getAdminId(), admin);
@@ -186 +184 @@
                 admin.setEnabled(req.getBoolean("is_enabled"));
                 admin.setUseOtp(req.getBoolean("use_otp"));
-                if (admin.isUseOtp())
+                if (admin.isUseOtp()) {
+                        if (admin.getOtpSeed() == null)
+                                admin.setOtpSeed(createOtpSeed());
+                } else
                         admin.setOtpSeed(null);