Skip to content

Commit

Permalink
Merge pull request #133 from whdalsrnt/master
Browse files Browse the repository at this point in the history
fix: fix permission issue
  • Loading branch information
whdalsrnt authored Jul 22, 2024
2 parents 99610e9 + 8f09872 commit 59b7a0d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
17 changes: 8 additions & 9 deletions src/spaceone/monitoring/manager/identity_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ def get_domain_from_system(self, domain_id: str) -> dict:
"Domain.get", {"domain_id": domain_id}, token=system_token
)

def get_user(self, user_id: str, domain_id) -> dict:
if self.token_type == "SYSTEM_TOKEN":
return self.identity_connector.dispatch(
"User.get",
{"user_id": user_id},
x_domain_id=domain_id,
)
else:
return self.identity_connector.dispatch("User.get", {"user_id": user_id})
def get_user_from_system(self, user_id: str, domain_id: str) -> dict:
system_token = config.get_global("TOKEN")
return self.identity_connector.dispatch(
"User.get",
{"user_id": user_id},
x_domain_id=domain_id,
token=system_token,
)

def get_workspace_user(self, user_id: str):
return self.identity_connector.dispatch(
Expand Down
2 changes: 1 addition & 1 deletion src/spaceone/monitoring/service/job_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ def _get_triggered_by_name(self, triggered_by, domain_id):
def _get_user_name(self, user_id: str, domain_id: str) -> str:
try:
identity_mgr: IdentityManager = self.locator.get_manager("IdentityManager")
user_info = identity_mgr.get_user(user_id, domain_id)
user_info = identity_mgr.get_user_from_system(user_id, domain_id)

if len(user_info.get("name", "").strip()) == 0:
return user_info["user_id"]
Expand Down

0 comments on commit 59b7a0d

Please sign in to comment.