Changeset 289:c51fd17917ff

Timestamp:

09/04/11 21:44:37 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

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

Message:

added otp option.

Location:

kraken-dom

Files:

• pom.xml (modified) (1 diff)
• src/main/java/org/krakenapps/dom/model/Admin.java (modified) (3 diffs)
• src/main/java/org/krakenapps/dom/msgbus/AdminPlugin.java (modified) (4 diffs)

kraken-dom/pom.xml

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

kraken-dom/src/main/java/org/krakenapps/dom/model/Admin.java

@@ -83 +83 @@
         private boolean isEnabled;
 
+        @Column(name = "use_otp", nullable = false)
+        private boolean useOtp;
+
+        @Column(name = "otp_seed")
+        private String otpSeed;
+
         @OneToMany(cascade = CascadeType.ALL, mappedBy = "admin")
         private List<Widget> widgets = new ArrayList<Widget>();
@@ -191 +197 @@
         public void setUser(User user) {
                 this.user = user;
+        }
+
+        public boolean isUseOtp() {
+                return useOtp;
+        }
+
+        public void setUseOtp(boolean useOtp) {
+                this.useOtp = useOtp;
+        }
+
+        public String getOtpSeed() {
+                return otpSeed;
+        }
+
+        public void setOtpSeed(String otpSeed) {
+                this.otpSeed = otpSeed;
         }
 
@@ -230 +252 @@
                 m.put("last_login", lastLoginDateTime);
                 m.put("is_enabled", isEnabled);
+                m.put("use_otp", useOtp);
+                m.put("otp_seed", otpSeed);
                 return m;
         }

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

@@ -95 +95 @@
 
                 Admin admin = toAdmin(req);
+                if (admin.isUseOtp())
+                        admin.setOtpSeed(createOtpSeed());
                 admin.setUser(user);
                 adminApi.createAdmin(req.getOrgId(), req.getAdminId(), admin);
@@ -143 +145 @@
         }
 
+        @MsgbusMethod
+        public void updateOtpSeed(Request req, Response resp) {
+                if (req.getAdminId() == null)
+                        throw new SecurityException("not admin");
+
+                Admin admin = adminApi.getAdmin(req.getOrgId(), req.getAdminId());
+                if (admin == null)
+                        throw new IllegalArgumentException("admin not found");
+
+                if (admin.isUseOtp())
+                        admin.setOtpSeed(createOtpSeed());
+                else
+                        admin.setOtpSeed(null);
+
+                adminApi.updateAdmin(req.getOrgId(), req.getAdminId(), admin);
+                resp.put("otp_seed", admin.getOtpSeed());
+        }
+
         private Admin toAdmin(Request req) throws RoleNotFoundException {
                 Admin admin = new Admin();
@@ -156 +176 @@
                 if (profile == null)
                         throw new ProgramProfileNotFoundException(profileId);
-                
+
                 admin.setProgramProfile(profile);
                 admin.setUseLoginLock(req.getBoolean("use_login_lock"));
@@ -164 +184 @@
                 admin.setIdleTimeout(req.getInteger("idle_timeout"));
                 admin.setEnabled(req.getBoolean("is_enabled"));
+                admin.setUseOtp(req.getBoolean("use_otp"));
+                if (admin.isUseOtp())
+                        admin.setOtpSeed(null);
 
                 admin.validate();
                 return admin;
         }
+
+        private String createOtpSeed() {
+                return null;
+        }
 }