Merge branch 'master' of https://github.com/cloudforet-io/python-core

Author: Jongmin Kim

src/spaceone/core/handler/authentication_handler.py

@@ -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
@@ -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)
 
@@ -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}")
@@ -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)

src/spaceone/core/pygrpc/client.py

@@ -2,7 +2,7 @@
 import types
 import grpc
 from google.protobuf.json_format import ParseDict
-from google.protobuf.message_factory import MessageFactory, GetMessageClass
+from google.protobuf.message_factory import MessageFactory #, GetMessageClass
 from google.protobuf.descriptor_pool import DescriptorPool
 from google.protobuf.descriptor import ServiceDescriptor, MethodDescriptor
 from grpc_reflection.v1alpha.proto_reflection_descriptor_database import (
@@ -207,14 +207,14 @@ def _bind_grpc_method(
         request_desc = self._desc_pool.FindMessageTypeByName(
             method_desc.input_type.full_name
         )
-        # request_message_desc = MessageFactory(self._desc_pool).GetPrototype(request_desc)
-        request_message_desc = GetMessageClass(request_desc)
+        request_message_desc = MessageFactory(self._desc_pool).GetPrototype(request_desc)
+        # request_message_desc = GetMessageClass(request_desc)
 
         response_desc = self._desc_pool.FindMessageTypeByName(
             method_desc.output_type.full_name
         )
-        # response_message_desc = MessageFactory(self._desc_pool).GetPrototype(response_desc)
-        response_message_desc = GetMessageClass(response_desc)
+        response_message_desc = MessageFactory(self._desc_pool).GetPrototype(response_desc)
+        # response_message_desc = GetMessageClass(response_desc)
 
         if method_desc.client_streaming and method_desc.server_streaming:
             setattr(
@@ -286,8 +286,8 @@ def _init_grpc_reflection(self):
                 request_desc = self._desc_pool.FindMessageTypeByName(
                     method_desc.input_type.full_name
                 )
-                # self._request_map[method_key] = MessageFactory(self._desc_pool).GetPrototype(request_desc)
-                self._request_map[method_key] = GetMessageClass(request_desc)
+                self._request_map[method_key] = MessageFactory(self._desc_pool).GetPrototype(request_desc)
+                # self._request_map[method_key] = GetMessageClass(request_desc)
 
                 if service_desc.name not in self._api_resources:
                     self._api_resources[service_name] = []