[maykinmedia/objects-api#481] Update namespace for TokenAuthConfigura…

…tion
maykinmedia · Dec 11, 2024 · 443b9da · 443b9da
1 parent dfc50cd
commit 443b9da
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/docker/setup_configuration/data.yaml b/docker/setup_configuration/data.yaml
@@ -1,5 +1,5 @@
-objecttypes_tokens_config_enable: true
-objecttypes_tokens:
+token_tokenauth_config_enable: true
+token_tokenauth:
   items:
     - identifier: token-1
       token: 18b2b74ef994314b84021d47b9422e82b685d82f

diff --git a/src/objecttypes/conf/base.py b/src/objecttypes/conf/base.py
@@ -52,6 +52,6 @@
 # Django setup configuration
 #
 SETUP_CONFIGURATION_STEPS = [
-    "objecttypes.setup_configuration.steps.SitesConfigurationStep",
-    "objecttypes.setup_configuration.steps.TokenAuthConfigurationStep",
+    "objecttypes.setup_configuration.steps.sites.SitesConfigurationStep",
+    "objecttypes.setup_configuration.steps.token_auth.TokenAuthConfigurationStep",
 ]
diff --git a/src/objecttypes/setup_configuration/steps/token_auth.py b/src/objecttypes/setup_configuration/steps/token_auth.py
@@ -21,8 +21,8 @@ class TokenAuthConfigurationStep(
     Configure tokens for other applications to access Objecttypes API
     """
 
-    namespace = "objecttypes_tokens"
-    enable_setting = "objecttypes_tokens_config_enable"
+    namespace = "token_tokenauth"
+    enable_setting = "token_tokenauth_config_enable"
 
     verbose_name = "Configuration to set up authentication tokens for ObjectTypes"
     config_model = TokenAuthGroupConfigurationModel

diff --git a/src/objecttypes/setup_configuration/tests/files/token_auth/invalid_setup.yaml b/src/objecttypes/setup_configuration/tests/files/token_auth/invalid_setup.yaml
@@ -1,3 +1,3 @@
-objecttypes_tokens_config_enable: true
-objecttypes_tokens:
+token_tokenauth_config_enable: true
+token_tokenauth:
   items:
diff --git a/src/objecttypes/setup_configuration/tests/files/token_auth/valid_setup_complete.yaml b/src/objecttypes/setup_configuration/tests/files/token_auth/valid_setup_complete.yaml
@@ -1,5 +1,5 @@
-objecttypes_tokens_config_enable: true
-objecttypes_tokens:
+token_tokenauth_config_enable: true
+token_tokenauth:
   items:
     - identifier: token-1
       token: 18b2b74ef994314b84021d47b9422e82b685d82f

diff --git a/src/objecttypes/setup_configuration/tests/files/token_auth/valid_setup_default.yaml b/src/objecttypes/setup_configuration/tests/files/token_auth/valid_setup_default.yaml
@@ -1,5 +1,5 @@
-objecttypes_tokens_config_enable: true
-objecttypes_tokens:
+token_tokenauth_config_enable: true
+token_tokenauth:
   items:
     - identifier: token-1
       token: 18b2b74ef994314b84021d47b9422e82b685d82f

diff --git a/src/objecttypes/setup_configuration/tests/test_token_auth_config.py b/src/objecttypes/setup_configuration/tests/test_token_auth_config.py
@@ -184,8 +184,8 @@ def test_invalid_setup(self):
 
     def test_invalid_setup_email(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -209,8 +209,8 @@ def test_invalid_setup_email(self):
 
     def test_invalid_setup_token(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -234,8 +234,8 @@ def test_invalid_setup_token(self):
 
     def test_invalid_empty_token(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -259,8 +259,8 @@ def test_invalid_empty_token(self):
 
     def test_invalid_setup_token_missing(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -281,8 +281,8 @@ def test_invalid_setup_token_missing(self):
 
     def test_invalid_setup_token_unique(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -315,8 +315,8 @@ def test_invalid_setup_token_unique(self):
 
     def test_invalid_setup_contact_person(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -340,8 +340,8 @@ def test_invalid_setup_contact_person(self):
 
     def test_invalid_setup_identifier(self):
         object_source = {
-            "objecttypes_tokens_config_enable": True,
-            "objecttypes_tokens": {
+            "token_tokenauth_config_enable": True,
+            "token_tokenauth": {
                 "items": [
                     {
                         "identifier": "invalid identifier",