diff --git a/management/server/permissions/manager.go b/management/server/permissions/manager.go index d12d8d5f6..ebbce5d4a 100644 --- a/management/server/permissions/manager.go +++ b/management/server/permissions/manager.go @@ -21,7 +21,7 @@ type Manager interface { ValidateRoleModuleAccess(ctx context.Context, accountID string, role roles.RolePermissions, module modules.Module, operation operations.Operation) bool ValidateAccountAccess(ctx context.Context, accountID string, user *types.User, allowOwnerAndAdmin bool) error - GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) + GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error) } type managerImpl struct { @@ -99,7 +99,7 @@ func (m *managerImpl) ValidateAccountAccess(ctx context.Context, accountID strin return nil } -func (m *managerImpl) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) { +func (m *managerImpl) GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error) { roleMap, ok := roles.RolesMap[role] if !ok { return roles.Permissions{}, status.NewUserRoleNotFoundError(string(role)) diff --git a/management/server/permissions/manager_mock.go b/management/server/permissions/manager_mock.go index 18cc13c31..fa115d628 100644 --- a/management/server/permissions/manager_mock.go +++ b/management/server/permissions/manager_mock.go @@ -38,19 +38,19 @@ func (m *MockManager) EXPECT() *MockManagerMockRecorder { return m.recorder } -// GetRolePermissions mocks base method. -func (m *MockManager) GetRolePermissions(ctx context.Context, role types.UserRole) (roles.Permissions, error) { +// GetPermissionsByRole mocks base method. +func (m *MockManager) GetPermissionsByRole(ctx context.Context, role types.UserRole) (roles.Permissions, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRolePermissions", ctx, role) + ret := m.ctrl.Call(m, "GetPermissionsByRole", ctx, role) ret0, _ := ret[0].(roles.Permissions) ret1, _ := ret[1].(error) return ret0, ret1 } -// GetRolePermissions indicates an expected call of GetRolePermissions. -func (mr *MockManagerMockRecorder) GetRolePermissions(ctx, role interface{}) *gomock.Call { +// GetPermissionsByRole indicates an expected call of GetPermissionsByRole. +func (mr *MockManagerMockRecorder) GetPermissionsByRole(ctx, role interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRolePermissions", reflect.TypeOf((*MockManager)(nil).GetRolePermissions), ctx, role) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPermissionsByRole", reflect.TypeOf((*MockManager)(nil).GetPermissionsByRole), ctx, role) } // ValidateAccountAccess mocks base method. diff --git a/management/server/user.go b/management/server/user.go index 75889b421..3e6ad1837 100644 --- a/management/server/user.go +++ b/management/server/user.go @@ -1244,7 +1244,7 @@ func (am *DefaultAccountManager) GetCurrentUserInfo(ctx context.Context, account Restricted: user.IsRestrictable() && settings.RegularUsersViewBlocked, } - permissions, err := am.permissionsManager.GetRolePermissions(ctx, user.Role) + permissions, err := am.permissionsManager.GetPermissionsByRole(ctx, user.Role) if err == nil { userWithPermissions.Permissions = permissions }