diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java index 51142672c843..a2444c5ac74e 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/User.java @@ -20,7 +20,6 @@ import java.time.Instant; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -69,18 +68,6 @@ public class User extends BaseDomain implements UserDetails, OidcUser { @JsonView(Views.Public.class) private String examplesWorkspaceId; - // There is a many-to-many relationship with groups. If this value is modified, please also modify the list of - // users in that particular group document as well. - @JsonView(Views.Public.class) - private Set groupIds = new HashSet<>(); - - // These permissions are in addition to the privileges provided by the groupIds. We can assign individual - // permissions - // to users instead of creating a group for them. To be used only for one-off permissions. - // During evaluation a union of the group permissions and user-specific permissions will take effect. - @JsonView(Views.Public.class) - private Set permissions = new HashSet<>(); - // This field is used when a user is invited to appsmith. This inviteToken is used to confirm the identity in verify // token flow. @JsonView(Views.Internal.class) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UsagePulseServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UsagePulseServiceCEImpl.java index d4787cbaf8dc..1d15be8c9007 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UsagePulseServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UsagePulseServiceCEImpl.java @@ -92,10 +92,8 @@ public Mono createPulse(UsagePulseDTO usagePulseDTO) { } usagePulse.setUser(hashedEmail); updateUser.setLastActiveAt(Instant.now()); - // Avoid updating the ACL fields - updateUser.setGroupIds(null); + // Avoid updating policies updateUser.setPolicies(null); - updateUser.setPermissions(null); return userService.updateWithoutPermission(user.getId(), updateUser).then(save(usagePulse)); });