Fix SSO config removal in quilt3.admin.sso_config.set() (#4098)

quiltdata · Aug 15, 2024 · ec1091f · ec1091f
1 parent 4f81266
commit ec1091f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 17 deletions.
diff --git a/api/python/quilt3/admin/_graphql_client/client.py b/api/python/quilt3/admin/_graphql_client/client.py
diff --git a/api/python/quilt3/admin/_graphql_client/sso_config_set.py b/api/python/quilt3/admin/_graphql_client/sso_config_set.py
diff --git a/api/python/quilt3/admin/sso_config.py b/api/python/quilt3/admin/sso_config.py
@@ -11,8 +11,9 @@ def get() -> T.Optional[types.SSOConfig]:
     return None if result is None else types.SSOConfig(**result.model_dump())
 
 
-def set(config: T.Optional[str]) -> types.SSOConfig:
+def set(config: T.Optional[str]) -> T.Optional[types.SSOConfig]:
     """
-    Set the SSO configuration.
+    Set the SSO configuration. Pass `None` to remove SSO configuration.
     """
-    return types.SSOConfig(**util.handle_errors(util.get_client().sso_config_set(config)).model_dump())
+    result = util.get_client().sso_config_set(config)
+    return None if result is None else types.SSOConfig(**util.handle_errors(result).model_dump())
diff --git a/api/python/tests/test_admin_api.py b/api/python/tests/test_admin_api.py
@@ -348,6 +348,7 @@ def test_sso_config_get(data, result):
     "data,result",
     [
         (SSO_CONFIG, admin.SSOConfig(**_as_dataclass_kwargs(SSO_CONFIG))),
+        (None, None),
         *MUTATION_ERRORS,
     ],
 )

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -18,7 +18,7 @@ Entries inside each section should be ordered by type:
 # unreleased - YYYY-MM-DD
 ## Python API
 
-* [Added] New `quilt3.admin.sso_config` sub-module for management of SSO configuration ([#4065](https://github.com/quiltdata/quilt/pull/4065))
+* [Added] New `quilt3.admin.sso_config` sub-module for management of SSO configuration ([#4065](https://github.com/quiltdata/quilt/pull/4065), [#4098](https://github.com/quiltdata/quilt/pull/4098))
 
 ## CLI
 

diff --git a/docs/api-reference/Admin.md b/docs/api-reference/Admin.md
@@ -140,7 +140,7 @@ __Arguments__
 Get the current SSO configuration.
 
 
-## set(config: Optional[str]) -> quilt3.admin.types.SSOConfig  {#set}
+## set(config: Optional[str]) -> Optional[quilt3.admin.types.SSOConfig]  {#set}
 
-Set the SSO configuration.
+Set the SSO configuration. Pass `None` to remove SSO configuration.
 
diff --git a/shared/graphql/schema.graphql b/shared/graphql/schema.graphql
@@ -884,7 +884,7 @@ union SetSsoConfigResult = SsoConfig | InvalidInput | OperationError
 
 type AdminMutations {
   user: UserAdminMutations!
-  setSsoConfig(config: String): SetSsoConfigResult!
+  setSsoConfig(config: String): SetSsoConfigResult
 }
 
 type Mutation {