#844 | Remove unused password property from Metabase CreateUserRequest

avniproject · Feb 11, 2025 · fe2bc6f · fe2bc6f
1 parent a859b7c
commit fe2bc6f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/metabase/CreateUserRequest.java b/avni-server-api/src/main/java/org/avni/server/domain/metabase/CreateUserRequest.java
@@ -18,15 +18,11 @@ public class CreateUserRequest {
     @JsonProperty("user_group_memberships")
     private final List<UserGroupMemberships> userGroupMemberships;
 
-    @JsonProperty("password")
-    private final String password;
-
-    public CreateUserRequest(String firstName, String lastName, String email, List<UserGroupMemberships> userGroupMemberships, String password) {
+    public CreateUserRequest(String firstName, String lastName, String email, List<UserGroupMemberships> userGroupMemberships) {
         this.firstName = firstName;
         this.lastName = lastName;
         this.email = email;
         this.userGroupMemberships = userGroupMemberships;
-        this.password = password;
     }
 
     public String getFirstName() {
@@ -44,8 +40,4 @@ public String getEmail() {
     public List<UserGroupMemberships> getUserGroupMemberships() {
         return userGroupMemberships;
     }
-
-    public String getPassword() {
-        return password;
-    }
 }
diff --git a/avni-server-api/src/main/java/org/avni/server/web/UserController.java b/avni-server-api/src/main/java/org/avni/server/web/UserController.java
@@ -195,7 +195,7 @@ private void performMetabaseUserUpsert(UserContract userContract, List<UserGroup
                 String[] nameParts = userContract.getName().split(" ", 2);
                 String firstName = nameParts[0];
                 String lastName = (nameParts.length > 1) ? nameParts[1] : null;
-                metabaseUserRepository.save(new CreateUserRequest(firstName, lastName, userContract.getEmail(), metabaseUserRepository.getUserGroupMemberships(), "password"));
+                metabaseUserRepository.save(new CreateUserRequest(firstName, lastName, userContract.getEmail(), metabaseUserRepository.getUserGroupMemberships()));
             } else {
                 if (!metabaseUserRepository.activeUserExists(userContract.getEmail())) {
                     metabaseUserRepository.reactivateMetabaseUser(userContract.getEmail());

diff --git a/avni-server-api/src/main/java/org/avni/server/web/UserGroupController.java b/avni-server-api/src/main/java/org/avni/server/web/UserGroupController.java
@@ -116,13 +116,12 @@ public ResponseEntity addUsersToGroup(@RequestBody List<UserGroupContract> reque
     private void upsertUsersOnMetabase(List<UserGroup> usersToBeAdded) {
         if (groupPermissionsRepository.getCurrentOrganisationGroup() != null) {
             List<UserGroupMemberships> userGroupMemberships = metabaseUserRepository.getUserGroupMemberships();
-
             for (UserGroup value : usersToBeAdded) {
                 if (!metabaseUserRepository.emailExists(value.getUser().getEmail())) {
                     String[] nameParts = value.getUser().getName().split(" ", 2);
                     String firstName = nameParts[0];
                     String lastName = (nameParts.length > 1) ? nameParts[1] : null;
-                    metabaseUserRepository.save(new CreateUserRequest(firstName, lastName, value.getUser().getEmail(), userGroupMemberships, "password"));
+                    metabaseUserRepository.save(new CreateUserRequest(firstName, lastName, value.getUser().getEmail(), userGroupMemberships));
                 } else {
                     if (!metabaseUserRepository.activeUserExists(value.getUser().getEmail())) {
                         metabaseUserRepository.reactivateMetabaseUser(value.getUser().getEmail());