feat: return platform and cat_id in token exchange response

Author: PromiseFru

grpc_services/v3/exchange_oauth2_code.py

@@ -99,6 +99,8 @@ def ExchangeOAuth2CodeAndStore(self, request, context):
             token_id=token.token_id,
             server_ephemeral_public_keys=server_public_keys,
             key_id=kid_index,
+            platform=adapter["name"],
+            cat_id=adapter["cat_id"],
         )
 
     except NotImplementedError as exc:

grpc_services/v3/exchange_pnba_code.py

@@ -91,6 +91,8 @@ def ExchangePNBACodeAndStore(self, request, context):
             return response(
                 success=True,
                 two_step_verification_enabled=True,
+                platform=adapter["name"],
+                cat_id=adapter["cat_id"],
                 message="two-steps verification is enabled and a password is required",
             )
 
@@ -120,6 +122,8 @@ def ExchangePNBACodeAndStore(self, request, context):
             token_id=token.token_id,
             server_ephemeral_public_keys=server_public_keys,
             key_id=kid_index,
+            platform=adapter["name"],
+            cat_id=adapter["cat_id"],
         )
 
     except NotImplementedError as exc:

platforms/adapter_manager.py

@@ -252,6 +252,8 @@ def get_adapter_path(cls, name: str, protocol: str) -> Optional[dict]:
                 "path": manifest.get("path"),
                 "venv_path": manifest.get("venv_path"),
                 "assets_path": manifest.get("assets_path"),
+                "cat_id": int(manifest.get("cat_id")),
+                "name": manifest.get("name"),
             }
 
         logger.warning(

protos/v3/publisher.proto

@@ -90,6 +90,10 @@ message ExchangeOAuth2CodeAndStoreResponse {
   repeated PublicKey server_ephemeral_public_keys = 6;
   // Key ID used for encrypting the token ciphertext
   uint32 key_id = 7;
+  // The platform name
+  string platform = 8;
+  // Category identifier
+  uint32 cat_id = 9;
 }
 
 // Request message for revoking an OAuth2 token
@@ -181,6 +185,10 @@ message ExchangePNBACodeAndStoreResponse {
   repeated PublicKey server_ephemeral_public_keys = 7;
   // Key ID used for encrypting the token ciphertext
   uint32 key_id = 8;
+  // The platform name
+  string platform = 9;
+  // Category identifier
+  uint32 cat_id = 10;
 }
 
 // Request message for revoking and deleting a PNBA token

tests/client.py

@@ -159,7 +159,8 @@ def cmd_exchange_oauth2_code(args: argparse.Namespace) -> bool:
 
     tokens = db_get("tokens") or {}
     tokens[response.account_identifier] = {
-        "platform": args.platform,
+        "platform": response.platform,
+        "cat_id": response.cat_id,
         "account_identifier": response.account_identifier,
         "token": b64(raw_token),
         "token_id": b64(response.token_id),
@@ -402,7 +403,8 @@ def cmd_exchange_pnba_code(args: argparse.Namespace) -> bool:
 
     tokens = db_get("tokens") or {}
     tokens[response.account_identifier] = {
-        "platform": args.platform,
+        "platform": response.platform,
+        "cat_id": response.cat_id,
         "account_identifier": response.account_identifier,
         "token": b64(raw_token),
         "token_id": b64(response.token_id),