Merge pull request #886 from longguikeji/feature-276

更正错误的返回值结构
longguikeji · May 31, 2022 · ace4209 · ace4209
2 parents b216221 + 4edcecd
commit ace4209
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/api/v1/views/account_life.py b/api/v1/views/account_life.py
@@ -97,7 +97,7 @@ def create_account_life(request, tenant_id: str, data: AccountLifeCreateIn):
             data=config,
         )
     )
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.put(
@@ -121,7 +121,7 @@ def update_account_life(request, tenant_id: str, id: str, data: AccountLifeUpdat
             data=config,
         )
     )
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete(
@@ -143,4 +143,4 @@ def delete_account_life(request, tenant_id: str, id: str):
         )
     )
     config.delete()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
diff --git a/api/v1/views/approve_system.py b/api/v1/views/approve_system.py
@@ -93,7 +93,7 @@ def create_approve_system(request, tenant_id: str, data: ApproveSystemCreateIn):
             data=setting,
         )
     )
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.put(
@@ -116,7 +116,7 @@ def update_approve_system(
             data=setting,
         )
     )
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete(

diff --git a/api/v1/views/auth_factor.py b/api/v1/views/auth_factor.py
@@ -65,7 +65,7 @@ def create_auth_factor(request, tenant_id: str, data: AuthFactorCreateIn):
     config.name = data.dict()["name"]
     config.type = data.type
     config.save()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.post("/tenant/{tenant_id}/auth_factors/{id}/", response=AuthFactorUpdateOut, tags=["认证因素"], auth=None)
@@ -78,7 +78,7 @@ def update_auth_factor(request, tenant_id: str, id: str, data: AuthFactorUpdateI
     for attr, value in data.dict().items():
         setattr(config, attr, value)
     config.save()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete("/tenant/{tenant_id}/auth_factors/{id}/", response=AuthFactorDeleteOut, tags=["认证因素"], auth=None)
@@ -90,4 +90,4 @@ def delete_auth_factor(request, tenant_id: str, id: str):
         tenant__id=tenant_id, id=id
     )
     config.delete()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
diff --git a/api/v1/views/auth_rules.py b/api/v1/views/auth_rules.py
@@ -65,7 +65,7 @@ def create_auth_rule(request, tenant_id: str, data: AuthRuleCreateIn):
     config.name = data.dict()["name"]
     config.type = data.type
     config.save()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.post("/tenant/{tenant_id}/auth_rules/{id}/", response=AuthRuleUpdateOut, tags=["认证规则"], auth=None)
@@ -80,7 +80,7 @@ def update_auth_rule(request, tenant_id: str, id: str, data: AuthRuleUpdateIn):
     for attr, value in data.dict().items():
         setattr(config, attr, value)
     config.save()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete("/tenant/{tenant_id}/auth_rules/{id}/", response=AuthRuleDeleteOut, tags=["认证规则"], auth=None)
@@ -92,4 +92,4 @@ def delete_auth_rule(request, tenant_id: str, id: str):
         tenant__id=tenant_id, id=id
     )
     config.delete()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
diff --git a/api/v1/views/auto_auth.py b/api/v1/views/auto_auth.py
@@ -100,7 +100,7 @@ def create_auto_auth(request, tenant_id: str, data: AutoAuthCreateIn):
         )
     )
 
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.put(
@@ -124,7 +124,7 @@ def update_auto_auth(request, tenant_id: str, id: str, data: AutoAuthUpdateIn):
             data=setting,
         )
     )
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete(
@@ -146,4 +146,4 @@ def delete_auto_auth(request, tenant_id: str, id: str):
         )
     )
     setting.kill()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
diff --git a/api/v1/views/scim_sync.py b/api/v1/views/scim_sync.py
@@ -128,7 +128,7 @@ def create_scim_sync(request, tenant_id: str, data: ScimSyncCreateIn):
     )
     if data.config.mode == "client":
         update_or_create_periodic_task(config)
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.put(
@@ -148,7 +148,7 @@ def update_scim_sync(request, tenant_id: str, id: str, data: ScimSyncUpdateIn):
     if data.config.mode == "client":
         update_or_create_periodic_task(config)
 
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete("/tenant/{tenant_id}/scim_syncs/{id}/", tags=[_("用户数据同步配置")], auth=None)
@@ -159,7 +159,7 @@ def delete_scim_sync(request, tenant_id: str, id: str):
     if config.config["mode"] == "client":
         delete_periodic_task(config)
     config.delete()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 class ScimServerOut(ModelSchema):

diff --git a/api/v1/views/third_auth.py b/api/v1/views/third_auth.py
@@ -83,7 +83,7 @@ def create_third_auth(request, tenant_id: str, data: ThirdAuthCreateIn):
     extension_setting = extension.update_or_create_settings(
         request.tenant, data.config.dict(), True, False
     )
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.put(
@@ -97,7 +97,7 @@ def update_third_auth(request, tenant_id: str, id: str, data: ThirdAuthUpdateIn)
     setting = TenantExtension.valid_objects.get(tenant__id=tenant_id, id=id)
     setting.settings = data.config.dict()
     setting.save()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.delete(
@@ -112,4 +112,4 @@ def delete_third_auth(request, tenant_id: str, id: str):
 
     setting = TenantExtension.valid_objects.get(tenant__id=tenant_id, id=id)
     setting.kill()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
diff --git a/api/v1/views/webhook.py b/api/v1/views/webhook.py
@@ -156,10 +156,10 @@ def get_webhook_history(request, tenant_id: str, webhook_id: str, id: str):
     tenant = request.tenant
     webhook = Webhook.valid_objects.filter(tenant=tenant, id=webhook_id).first()
     if not webhook:
-        return {"data": {'error': ErrorCode.WEBHOOK_NOT_EXISTS.value}}
+        return {'error': ErrorCode.WEBHOOK_NOT_EXISTS.value}
     history = WebhookTriggerHistory.valid_objects.filter(webhook=webhook, id=id).first()
     if not history:
-        return {"data": {'error': ErrorCode.WEBHOOK_HISTORY_NOT_EXISTS.value}}
+        return {'error': ErrorCode.WEBHOOK_HISTORY_NOT_EXISTS.value}
     return {"data": history}
 
 
@@ -174,12 +174,12 @@ def delete_webhook_history(request, tenant_id: str, webhook_id: str, id: str):
     tenant = request.tenant
     webhook = Webhook.valid_objects.filter(tenant=tenant, id=webhook_id).first()
     if not webhook:
-        return {"data": {'error': ErrorCode.WEBHOOK_NOT_EXISTS.value}}
+        return {'error': ErrorCode.WEBHOOK_NOT_EXISTS.value}
     history = WebhookTriggerHistory.valid_objects.filter(webhook=webhook, id=id).first()
     if not history:
-        return {"data": {'error': ErrorCode.WEBHOOK_HISTORY_NOT_EXISTS.value}}
+        return {'error': ErrorCode.WEBHOOK_HISTORY_NOT_EXISTS.value}
     history.delete()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}
 
 
 @api.get(
@@ -193,10 +193,10 @@ def retry_webhook_history(request, tenant_id: str, webhook_id: str, id: str):
     tenant = request.tenant
     webhook = Webhook.valid_objects.filter(tenant=tenant, id=webhook_id).first()
     if not webhook:
-        return {"data": {'error': ErrorCode.WEBHOOK_NOT_EXISTS.value}}
+        return {'error': ErrorCode.WEBHOOK_NOT_EXISTS.value}
     history = WebhookTriggerHistory.valid_objects.filter(webhook=webhook, id=id).first()
     if not history:
-        return {"data": {'error': ErrorCode.WEBHOOK_HISTORY_NOT_EXISTS.value}}
+        return {'error': ErrorCode.WEBHOOK_HISTORY_NOT_EXISTS.value}
 
     webhook = history.webhook
     url = webhook.url
@@ -225,4 +225,4 @@ def retry_webhook_history(request, tenant_id: str, webhook_id: str, id: str):
             }
         )
         history.save()
-    return {"data": {'error': ErrorCode.OK.value}}
+    return {'error': ErrorCode.OK.value}