Skip to content
Merged
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
9 changes: 6 additions & 3 deletions src/spaceone/core/handler/authentication_handler.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import logging
from typing import Tuple, List

from spaceone.core import cache, config
from spaceone.core.connector.space_connector import SpaceConnector
Expand Down Expand Up @@ -37,7 +38,9 @@ def verify(self, params: dict) -> None:
if owner_type == "APP":
client_id = token_info.get("jti")
domain_id = token_info.get("did")
token_info["permissions"] = self._check_app(client_id, domain_id)
permissions, projects = self._check_app(client_id, domain_id)
token_info["permissions"] = permissions
token_info["projects"] = projects

self._update_meta(token_info)

Expand All @@ -55,7 +58,7 @@ def _get_public_key(self, domain_id: str) -> str:
@cache.cacheable(
key="handler:authentication:{domain_id}:client:{client_id}", alias="local"
)
def _check_app(self, client_id, domain_id) -> list:
def _check_app(self, client_id: str, domain_id: str) -> Tuple[List[str], List[str]]:
system_token = config.get_global("TOKEN")

_LOGGER.debug(f"[_check_app] check app from identity service: {client_id}")
Expand All @@ -68,7 +71,7 @@ def _check_app(self, client_id, domain_id) -> list:
token=system_token,
)

return response.get("permissions", [])
return response.get("permissions", []), response.get("projects", [])

def _authenticate(self, token: str, domain_id: str) -> dict:
public_key = self._get_public_key(domain_id)
Expand Down