Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/spaceone/identity/error/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ class ERROR_USER_EXIST_IN_WORKSPACE_GROUP(ERROR_INVALID_ARGUMENT):

class ERROR_SERVICE_ACCOUNT_MANAGER_REGISTERED(ERROR_INVALID_ARGUMENT):
_message = "Not allowed to delete because of registered service account manager. (service_account_id = {service_account_id})"


class ERROR_USER_EMAIL_NOT_VERIFIED(ERROR_INVALID_ARGUMENT):
_message = "User email is not verified. (user_id = {user_id})"
33 changes: 16 additions & 17 deletions src/spaceone/identity/service/service_account_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,20 @@ def create(

if user_id := params.service_account_mgr_id:
# check user_id is valid
self.user_mgr.get_user(user_id=user_id, domain_id=params.domain_id)

rb_vos = self.rb_mgr.filter_role_bindings(
user_id=user_id,
workspace_id=params.workspace_id,
domain_id=params.domain_id,
self._check_service_account_mgr_exist(
user_id, params.domain_id, params.workspace_id
)
if rb_vos.count() == 0:
raise ERROR_NOT_FOUND(key="service_account_mgr_id", value=user_id)

if rb_vos.count() > 0:
project_vo = self.project_mgr.get_project(
params.project_id, params.domain_id, params.workspace_id
)
project_vo = self.project_mgr.get_project(
params.project_id, params.domain_id, params.workspace_id
)

if project_vo.project_type == "PRIVATE":
project_users = project_vo.users or []
users = list(set(project_users + [params.service_account_mgr_id]))
add_member_params = {"users": users}
self.project_mgr.update_project_by_vo(add_member_params, project_vo)
if project_vo.project_type == "PRIVATE":
project_users = project_vo.users or []
users = list(set(project_users + [params.service_account_mgr_id]))
add_member_params = {"users": users}
self.project_mgr.update_project_by_vo(add_member_params, project_vo)

service_account_vo = self.service_account_mgr.create_service_account(
params.dict()
Expand Down Expand Up @@ -636,7 +630,12 @@ def _check_service_account_mgr_exist(
) -> None:

# check user_id is valid
self.user_mgr.get_user(user_id=service_account_mgr_id, domain_id=domain_id)
user_vo = self.user_mgr.get_user(
user_id=service_account_mgr_id, domain_id=domain_id
)

if not user_vo.email_verified:
raise ERROR_USER_EMAIL_NOT_VERIFIED(user_id=user_vo.user_id)

rb_vos = self.rb_mgr.filter_role_bindings(
user_id=service_account_mgr_id,
Expand Down
Loading