Create Admin Password for Admin User (#15191)

(cherry picked from commit 3e3c067)
open-metadata · Feb 27, 2024 · c697ac4 · c697ac4
1 parent cb7237e
commit c697ac4
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/util/UserUtil.java b/openmetadata-service/src/main/java/org/openmetadata/service/util/UserUtil.java
@@ -80,7 +80,7 @@ private static void createOrUpdateUser(
         if (authProvider.equals(AuthProvider.BASIC)) {
           if (originalUser.getAuthenticationMechanism() == null
               || originalUser.getAuthenticationMechanism().equals(new AuthenticationMechanism())) {
-            String randomPwd = getPassword();
+            String randomPwd = getPassword(username);
             updateUserWithHashedPwd(updatedUser, randomPwd);
             EmailUtil.sendInviteMailToAdmin(updatedUser, randomPwd);
           }
@@ -105,7 +105,7 @@ private static void createOrUpdateUser(
       updatedUser = user(username, domain, username).withIsAdmin(isAdmin).withIsEmailVerified(true);
       // Update Auth Mechanism if not present, and send mail to the user
       if (authProvider.equals(AuthProvider.BASIC)) {
-        String randomPwd = getPassword();
+        String randomPwd = getPassword(username);
         updateUserWithHashedPwd(updatedUser, randomPwd);
         EmailUtil.sendInviteMailToAdmin(updatedUser, randomPwd);
       }
@@ -117,9 +117,10 @@ private static void createOrUpdateUser(
     }
   }
 
-  private static String getPassword() {
+  private static String getPassword(String username) {
     try {
-      if (Boolean.FALSE.equals(EmailUtil.getSmtpSettings().getEnableSmtpServer())) {
+      if (Boolean.TRUE.equals(EmailUtil.getSmtpSettings().getEnableSmtpServer())
+          && !ADMIN_USER_NAME.equals(username)) {
         EmailUtil.testConnection();
         return PasswordUtil.generateRandomPassword();
       }