[maykinmedia/objects-api#481] Change namespace

maykinmedia · Dec 12, 2024 · b9c2fc4 · b9c2fc4
1 parent 58f90b0
commit b9c2fc4
Show file tree

Hide file tree

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

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 = "token_tokenauth"
-    enable_setting = "token_tokenauth_config_enable"
+    namespace = "tokenauth"
+    enable_setting = "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 @@
-token_tokenauth_config_enable: true
+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 @@
-token_tokenauth_config_enable: true
-token_tokenauth:
+tokenauth_config_enable: true
+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 @@
-token_tokenauth_config_enable: true
-token_tokenauth:
+tokenauth_config_enable: true
+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
@@ -180,8 +180,8 @@ def test_invalid_setup(self):
 
     def test_invalid_setup_email(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -205,8 +205,8 @@ def test_invalid_setup_email(self):
 
     def test_invalid_setup_token(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -230,8 +230,8 @@ def test_invalid_setup_token(self):
 
     def test_invalid_empty_token(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -255,8 +255,8 @@ def test_invalid_empty_token(self):
 
     def test_invalid_setup_token_missing(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -277,8 +277,8 @@ def test_invalid_setup_token_missing(self):
 
     def test_invalid_setup_token_unique(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -311,8 +311,8 @@ def test_invalid_setup_token_unique(self):
 
     def test_invalid_setup_contact_person(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "token-1",
@@ -336,8 +336,8 @@ def test_invalid_setup_contact_person(self):
 
     def test_invalid_setup_identifier(self):
         object_source = {
-            "token_tokenauth_config_enable": True,
-            "token_tokenauth": {
+            "tokenauth_config_enable": True,
+            "tokenauth": {
                 "items": [
                     {
                         "identifier": "invalid identifier",