feat: more role backend and admin/writer roles additions and adjustments
This commit is contained in:
1 parent
8c6c6456da
commit
de142f6c5f
131 files changed
+2663
-435
No files matched your search
@@ -23,15 +23,15 @@ var legacyBuiltInNames = map[user.Role]string{
|
||||
user.RoleAdmin: role.AdminName,
|
||||
}
|
||||
|
||||
func (u *GetMyAccessUseCase) resolveRole(account user.User) (role.Role, error) {
|
||||
func resolveRole(roles role.Repository, account user.User) (role.Role, error) {
|
||||
if account.RoleID != 0 {
|
||||
return u.roles.Get(account.RoleID)
|
||||
return roles.Get(account.RoleID)
|
||||
}
|
||||
name, known := legacyBuiltInNames[account.Role]
|
||||
if !known {
|
||||
return role.Role{}, role.ErrRoleNotFound
|
||||
}
|
||||
found, err := u.roles.GetByName(name)
|
||||
found, err := roles.GetByName(name)
|
||||
if err != nil {
|
||||
return role.Role{}, err
|
||||
}
|
||||
@@ -42,7 +42,7 @@ func (u *GetMyAccessUseCase) resolveRole(account user.User) (role.Role, error) {
|
||||
}
|
||||
|
||||
func (u *GetMyAccessUseCase) Get(account user.User) (Access, error) {
|
||||
resolved, err := u.resolveRole(account)
|
||||
resolved, err := resolveRole(u.roles, account)
|
||||
if err != nil {
|
||||
return Access{}, err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user