fix cat-id generation for the signed docs (#2371)

Author: Mr-Leshiy

catalyst-gateway/tests/api_tests/integration/__init__.py

@@ -1,12 +1,10 @@
 import sys
-from loguru import logger
 import os
 
 try:
-   os.environ["EVENT_DB_TEST_URL"]
+    os.environ["EVENT_DB_TEST_URL"]
 except KeyError:
-   print("Please set the environment variable EVENT_DB_TEST_URL")
-   sys.exit(1)
+    print("Please set the environment variable EVENT_DB_TEST_URL")
+    sys.exit(1)
 
 EVENT_DB_TEST_URL = os.environ["EVENT_DB_TEST_URL"]
-

catalyst-gateway/tests/api_tests/utils/rbac_chain.py

@@ -42,6 +42,7 @@ def cat_id_for_role(self, role_id: RoleID) -> (str, str):
                 role_id,
                 role_0_pk,
                 role_data["rotation"],
+                True,
             ),
             role_data["sk"],
         )
@@ -63,18 +64,22 @@ def __rbac_chain_factory(role_id: RoleID) -> RBACChain:
 
 
 def generate_cat_id(
-    network: str, subnet: str, role_id: RoleID, pk_hex: str, rotation: int
+    network: str, subnet: str, role_id: RoleID, pk_hex: str, rotation: int, is_uri: bool
 ):
     pk = bytes.fromhex(pk_hex)[:32]
-    prefix = "catid.:"
     nonce = int(datetime.now(timezone.utc).timestamp())
     subnet = f"{subnet}." if subnet else ""
     role0_pk_b64 = base64_url(pk)
 
     if role_id == RoleID.ROLE_0 and rotation == 0:
-        return f"{prefix}{nonce}@{subnet}{network}/{role0_pk_b64}"
+        res = f"{nonce}@{subnet}{network}/{role0_pk_b64}"
+    else:
+        res = f"{nonce}@{subnet}{network}/{role0_pk_b64}/{role_id}/{rotation}"
 
-    return f"{prefix}{nonce}@{subnet}{network}/{role0_pk_b64}/{role_id}/{rotation}"
+    if is_uri:
+        res = f"id.catalyst://{res}"
+
+    return res
 
 
 def generate_rbac_auth_token(
@@ -90,13 +95,14 @@ def generate_rbac_auth_token(
     bip32_ed25519_sk = BIP32ED25519PrivateKey(sk, chain_code)
     bip32_ed25519_pk = BIP32ED25519PublicKey(pk, chain_code)
 
-    cat_id = generate_cat_id(network, subnet, RoleID.ROLE_0, pk_hex, 0)
+    token_prefix = "catid.:"
+    cat_id = generate_cat_id(network, subnet, RoleID.ROLE_0, pk_hex, 0, False)
 
     signature = bip32_ed25519_sk.sign(cat_id.encode())
     bip32_ed25519_pk.verify(signature, cat_id.encode())
     signature_b64 = base64_url(signature)
 
-    return f"{cat_id}.{signature_b64}"
+    return f"{token_prefix}{cat_id}.{signature_b64}"
 
 
 def base64_url(data: bytes) -> str: