[UI] Handling users and passwords

[validation.git] / ui / src / main / java / org / akraino / validation / ui / conf / UiInitializer.java

diff --git a/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java b/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java
index e93c25b..0052040 100644 (file)
--- a/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java
+++ b/ui/src/main/java/org/akraino/validation/ui/conf/UiInitializer.java
@@ -86,7 +86,7 @@ public class UiInitializer {
     }
 
     @EventListener(ContextRefreshedEvent.class)
-    public void updateUsers() throws RuntimeException, IOException, CipherUtilException {
+    public void updateAdminUser() throws RuntimeException, IOException, CipherUtilException {
         User admin = null;
         List<User> users = userService.findAllActive();
         for (User user : users) {
@@ -97,20 +97,11 @@ public class UiInitializer {
         if (admin == null) {
             throw new RuntimeException("Admin user does not exist");
         }
-        admin.setLoginPwd(CipherUtil.encryptPKC(System.getenv("UI_ADMIN_PASSWORD"), System.getenv("ENCRYPTION_KEY")));
-        userService.saveUser(admin);
-        User akraino = null;
-        for (User user : users) {
-            if (user.getLoginId().equals("akraino")) {
-                akraino = user;
-            }
-        }
-        if (akraino == null) {
-            throw new RuntimeException("Akraino user does not exist");
+        if (admin.getLoginPwd().equals("admin_password")) {
+            admin.setLoginPwd(
+                    CipherUtil.encryptPKC(System.getenv("UI_ADMIN_PASSWORD"), System.getenv("ENCRYPTION_KEY")));
+            userService.saveUser(admin);
         }
-        akraino.setLoginPwd(
-                CipherUtil.encryptPKC(System.getenv("UI_AKRAINO_PASSWORD"), System.getenv("ENCRYPTION_KEY")));
-        userService.saveUser(akraino);
     }
 
 }