Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

更正错误的返回值结构 #886

Merged
merged 3 commits into from
May 31, 2022
Merged

更正错误的返回值结构 #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e0ef79
feat: 🎸 返回正常数据的返回值更改
guancyxx May 31, 2022
8a88acd
Merge branch 'v2.5-dev' into feature-276
guancyxx May 31, 2022
4edcecd
fix: 🐛 更正错误的返回值
guancyxx May 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/v1/views/account_life.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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}
4 changes: 2 additions & 2 deletions api/v1/views/approve_system.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -116,7 +116,7 @@ def update_approve_system(
data=setting,
)
)
return {"data": {'error': ErrorCode.OK.value}}
return {'error': ErrorCode.OK.value}


@api.delete(
Expand Down
6 changes: 3 additions & 3 deletions api/v1/views/auth_factor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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}
6 changes: 3 additions & 3 deletions api/v1/views/auth_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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}
6 changes: 3 additions & 3 deletions api/v1/views/auto_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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}
6 changes: 3 additions & 3 deletions api/v1/views/scim_sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
Expand All @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions api/v1/views/third_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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}
16 changes: 8 additions & 8 deletions api/v1/views/webhook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}


Expand All @@ -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(
Expand All @@ -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
Expand Down Expand Up @@ -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}