RyZ commited on
Commit
bd43fe2
·
1 Parent(s): ba5de78

fix: move registration_enabled from admin to auth

Browse files
controllers/admin_controller.go CHANGED
@@ -14,7 +14,6 @@ type AdminController interface {
14
  CreateUser(ctx *gin.Context)
15
  UpdateUser(ctx *gin.Context)
16
  DeleteUser(ctx *gin.Context)
17
- RegisterEnabled(ctx *gin.Context)
18
  SetRegistrationEnabled(ctx *gin.Context)
19
  }
20
 
@@ -112,19 +111,6 @@ func (c *adminController) DeleteUser(ctx *gin.Context) {
112
  utils.SendResponse[any, any](ctx, nil, nil, nil)
113
  }
114
 
115
- // RegisterEnabled godoc
116
- // @Summary Check if registration is enabled
117
- // @Description Check if user registration is enabled
118
- // @Tags admin
119
- // @Security BearerAuth
120
- // @Success 200 {object} dto.RegisterEnabledResponse
121
- // @Router /admin/register_enabled [get]
122
- func (c *adminController) RegisterEnabled(ctx *gin.Context) {
123
- utils.SendResponse[dto.RegisterEnabledResponse, any](ctx, nil, dto.RegisterEnabledResponse{
124
- Register: c.adminService.IsRegisterEnabled(),
125
- }, nil)
126
- }
127
-
128
  // SetRegistrationEnabled godoc
129
  // @Summary Toggle registration enabled
130
  // @Description Enable or disable user registration
 
14
  CreateUser(ctx *gin.Context)
15
  UpdateUser(ctx *gin.Context)
16
  DeleteUser(ctx *gin.Context)
 
17
  SetRegistrationEnabled(ctx *gin.Context)
18
  }
19
 
 
111
  utils.SendResponse[any, any](ctx, nil, nil, nil)
112
  }
113
 
 
 
 
 
 
 
 
 
 
 
 
 
 
114
  // SetRegistrationEnabled godoc
115
  // @Summary Toggle registration enabled
116
  // @Description Enable or disable user registration
controllers/auth_controller.go CHANGED
@@ -19,6 +19,7 @@ type AuthController interface {
19
  RefreshToken(ctx *gin.Context)
20
  Me(ctx *gin.Context)
21
  AssignRole(ctx *gin.Context)
 
22
  }
23
 
24
  type authController struct {
@@ -200,3 +201,16 @@ func (c *authController) AssignRole(ctx *gin.Context) {
200
  }
201
  utils.SendResponse[any, any](ctx, nil, nil, nil)
202
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
  RefreshToken(ctx *gin.Context)
20
  Me(ctx *gin.Context)
21
  AssignRole(ctx *gin.Context)
22
+ RegisterEnabled(ctx *gin.Context)
23
  }
24
 
25
  type authController struct {
 
201
  }
202
  utils.SendResponse[any, any](ctx, nil, nil, nil)
203
  }
204
+
205
+ // RegisterEnabled godoc
206
+ // @Summary Check if registration is enabled
207
+ // @Description Check if user registration is enabled
208
+ // @Tags auth
209
+ // @Security BearerAuth
210
+ // @Success 200 {object} dto.RegisterEnabledResponse
211
+ // @Router /auth/register_enabled [get]
212
+ func (c *authController) RegisterEnabled(ctx *gin.Context) {
213
+ utils.SendResponse[dto.RegisterEnabledResponse, any](ctx, nil, dto.RegisterEnabledResponse{
214
+ Register: c.authService.IsRegisterEnabled(),
215
+ }, nil)
216
+ }
router/admin_router.go CHANGED
@@ -18,7 +18,6 @@ func AdminRouter(router *gin.Engine, controller provider.ControllerProvider, mid
18
  routerGroup.POST("/create", adminController.CreateUser)
19
  routerGroup.POST("/update", adminController.UpdateUser)
20
  routerGroup.POST("/delete", adminController.DeleteUser)
21
- routerGroup.GET("/register_enabled", adminController.RegisterEnabled)
22
  routerGroup.POST("/set_registration", adminController.SetRegistrationEnabled)
23
  }
24
  }
 
18
  routerGroup.POST("/create", adminController.CreateUser)
19
  routerGroup.POST("/update", adminController.UpdateUser)
20
  routerGroup.POST("/delete", adminController.DeleteUser)
 
21
  routerGroup.POST("/set_registration", adminController.SetRegistrationEnabled)
22
  }
23
  }
router/auth_router.go CHANGED
@@ -19,5 +19,6 @@ func AuthRouter(router *gin.Engine, controller provider.ControllerProvider, midd
19
  routerGroup.POST("/refresh", authController.RefreshToken)
20
  routerGroup.GET("/me", middleware.ProvideAuthMiddleware().RequireAuth(), authController.Me)
21
  routerGroup.POST("/assign", middleware.ProvideAuthMiddleware().RequireAuth(), middleware.ProvideAuthMiddleware().RequireRole(models.RoleSuperAdmin), authController.AssignRole)
 
22
  }
23
  }
 
19
  routerGroup.POST("/refresh", authController.RefreshToken)
20
  routerGroup.GET("/me", middleware.ProvideAuthMiddleware().RequireAuth(), authController.Me)
21
  routerGroup.POST("/assign", middleware.ProvideAuthMiddleware().RequireAuth(), middleware.ProvideAuthMiddleware().RequireRole(models.RoleSuperAdmin), authController.AssignRole)
22
+ routerGroup.GET("/register_enabled", authController.RegisterEnabled)
23
  }
24
  }
services/admin_service.go CHANGED
@@ -15,7 +15,6 @@ type AdminService interface {
15
  CreateUser(req dto.CreateUserRequest) (*dto.UserResponse, error)
16
  UpdateUser(req dto.UpdateUserRequest) (*dto.UserResponse, error)
17
  DeleteUser(userID uuid.UUID) error
18
- IsRegisterEnabled() bool
19
  SetRegistrationEnabled(enabled bool) error
20
  }
21
 
@@ -94,14 +93,6 @@ func (s *adminService) DeleteUser(userID uuid.UUID) error {
94
  return s.authRepo.DeleteUser(userID)
95
  }
96
 
97
- func (s *adminService) IsRegisterEnabled() bool {
98
- settings, _ := s.authRepo.GetSettings()
99
- if settings == nil {
100
- return true
101
- }
102
- return settings.RegistrationEnabled
103
- }
104
-
105
  func (s *adminService) SetRegistrationEnabled(enabled bool) error {
106
  return s.authRepo.SetRegistrationEnabled(enabled)
107
  }
 
15
  CreateUser(req dto.CreateUserRequest) (*dto.UserResponse, error)
16
  UpdateUser(req dto.UpdateUserRequest) (*dto.UserResponse, error)
17
  DeleteUser(userID uuid.UUID) error
 
18
  SetRegistrationEnabled(enabled bool) error
19
  }
20
 
 
93
  return s.authRepo.DeleteUser(userID)
94
  }
95
 
 
 
 
 
 
 
 
 
96
  func (s *adminService) SetRegistrationEnabled(enabled bool) error {
97
  return s.authRepo.SetRegistrationEnabled(enabled)
98
  }
services/auth_service.go CHANGED
@@ -20,6 +20,7 @@ type AuthService interface {
20
  Logout(token, refreshToken string) error
21
  RefreshToken(refreshToken string) (string, string, error)
22
  AssignRole(userID uuid.UUID, role string) error
 
23
  }
24
 
25
  type authService struct {
@@ -201,3 +202,11 @@ func (s *authService) AssignRole(userID uuid.UUID, role string) error {
201
  user.Role = role
202
  return s.authRepo.UpdateUser(user)
203
  }
 
 
 
 
 
 
 
 
 
20
  Logout(token, refreshToken string) error
21
  RefreshToken(refreshToken string) (string, string, error)
22
  AssignRole(userID uuid.UUID, role string) error
23
+ IsRegisterEnabled() bool
24
  }
25
 
26
  type authService struct {
 
202
  user.Role = role
203
  return s.authRepo.UpdateUser(user)
204
  }
205
+
206
+ func (s *authService) IsRegisterEnabled() bool {
207
+ settings, _ := s.authRepo.GetSettings()
208
+ if settings == nil {
209
+ return true
210
+ }
211
+ return settings.RegistrationEnabled
212
+ }