diff --git a/src/main/java/ru/soune/nocopy/adminpanel/dto/AdminUserResponse.java b/src/main/java/ru/soune/nocopy/adminpanel/dto/AdminUserResponse.java index a155fa8..a0061d1 100644 --- a/src/main/java/ru/soune/nocopy/adminpanel/dto/AdminUserResponse.java +++ b/src/main/java/ru/soune/nocopy/adminpanel/dto/AdminUserResponse.java @@ -27,6 +27,9 @@ public class AdminUserResponse { @JsonProperty("created_at") private String createdAt; + @JsonProperty("active_password") + private Boolean activePassword; + private Map permissions; } diff --git a/src/main/java/ru/soune/nocopy/adminpanel/entity/AdminUser.java b/src/main/java/ru/soune/nocopy/adminpanel/entity/AdminUser.java index 0d99281..cde4803 100644 --- a/src/main/java/ru/soune/nocopy/adminpanel/entity/AdminUser.java +++ b/src/main/java/ru/soune/nocopy/adminpanel/entity/AdminUser.java @@ -53,6 +53,9 @@ public class AdminUser { @Column(name = "is_super_admin", nullable = false) private Boolean isSuperAdmin = false; + @Column(name = "active_password", nullable = false) + private Boolean isActivePassword = false; + @Column(name = "permissions", nullable = false) private Long permissions = AdminPermission.DEFAULT_PERMISSIONS; diff --git a/src/main/java/ru/soune/nocopy/adminpanel/handler/AdminUserHandler.java b/src/main/java/ru/soune/nocopy/adminpanel/handler/AdminUserHandler.java index fe744fa..2090d92 100644 --- a/src/main/java/ru/soune/nocopy/adminpanel/handler/AdminUserHandler.java +++ b/src/main/java/ru/soune/nocopy/adminpanel/handler/AdminUserHandler.java @@ -480,6 +480,7 @@ public class AdminUserHandler implements RequestHandler { .isSuperAdmin(AdminPermission.isSuperAdmin(admin.getPermissions())) .createdAt(admin.getCreatedAt().toString()) .permissions(permissionsMap) + .activePassword(admin.getIsActivePassword()) .build(); } } diff --git a/src/main/java/ru/soune/nocopy/adminpanel/service/AdminUserService.java b/src/main/java/ru/soune/nocopy/adminpanel/service/AdminUserService.java index 8330815..0bb0c90 100644 --- a/src/main/java/ru/soune/nocopy/adminpanel/service/AdminUserService.java +++ b/src/main/java/ru/soune/nocopy/adminpanel/service/AdminUserService.java @@ -33,6 +33,7 @@ public class AdminUserService { admin.setPassword(passwordEncoder.encode(password)); admin.setCreatedAt(LocalDateTime.now()); admin.setIsActive(true); + admin.setIsActivePassword(superAdmin); admin.setPermissions(superAdmin ? AdminPermission.SUPER_ADMIN_PERMISSIONS : AdminPermission.DEFAULT_PERMISSIONS); return adminUserRepository.save(admin);