aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/user
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-07-26 14:04:01 +0800
committerGitHub <noreply@github.com>2023-07-26 06:04:01 +0000
commitdcd3a631288686a95cedbd4aa9cce245e896825d (patch)
treee8c726ec07c3cb54fc092d63d2713fee409ee7b4 /routers/web/user
parent338d03ce2f05fcc49a577b58a6cfa6beb7996fd1 (diff)
downloadgitea-dcd3a631288686a95cedbd4aa9cce245e896825d.tar.gz
gitea-dcd3a631288686a95cedbd4aa9cce245e896825d.zip
Move web JSON functions to web context and simplify code (#26132)
The JSONRedirect/JSONOK/JSONError functions were put into "Base" context incorrectly, it would cause abuse. Actually, they are for "web context" only, so, move them to the correct place. And by the way, use them to simplify old code: +75 -196
Diffstat (limited to 'routers/web/user')
-rw-r--r--routers/web/user/setting/account.go4
-rw-r--r--routers/web/user/setting/applications.go4
-rw-r--r--routers/web/user/setting/keys.go4
-rw-r--r--routers/web/user/setting/oauth2_common.go4
-rw-r--r--routers/web/user/setting/security/openid.go4
-rw-r--r--routers/web/user/setting/security/security.go4
-rw-r--r--routers/web/user/setting/security/webauthn.go4
-rw-r--r--routers/web/user/setting/webhooks.go4
8 files changed, 9 insertions, 23 deletions
diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
index 532f0d8e39..ecb846e91b 100644
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -227,9 +227,7 @@ func DeleteEmail(ctx *context.Context) {
log.Trace("Email address deleted: %s", ctx.Doer.Name)
ctx.Flash.Success(ctx.Tr("settings.email_deletion_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/account",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/account")
}
// DeleteAccount render user suicide page and response for delete user himself
diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go
index 8120937696..088aba38b6 100644
--- a/routers/web/user/setting/applications.go
+++ b/routers/web/user/setting/applications.go
@@ -83,9 +83,7 @@ func DeleteApplication(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("settings.delete_token_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/applications",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/applications")
}
func loadApplicationsData(ctx *context.Context) {
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go
index d9412cae7c..2336c04bbe 100644
--- a/routers/web/user/setting/keys.go
+++ b/routers/web/user/setting/keys.go
@@ -256,9 +256,7 @@ func DeleteKey(ctx *context.Context) {
ctx.Flash.Warning("Function not implemented")
ctx.Redirect(setting.AppSubURL + "/user/settings/keys")
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/keys",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/keys")
}
func loadKeysData(ctx *context.Context) {
diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go
index 923ce4b436..641cc1fd9f 100644
--- a/routers/web/user/setting/oauth2_common.go
+++ b/routers/web/user/setting/oauth2_common.go
@@ -138,7 +138,7 @@ func (oa *OAuth2CommonHandlers) DeleteApp(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("settings.remove_oauth2_application_success"))
- ctx.JSON(http.StatusOK, map[string]any{"redirect": oa.BasePathList})
+ ctx.JSONRedirect(oa.BasePathList)
}
// RevokeGrant revokes the grant
@@ -149,5 +149,5 @@ func (oa *OAuth2CommonHandlers) RevokeGrant(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("settings.revoke_oauth2_grant_success"))
- ctx.JSON(http.StatusOK, map[string]any{"redirect": oa.BasePathList})
+ ctx.JSONRedirect(oa.BasePathList)
}
diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go
index f4133f3916..b5509f570f 100644
--- a/routers/web/user/setting/security/openid.go
+++ b/routers/web/user/setting/security/openid.go
@@ -112,9 +112,7 @@ func DeleteOpenID(ctx *context.Context) {
log.Trace("OpenID address deleted: %s", ctx.Doer.Name)
ctx.Flash.Success(ctx.Tr("settings.openid_deletion_success"))
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/security",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/security")
}
// ToggleOpenIDVisibility response for toggle visibility of user's openid
diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go
index cc5f817a9d..dae9bf950d 100644
--- a/routers/web/user/setting/security/security.go
+++ b/routers/web/user/setting/security/security.go
@@ -48,9 +48,7 @@ func DeleteAccountLink(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/security",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/security")
}
func loadSecurityData(ctx *context.Context) {
diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go
index 89ac184a47..990e506d6f 100644
--- a/routers/web/user/setting/security/webauthn.go
+++ b/routers/web/user/setting/security/webauthn.go
@@ -116,7 +116,5 @@ func WebauthnDelete(ctx *context.Context) {
ctx.ServerError("GetWebAuthnCredentialByID", err)
return
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/security",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/security")
}
diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go
index db03d7b1ed..04092461fd 100644
--- a/routers/web/user/setting/webhooks.go
+++ b/routers/web/user/setting/webhooks.go
@@ -42,7 +42,5 @@ func DeleteWebhook(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]any{
- "redirect": setting.AppSubURL + "/user/settings/hooks",
- })
+ ctx.JSONRedirect(setting.AppSubURL + "/user/settings/hooks")
}