Revert "feat: forcefully switch automatic cloud registration to v1"

This reverts commit 2c559a3.
candlepin · Jan 22, 2025 · 8c54d4f · 8c54d4f
1 parent d6a999d
commit 8c54d4f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/src/rhsm/connection.py b/src/rhsm/connection.py
@@ -1519,11 +1519,10 @@ def getCloudJWT(self, cloud_id: str, metadata: str, signature: str) -> Dict[str,
         }
         headers = {
             "Content-Type": "application/json",
-            "Accept": "text/plain",
         }
 
         return self.conn.request_post(
-            method="/cloud/authorize",
+            method="/cloud/authorize?version=2",
             params=data,
             headers=headers,
             description=_("Fetching cloud token"),

diff --git a/src/subscription_manager/scripts/rhsmcertd_worker.py b/src/subscription_manager/scripts/rhsmcertd_worker.py
@@ -210,7 +210,7 @@ def _auto_register(cp_provider: "CPProvider") -> ExitStatus:
 
     # Obtain automatic registration token
     try:
-        token: Dict[str, str] = cache.CloudTokenCache._get_from_server(
+        token: Dict[str, str] = cache.CloudTokenCache.get(
             uep=uep,
             cloud_id=cloud_info["cloud_id"],
             metadata=cloud_info["metadata"],
@@ -220,14 +220,33 @@ def _auto_register(cp_provider: "CPProvider") -> ExitStatus:
         log.exception("Cloud token could not be obtained. Unable to perform automatic registration.")
         return ExitStatus.NO_REGISTRATION_TOKEN
 
-    try:
-        _auto_register_standard(uep=uep, token=token)
-    except Exception:
-        log.exception("Standard automatic registration failed.")
-        return ExitStatus.REGISTRATION_FAILED
-    else:
-        log.info("Standard automatic registration was successful.")
-        return ExitStatus.OK
+    if token["tokenType"] == "CP-Cloud-Registration":
+        try:
+            _auto_register_standard(uep=uep, token=token)
+        except Exception:
+            log.exception("Standard automatic registration failed.")
+            return ExitStatus.REGISTRATION_FAILED
+        else:
+            log.info("Standard automatic registration was successful.")
+            return ExitStatus.OK
+
+    # Uncomment the following block to enable automatic cloud registration v2.
+    # This feature has been disabled temporarily to ensure we do not cause
+    # regressions by not having the backend fully prepared and tested.
+
+    # if token["tokenType"] == "CP-Anonymous-Cloud-Registration":
+    #     try:
+    #         _auto_register_anonymous(uep=uep, token=token)
+    #         cache.CloudTokenCache.delete_cache()
+    #     except Exception:
+    #         log.exception("Anonymous automatic registration failed.")
+    #         return ExitStatus.REGISTRATION_FAILED
+    #     else:
+    #         log.info("Anonymous automatic registration was successful.")
+    #         return ExitStatus.OK
+
+    log.error(f"Unsupported token type for automatic registration: {token['tokenType']}.")
+    return ExitStatus.BAD_TOKEN_TYPE
 
 
 def _auto_register_standard(uep: "UEPConnection", token: Dict[str, str]) -> None:
@@ -242,7 +261,7 @@ def _auto_register_standard(uep: "UEPConnection", token: Dict[str, str]) -> None
     _auto_register_wait()
 
     service = RegisterService(cp=uep)
-    service.register(org=None, jwt_token=token)
+    service.register(org=None, jwt_token=token["token"])
 
 
 def _auto_register_anonymous(uep: "UEPConnection", token: Dict[str, str]) -> None: