Merge pull request #2338 from dandi/revert-oauth-model

Revert OAuth model change

Author: mvandenburgh

dandiapi/settings.py

@@ -201,9 +201,11 @@ def mutate_configuration(configuration: type[ComposedConfiguration]):
     AUTO_APPROVE_USERS = False
 
 
+# NOTE: The staging configuration uses a custom OAuth toolkit `Application` model
+# (`StagingApplication`) to allow for wildcards in OAuth redirect URIs (to support Netlify branch
+# deploy previews, etc). Note that both the custom `StagingApplication` and default
+# `oauth2_provider.models.Application` will have Django database models and will show up on the
+# Django admin, but only one of them will be in active use depending on the environment
+# the API server is running in (production/local or staging).
 class HerokuStagingConfiguration(HerokuProductionConfiguration):
-    @staticmethod
-    def mutate_configuration(configuration: type[ComposedConfiguration]):
-        # The staging configuration enables wildcards in OAuth redirect URIs in order
-        # to support Netlify deploy previews.
-        configuration.OAUTH2_PROVIDER['ALLOW_URI_WILDCARDS'] = True
+    OAUTH2_PROVIDER_APPLICATION_MODEL = 'api.StagingApplication'