dev #1

Open
backdev wants to merge 47 commits from dev into main
4 changed files with 8 additions and 0 deletions
Showing only changes of commit 69271594cd - Show all commits
@@ -27,6 +27,9 @@ public class AdminUserResponse {
@JsonProperty("created_at") @JsonProperty("created_at")
private String createdAt; private String createdAt;
@JsonProperty("active_password")
private Boolean activePassword;
private Map<String, Integer> permissions; private Map<String, Integer> permissions;
} }
@@ -53,6 +53,9 @@ public class AdminUser {
@Column(name = "is_super_admin", nullable = false) @Column(name = "is_super_admin", nullable = false)
private Boolean isSuperAdmin = false; private Boolean isSuperAdmin = false;
@Column(name = "active_password", nullable = false)
private Boolean isActivePassword = false;
@Column(name = "permissions", nullable = false) @Column(name = "permissions", nullable = false)
private Long permissions = AdminPermission.DEFAULT_PERMISSIONS; private Long permissions = AdminPermission.DEFAULT_PERMISSIONS;
@@ -480,6 +480,7 @@ public class AdminUserHandler implements RequestHandler {
.isSuperAdmin(AdminPermission.isSuperAdmin(admin.getPermissions())) .isSuperAdmin(AdminPermission.isSuperAdmin(admin.getPermissions()))
.createdAt(admin.getCreatedAt().toString()) .createdAt(admin.getCreatedAt().toString())
.permissions(permissionsMap) .permissions(permissionsMap)
.activePassword(admin.getIsActivePassword())
.build(); .build();
} }
} }
@@ -33,6 +33,7 @@ public class AdminUserService {
admin.setPassword(passwordEncoder.encode(password)); admin.setPassword(passwordEncoder.encode(password));
admin.setCreatedAt(LocalDateTime.now()); admin.setCreatedAt(LocalDateTime.now());
admin.setIsActive(true); admin.setIsActive(true);
admin.setIsActivePassword(superAdmin);
admin.setPermissions(superAdmin ? AdminPermission.SUPER_ADMIN_PERMISSIONS : AdminPermission.DEFAULT_PERMISSIONS); admin.setPermissions(superAdmin ? AdminPermission.SUPER_ADMIN_PERMISSIONS : AdminPermission.DEFAULT_PERMISSIONS);
return adminUserRepository.save(admin); return adminUserRepository.save(admin);