aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/auth
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-04-08 21:15:22 +0800
committerGitHub <noreply@github.com>2023-04-08 21:15:22 +0800
commitfdbd64611383f8b78dc76765f6edfa3e40a3a0bf (patch)
treedae3fa75aeaf28a8abd9565fb544ae8b72d9e530 /routers/web/auth
parentcf5a281fdc23543584a3a06fcfcf796b08425a79 (diff)
downloadgitea-fdbd64611383f8b78dc76765f6edfa3e40a3a0bf.tar.gz
gitea-fdbd64611383f8b78dc76765f6edfa3e40a3a0bf.zip
Group template helper functions, remove `Printf`, improve template error messages (#23982)
Follow #23328 Major changes: * Group the function in `templates/help.go` by their purposes. It could make future work easier. * Remove the `Printf` helper function, there is already a builtin `printf`. * Remove `DiffStatsWidth`, replace with `Eval` in template * Rename the `NewTextFuncMap` to `mailSubjectTextFuncMap`, it's for subject text template only, no need to make it support HTML functions. ---- And fine tune template error messages, to make it more friendly to developers and users. ![image](https://user-images.githubusercontent.com/2114189/230714245-4fd202d1-2b25-41b2-8be5-03c5fee45091.png) ![image](https://user-images.githubusercontent.com/2114189/230714277-66783577-2a03-49d5-8e8c-ceba5e07a2d4.png) --------- Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'routers/web/auth')
-rw-r--r--routers/web/auth/oauth.go11
1 files changed, 7 insertions, 4 deletions
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
index 7de63dbe94..b3c4a234c1 100644
--- a/routers/web/auth/oauth.go
+++ b/routers/web/auth/oauth.go
@@ -578,12 +578,15 @@ func GrantApplicationOAuth(ctx *context.Context) {
// OIDCWellKnown generates JSON so OIDC clients know Gitea's capabilities
func OIDCWellKnown(ctx *context.Context) {
- t := ctx.Render.TemplateLookup("user/auth/oidc_wellknown")
+ t, err := ctx.Render.TemplateLookup("user/auth/oidc_wellknown")
+ if err != nil {
+ ctx.ServerError("unable to find template", err)
+ return
+ }
ctx.Resp.Header().Set("Content-Type", "application/json")
ctx.Data["SigningKey"] = oauth2.DefaultSigningKey
- if err := t.Execute(ctx.Resp, ctx.Data); err != nil {
- log.Error("%v", err)
- ctx.Error(http.StatusInternalServerError)
+ if err = t.Execute(ctx.Resp, ctx.Data); err != nil {
+ ctx.ServerError("unable to execute template", err)
}
}