Merge pull request #110 from stat-kwon/master

fix: apply get token type by using JWTUtil

src/spaceone/monitoring/manager/identity_manager.py

@@ -1,5 +1,6 @@
 import logging
 
+from spaceone.core.auth.jwt.jwt_util import JWTUtil
 from spaceone.core.connector.space_connector import SpaceConnector
 from spaceone.core.manager import BaseManager
 
@@ -9,10 +10,11 @@
 class IdentityManager(BaseManager):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        token = self.transaction.get_meta("token")
+        self.token_type = self.token_type = JWTUtil.get_value_from_token(token, "typ")
         self.identity_connector: SpaceConnector = self.locator.get_connector(
             "SpaceConnector", service="identity"
         )
-        self.token_type = self.transaction.get_meta("authorization.token_type")
 
     def get_domain(self, domain_id: str) -> dict:
         if self.token_type == "SYSTEM_TOKEN":

src/spaceone/monitoring/manager/notification_manager.py

@@ -1,5 +1,6 @@
 import logging
 
+from spaceone.core.auth.jwt.jwt_util import JWTUtil
 from spaceone.core.connector.space_connector import SpaceConnector
 from spaceone.core.manager import BaseManager
 
@@ -9,10 +10,11 @@
 class NotificationManager(BaseManager):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        token = self.transaction.get_meta("token")
+        self.token_type = JWTUtil.get_value_from_token(token, "typ")
         self.notification_connector: SpaceConnector = self.locator.get_connector(
             "SpaceConnector", service="notification"
         )
-        self.token_type = self.transaction.get_meta("authorization.token_type")
 
     def create_notification(self, message: dict, domain_id: str) -> dict:
         _LOGGER.debug(f"Notify message: {message}")