new features
This commit is contained in:
@@ -31,7 +31,7 @@ func (s *Service) Register(ctx context.Context, input models.UserRegisterInput)
|
||||
return nil, models.ErrInternal
|
||||
}
|
||||
|
||||
return s.users.CreateUser(ctx, models.User{
|
||||
user, err := s.users.CreateUser(ctx, models.User{
|
||||
Email: input.Email,
|
||||
PasswordHash: string(hash),
|
||||
FirstName: input.FirstName,
|
||||
@@ -39,6 +39,23 @@ func (s *Service) Register(ctx context.Context, input models.UserRegisterInput)
|
||||
BirthDate: input.BirthDate,
|
||||
Sex: input.Sex,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
count, err := s.users.CountUsers(ctx)
|
||||
if err != nil {
|
||||
return nil, models.ErrInternal
|
||||
}
|
||||
if count == 1 {
|
||||
position, err := s.positions.GetPositionByCode(ctx, "kotosoft_id_staff")
|
||||
if err == nil {
|
||||
now := time.Now()
|
||||
_ = s.positions.AssignPosition(ctx, user.ID, position.ID, nil, now, nil)
|
||||
}
|
||||
}
|
||||
|
||||
return user, nil
|
||||
}
|
||||
|
||||
func (s *Service) ValidateAccessToken(ctx context.Context, token string) (*TokenInfo, error) {
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func (s *Service) GetAllPermissions(ctx context.Context) ([]models.Permission, error) {
|
||||
return s.positions.GetAllPermissions(ctx)
|
||||
return s.positions.GetAllPermissions(ctx, "en")
|
||||
}
|
||||
|
||||
func (s *Service) AddPermissionToPosition(ctx context.Context, positionCode, permissionCode string) error {
|
||||
@@ -54,6 +54,13 @@ func (s *Service) GetAllPositions(ctx context.Context, locale string) ([]models.
|
||||
return s.positions.GetAllPositions(ctx, locale)
|
||||
}
|
||||
|
||||
func (s *Service) GetUsersWithPositions(ctx context.Context, locale string) ([]models.UserWithPositions, error) {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.GetUsersWithPositions(ctx, locale)
|
||||
}
|
||||
|
||||
func (s *Service) UpsertPositionForLocale(ctx context.Context, code, locale, name string, description *string) error {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
@@ -76,7 +83,7 @@ func (s *Service) AssignPosition(ctx context.Context, adminID, targetUserID uuid
|
||||
validFrom = time.Now()
|
||||
}
|
||||
|
||||
return s.positions.AssignPosition(ctx, targetUserID, position.ID, &adminID, validFrom, (*interface{})(nil))
|
||||
return s.positions.AssignPosition(ctx, targetUserID, position.ID, &adminID, validFrom, input.ValidTo)
|
||||
}
|
||||
|
||||
func (s *Service) RevokePosition(ctx context.Context, targetUserID uuid.UUID, positionCode string) error {
|
||||
@@ -85,15 +92,32 @@ func (s *Service) RevokePosition(ctx context.Context, targetUserID uuid.UUID, po
|
||||
return models.ErrNotFound
|
||||
}
|
||||
|
||||
if position.Code == "kotosoft_id_staff" {
|
||||
return models.ErrForbidden
|
||||
}
|
||||
|
||||
return s.positions.RevokePosition(ctx, targetUserID, position.ID)
|
||||
}
|
||||
|
||||
func (s *Service) CreatePermission(ctx context.Context, code string, description *string) error {
|
||||
return s.positions.CreatePermission(ctx, code, description)
|
||||
func (s *Service) GetAllPermissionsForLocale(ctx context.Context, locale string) ([]models.Permission, error) {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.GetAllPermissions(ctx, locale)
|
||||
}
|
||||
|
||||
func (s *Service) UpdatePermission(ctx context.Context, code string, description *string) error {
|
||||
return s.positions.UpdatePermission(ctx, code, description)
|
||||
func (s *Service) CreatePermission(ctx context.Context, code, locale string, description *string) error {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.CreatePermission(ctx, code, locale, description)
|
||||
}
|
||||
|
||||
func (s *Service) UpdatePermission(ctx context.Context, code, locale string, description *string) error {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.UpdatePermission(ctx, code, locale, description)
|
||||
}
|
||||
|
||||
func (s *Service) DeletePermission(ctx context.Context, code string) error {
|
||||
@@ -132,7 +156,7 @@ func (s *Service) IntrospectToken(ctx context.Context, token string) (*Introspec
|
||||
positions = []models.PositionLocalized{}
|
||||
}
|
||||
|
||||
allPerms, err := s.positions.GetUserPermissions(ctx, user.ID)
|
||||
allPerms, err := s.positions.GetUserPermissions(ctx, user.ID, "en")
|
||||
if err != nil {
|
||||
return &IntrospectResponse{Active: false}, nil
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ type UserRepo interface {
|
||||
GetUserByEmail(ctx context.Context, email string) (*models.User, error)
|
||||
GetUserByID(ctx context.Context, id uuid.UUID) (*models.User, error)
|
||||
IsUserExistsByEmail(ctx context.Context, email string) bool
|
||||
CountUsers(ctx context.Context) (int, error)
|
||||
}
|
||||
|
||||
type OAuthRepo interface {
|
||||
@@ -47,25 +48,26 @@ type OAuthRepo interface {
|
||||
}
|
||||
|
||||
type PositionRepo interface {
|
||||
GetAllPermissions(ctx context.Context) ([]models.Permission, error)
|
||||
GetAllPermissions(ctx context.Context, locale string) ([]models.Permission, error)
|
||||
GetPermissionByCode(ctx context.Context, code string) (*models.Permission, error)
|
||||
GetPositionPermissions(ctx context.Context, positionID uuid.UUID) ([]models.Permission, error)
|
||||
GetPositionPermissions(ctx context.Context, positionID uuid.UUID, locale string) ([]models.Permission, error)
|
||||
AddPermissionToPosition(ctx context.Context, positionID, permissionID uuid.UUID) error
|
||||
RemovePermissionFromPosition(ctx context.Context, positionID, permissionID uuid.UUID) error
|
||||
|
||||
GetPositionByCode(ctx context.Context, code string) (*models.Position, error)
|
||||
GetUserPositions(ctx context.Context, userID uuid.UUID, locale string) ([]models.PositionLocalized, error)
|
||||
GetAllPositions(ctx context.Context, locale string) ([]models.PositionLocalized, error)
|
||||
GetUsersWithPositions(ctx context.Context, locale string) ([]models.UserWithPositions, error)
|
||||
UpsertPositionForLocale(ctx context.Context, code, locale, name string, description *string) error
|
||||
|
||||
AssignPosition(ctx context.Context, userID, positionID uuid.UUID, assignedBy *uuid.UUID, validFrom any, validTo *any) error
|
||||
AssignPosition(ctx context.Context, userID, positionID uuid.UUID, assignedBy *uuid.UUID, validFrom time.Time, validTo *time.Time) error
|
||||
RevokePosition(ctx context.Context, userID, positionID uuid.UUID) error
|
||||
|
||||
UserHasPermission(ctx context.Context, userID uuid.UUID, permissionCode string) (bool, string, error)
|
||||
GetUserPermissions(ctx context.Context, userID uuid.UUID) ([]models.Permission, error)
|
||||
GetUserPermissions(ctx context.Context, userID uuid.UUID, locale string) ([]models.Permission, error)
|
||||
|
||||
CreatePermission(ctx context.Context, code string, description *string) error
|
||||
UpdatePermission(ctx context.Context, code string, description *string) error
|
||||
CreatePermission(ctx context.Context, code, locale string, description *string) error
|
||||
UpdatePermission(ctx context.Context, code, locale string, description *string) error
|
||||
DeletePositionByCode(ctx context.Context, code string) error
|
||||
DeletePermission(ctx context.Context, code string) error
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user