Feat: service token v2 support (#174)

* feat: removed header capitalization logic * feat: updated token header construction --------- Co-authored-by: Rohan Chaturvedi <[email protected]>
phasehq · Oct 28, 2024 · de919d2 · de919d2
1 parent 82a7036
commit de919d2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/phase_cli/utils/network.py b/phase_cli/utils/network.py
@@ -87,7 +87,7 @@ def construct_http_headers(token_type: str, app_token: str) -> Dict[str, str]:
         Dict[str, str]: The common headers including User-Agent.
     """
     return {
-        "Authorization": f"Bearer {token_type.capitalize()} {app_token}",
+        "Authorization": f"Bearer {token_type} {app_token}",
         "User-Agent": get_user_agent()
     }
 

diff --git a/phase_cli/utils/phase_io.py b/phase_cli/utils/phase_io.py
@@ -64,11 +64,16 @@ def __init__(self, init=True, pss=None, host=None):
             token_type = "service token" if "pss_service" in app_secret else "user token"
             raise ValueError(f"Invalid Phase {token_type}")
 
-        # Storing the token type as a string for easier access
-        self._token_type = "service" if self.is_service_token else "user"
-
+        # Store token segments
         pss_segments = app_secret.split(':')
         self._app_secret = AppSecret(*pss_segments)
+
+        # If type service_token && version == 2; set token header as ServiceAccount
+        if self.is_service_token and self._app_secret.pes_version == "v2":
+            self._token_type = "ServiceAccount"
+        # Else decide between User token or legacy service token header 
+        else:
+            self._token_type = "Service" if self.is_service_token else "User"
 
 
     def _find_matching_environment_key(self, user_data, env_id):