Kain344/History_Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPDATE: Project Module
All checks were successful
Build and Release / release (push) Successful in 1m15s
Details

Browse Source
This commit is contained in:
Azen Kain
2026-04-25 14:05:15 +07:00
parent 44a63f29c6
commit ac90236022
71 changed files with 5110 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/services/userService.go
View File

@@ -117,16 +117,16 @@ func (u *userService) ChangeRoleUser(ctx context.Context, userId string, claims
hasModRole := false
for _, r := range newListRole {
if r.Name == constants.USER.String() {
if r.Name == constants.RoleTypeUser.String() {
hasUserRole = true
}
if r.Name == constants.ADMIN.String() {
if r.Name == constants.RoleTypeAdmin.String() {
hasAdminRole = true
}
if r.Name == constants.BANNED.String() {
if r.Name == constants.RoleTypeBanned.String() {
hasBannedRole = true
}
if r.Name == constants.MOD.String() {
if r.Name == constants.RoleTypeMod.String() {
hasModRole = true
}
}
@@ -135,7 +135,7 @@ func (u *userService) ChangeRoleUser(ctx context.Context, userId string, claims
return nil, fiber.NewError(fiber.StatusNotFound, "User must have the USER role")
}
if slices.Contains(claims.Roles, constants.MOD) && !slices.Contains(claims.Roles, constants.ADMIN) {
if slices.Contains(claims.Roles, constants.RoleTypeMod) && !slices.Contains(claims.Roles, constants.RoleTypeAdmin) {
if hasAdminRole {
return nil, fiber.NewError(fiber.StatusForbidden, "MOD cannot assign ADMIN role to any user")
}
@@ -149,7 +149,7 @@ func (u *userService) ChangeRoleUser(ctx context.Context, userId string, claims
}
isTargetAdminOrMod := false
for _, r := range user.Roles {
if r.Name == constants.ADMIN.String() || r.Name == constants.MOD.String() {
if r.Name == constants.RoleTypeAdmin.String() || r.Name == constants.RoleTypeMod.String() {
isTargetAdminOrMod = true
break
}
@@ -159,7 +159,7 @@ func (u *userService) ChangeRoleUser(ctx context.Context, userId string, claims
}
}
if slices.Contains(claims.Roles, constants.ADMIN) {
if slices.Contains(claims.Roles, constants.RoleTypeAdmin) {
if userId == claims.UId && hasBannedRole {
return nil, fiber.NewError(fiber.StatusForbidden, "You can't assign BANNED role to yourself")
}