Skip to content

fix: fix user update required actions process #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkdy21 merged 1 commit into from
Sep 4, 2025
Merged

fix: fix user update required actions process #493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions src/spaceone/identity/service/user_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,10 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
user_vo = self.user_mgr.get_user(params.user_id, params.domain_id)
auth_type = user_vo.auth_type
domain_id = params.domain_id
required_actions = user_vo.required_actions

update_user_vo = {}
update_require_actions = set(user_vo.required_actions)
update_require_actions = set(required_actions)

if params.reset_password:
domain_name = self._get_domain_name(domain_id)
Expand Down Expand Up @@ -266,16 +267,19 @@ def update(self, params: UserUpdateRequest) -> Union[UserResponse, dict]:
)
)

update_user_vo["required_actions"] = list(update_require_actions)

general_params = params.dict(
exclude_unset=True, exclude={"reset_password", "mfa"}
exclude_unset=True,
exclude={"reset_password", "enforce_mfa_state", "enforce_mfa_type"},
)
update_user_vo.update(general_params)
update_user_vo["required_actions"] = list(update_require_actions)

user_vo = self.user_mgr.update_user_by_vo(update_user_vo, user_vo)

if update_require_actions != (set(required_actions)):
user_vo = self.user_mgr.update_user_by_vo(
{"required_actions": list(update_require_actions)}, user_vo
)

return UserResponse(**user_vo.to_dict())

@transaction(permission="identity:User.write", role_types=["DOMAIN_ADMIN"])
Expand Down
Loading