refactor(models): move secret field

Office-of-Digital-Services · Jan 28, 2025 · 644a623 · 644a623
1 parent f39f3ce
commit 644a623
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/web/oauth/migrations/0001_initial.py b/web/oauth/migrations/0001_initial.py
@@ -1,10 +1,12 @@
 # Generated by Django 5.1.4 on 2025-01-23 03:51
 
 import uuid
-import web.core.models
-import web.secrets
+
 from django.db import migrations, models
 
+import web.oauth.models.secret_name_field
+import web.oauth.secrets
+
 
 class Migration(migrations.Migration):
 
@@ -20,10 +22,10 @@ class Migration(migrations.Migration):
                 ("client_name", models.CharField(help_text="The name of this OAuth client", max_length=50)),
                 (
                     "client_id_secret_name",
-                    web.core.models.SecretNameField(
+                    web.oauth.models.secret_name_field.SecretNameField(
                         help_text="The name of the secret containing the client ID for this OAuth client",
                         max_length=127,
-                        validators=[web.secrets.SecretNameValidator()],
+                        validators=[web.oauth.secrets.SecretNameValidator()],
                     ),
                 ),
                 (
@@ -46,9 +48,8 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-        ),
-        migrations.AlterModelOptions(
-            name="oauthclientconfig",
-            options={"verbose_name": "OAuth Client"},
+            options={
+                "verbose_name": "OAuth Client",
+            },
         ),
     ]
diff --git a/web/oauth/models/__init__.py b/web/oauth/models/__init__.py
@@ -0,0 +1,4 @@
+from .config import OAuthClientConfig
+from .secret_name_field import SecretNameField
+
+__all__ = ["OAuthClientConfig", "SecretNameField"]
diff --git a/web/oauth/models.py → web/oauth/models/config.py b/web/oauth/models.py → web/oauth/models/config.py
@@ -2,7 +2,7 @@
 
 from django.db import models
 
-from web.core.models import SecretNameField
+from .secret_name_field import SecretNameField
 
 
 class OAuthClientConfig(models.Model):

diff --git a/web/core/models.py → web/oauth/models/secret_name_field.py b/web/core/models.py → web/oauth/models/secret_name_field.py
@@ -1,6 +1,6 @@
 from django.db import models
 
-from web.secrets import NAME_VALIDATOR, get_secret_by_name
+from ..secrets import NAME_VALIDATOR, get_secret_by_name
 
 
 class SecretNameField(models.SlugField):

diff --git a/web/secrets.py → web/oauth/secrets.py b/web/secrets.py → web/oauth/secrets.py