refactor: move OIDC configuration in the oidc module

yaal-coop · Jan 21, 2025 · 4642b74 · 4642b74
1 parent 7fc4ee1
commit 4642b74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/canaille/app/configuration.py b/canaille/app/configuration.py
@@ -153,8 +153,6 @@ def setup_config(app, config=None, test_config=True, env_file=None, env_prefix="
     app.config.from_mapping(
         {
             "SESSION_COOKIE_NAME": "canaille",
-            "OAUTH2_REFRESH_TOKEN_GENERATOR": True,
-            "OAUTH2_ACCESS_TOKEN_GENERATOR": "canaille.oidc.oauth.generate_access_token",
         }
     )
     if not config and "CONFIG" in os.environ:

diff --git a/canaille/oidc/oauth.py b/canaille/oidc/oauth.py
@@ -527,6 +527,11 @@ def generate_access_token(client, grant_type, user, scope):
 
 
 def setup_oauth(app):
+    app.config["OAUTH2_REFRESH_TOKEN_GENERATOR"] = True
+    app.config["OAUTH2_ACCESS_TOKEN_GENERATOR"] = (
+        "canaille.oidc.oauth.generate_access_token"
+    )
+
     # hacky, but needed for tests as somehow the same 'authorization' object is used
     # between tests
     authorization.__init__()
@@ -553,3 +558,4 @@ def setup_oauth(app):
     authorization.register_endpoint(RevocationEndpoint)
     authorization.register_endpoint(ClientRegistrationEndpoint)
     authorization.register_endpoint(ClientConfigurationEndpoint)
+