Merge pull request #896 from sirosen/trust-transport-auth-app-clients

Auth app clients trust more to the transport
globus · Nov 3, 2023 · eedf1e7 · eedf1e7
2 parents f08863a + a50363d
commit eedf1e7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 25 deletions.
diff --git a/src/globus_sdk/services/auth/client/confidential_client.py b/src/globus_sdk/services/auth/client/confidential_client.py
@@ -408,46 +408,39 @@ def create_child_client(
                 .. extdoclink:: Create Client
                     :ref: auth/reference/#create_client
         """
-        body: dict[str, t.Any] = {
-            "name": name,
-            "visibility": visibility,
-        }
-        if not isinstance(redirect_uris, utils.MissingType):
-            body["redirect_uris"] = list(utils.safe_strseq_iter(redirect_uris))
-        if required_idp is not utils.MISSING:
-            body["required_idp"] = str(required_idp)
-        if preselect_idp is not utils.MISSING:
-            body["preselect_idp"] = str(preselect_idp)
-
         # Must specify exactly one of public_client or client_type
         if public_client is not utils.MISSING and client_type is not utils.MISSING:
             raise exc.GlobusSDKUsageError(
                 "AuthClient.create_client does not take both "
                 "'public_client' and 'client_type'. These are mutually exclusive."
             )
-
         if public_client is utils.MISSING and client_type is utils.MISSING:
             raise exc.GlobusSDKUsageError(
                 "AuthClient.create_client requires either 'public_client' or "
                 "'client_type'."
             )
-        if public_client is not utils.MISSING:
-            body["public_client"] = public_client
-        if client_type is not utils.MISSING:
-            body["client_type"] = client_type
+
+        body: dict[str, t.Any] = {
+            "name": name,
+            "visibility": visibility,
+            "required_idp": required_idp,
+            "preselect_idp": preselect_idp,
+            "public_client": public_client,
+            "client_type": client_type,
+        }
+        if not isinstance(redirect_uris, utils.MissingType):
+            body["redirect_uris"] = list(utils.safe_strseq_iter(redirect_uris))
 
         # terms_and_conditions and privacy_policy must both be set or unset
         if bool(terms_and_conditions) ^ bool(privacy_policy):
             raise exc.GlobusSDKUsageError(
                 "terms_and_conditions and privacy_policy must both be set or unset"
             )
-        links: dict[str, str] = {}
-        if not isinstance(terms_and_conditions, utils.MissingType):
-            links["terms_and_conditions"] = terms_and_conditions
-        if not isinstance(privacy_policy, utils.MissingType):
-            links["privacy_policy"] = privacy_policy
-
-        if links:
+        links: dict[str, str | utils.MissingType] = {
+            "terms_and_conditions": terms_and_conditions,
+            "privacy_policy": privacy_policy,
+        }
+        if terms_and_conditions or privacy_policy:
             body["links"] = links
 
         if not isinstance(additional_fields, utils.MissingType):

diff --git a/src/globus_sdk/services/auth/client/native_client.py b/src/globus_sdk/services/auth/client/native_client.py
@@ -181,7 +181,6 @@ def create_native_app_instance(
         """
         body: dict[str, t.Any] = {
             "name": name,
-            "template_id": str(template_id),
+            "template_id": template_id,
         }
-
         return self.post("/v2/api/clients", data={"client": body})