Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: add roles and groups to userProfileDTO and set the message (#27250)

Browse Source 
fixes: https://github.com/appsmithorg/appsmith/issues/24606
This commit is contained in:
Shubham Saxena 2023-09-28 20:14:07 +05:30 committed by GitHub
parent 43ba519db3
commit e8e6eb0465
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/server/appsmith-server/src/main/java/com/appsmith/server/constants/AccessControlConstants.java Normal file
View File

@ -0,0 +1,5 @@
package com.appsmith.server.constants;
import com.appsmith.server.constants.ce.AccessControlConstantsCE;
public class AccessControlConstants extends AccessControlConstantsCE {}

6
app/server/appsmith-server/src/main/java/com/appsmith/server/constants/ce/AccessControlConstantsCE.java Normal file
View File

@ -0,0 +1,6 @@
package com.appsmith.server.constants.ce;
public class AccessControlConstantsCE {
public static final String UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC =
"Upgrade to business edition to access roles and groups for conditional business logic";
}

5
app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ce/UserProfileCE_DTO.java
View File

@ -3,6 +3,7 @@ package com.appsmith.server.dtos.ce;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
import java.util.Set;
@Data
@ -43,6 +44,10 @@ public class UserProfileCE_DTO {
boolean enableTelemetry = false;
List<String> roles;
List<String> groups;
public boolean isAccountNonExpired() {
return this.isEnabled;
}

16
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserServiceCEImpl.java
View File

@ -88,6 +88,7 @@ import java.util.UUID;
import java.util.regex.Pattern;
import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
import static com.appsmith.server.constants.AccessControlConstants.UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC;
import static com.appsmith.server.helpers.RedirectHelper.DEFAULT_REDIRECT_URL;
import static com.appsmith.server.helpers.ValidationUtils.LOGIN_PASSWORD_MAX_LENGTH;
import static com.appsmith.server.helpers.ValidationUtils.LOGIN_PASSWORD_MIN_LENGTH;
@ -731,7 +732,7 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
userFromDbMono,
userDataService.getForCurrentUser().defaultIfEmpty(new UserData()),
isSuperUserMono)
.map(tuple -> {
.flatMap(tuple -> {
final boolean isUsersEmpty = Boolean.TRUE.equals(tuple.getT1());
final User userFromDb = tuple.getT2();
final UserData userData = tuple.getT3();
@ -755,11 +756,20 @@ public class UserServiceCEImpl extends BaseService<UserRepository, User, String>
commonConfig.isCloudHosting() ? true : userData.isIntercomConsentGiven());
profile.setSuperUser(isSuperUser);
profile.setConfigurable(!StringUtils.isEmpty(commonConfig.getEnvFilePath()));
return profile;
return setRolesAndGroups(profile, userFromDb, true, commonConfig.isCloudHosting());
});
}
protected Mono<UserProfileDTO> setRolesAndGroups(
UserProfileDTO profile, User user, boolean showRolesAndGroups, boolean isCloudHosting) {
profile.setRoles(
List.of(UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC));
profile.setGroups(
List.of(UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC));
return Mono.just(profile);
}
private EmailTokenDTO parseValueFromEncryptedToken(String encryptedToken) {
String decryptString = encryptionService.decryptString(encryptedToken);
List<NameValuePair> nameValuePairs = URLEncodedUtils.parse(decryptString, StandardCharsets.UTF_8);

9
app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserServiceTest.java
View File

@ -60,6 +60,7 @@ import java.util.Set;
import static com.appsmith.server.acl.AclPermission.MANAGE_USERS;
import static com.appsmith.server.acl.AclPermission.RESET_PASSWORD_USERS;
import static com.appsmith.server.constants.AccessControlConstants.UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC;
import static com.appsmith.server.constants.Appsmith.DEFAULT_ORIGIN_HEADER;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
@ -495,6 +496,14 @@ public class UserServiceTest {
.assertNext(userProfileDTO -> {
assertNotNull(userProfileDTO);
assertThat(userProfileDTO.isIntercomConsentGiven()).isTrue();
assertEquals(
List.of(
UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC),
userProfileDTO.getGroups());
assertEquals(
List.of(
UPGRADE_TO_BUSINESS_EDITION_TO_ACCESS_ROLES_AND_GROUPS_FOR_CONDITIONAL_BUSINESS_LOGIC),
userProfileDTO.getRoles());
})
.verifyComplete();
}