diff options
| author | qwerty287 <80460567+qwerty287@users.noreply.github.com> | 2022-10-12 16:08:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 22:08:29 +0800 |
| commit | a902af75f480a5629f0747cd65531107e4897e4e (patch) | |
| tree | 4141c007aad7bd0a434643a7c7f465c7302c85f0 /routers/web/auth | |
| parent | c41b30760ba223b8e1db58b1412aacb5e2571b8a (diff) | |
| download | gitea-a902af75f480a5629f0747cd65531107e4897e4e.tar.gz gitea-a902af75f480a5629f0747cd65531107e4897e4e.zip | |
Support instance-wide OAuth2 applications (#21335)
Support OAuth2 applications created by admins on the admin panel, they
aren't owned by anybody.
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'routers/web/auth')
| -rw-r--r-- | routers/web/auth/oauth.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go index e6112b4276..c172215b90 100644 --- a/routers/web/auth/oauth.go +++ b/routers/web/auth/oauth.go @@ -380,10 +380,13 @@ func AuthorizeOAuth(ctx *context.Context) { return } - user, err := user_model.GetUserByID(app.UID) - if err != nil { - ctx.ServerError("GetUserByID", err) - return + var user *user_model.User + if app.UID != 0 { + user, err = user_model.GetUserByID(app.UID) + if err != nil { + ctx.ServerError("GetUserByID", err) + return + } } if !app.ContainsRedirectURI(form.RedirectURI) { @@ -475,7 +478,11 @@ func AuthorizeOAuth(ctx *context.Context) { ctx.Data["State"] = form.State ctx.Data["Scope"] = form.Scope ctx.Data["Nonce"] = form.Nonce - ctx.Data["ApplicationUserLinkHTML"] = "<a href=\"" + html.EscapeString(user.HTMLURL()) + "\">@" + html.EscapeString(user.Name) + "</a>" + if user != nil { + ctx.Data["ApplicationCreatorLinkHTML"] = fmt.Sprintf(`<a href="%s">@%s</a>`, html.EscapeString(user.HomeLink()), html.EscapeString(user.Name)) + } else { + ctx.Data["ApplicationCreatorLinkHTML"] = fmt.Sprintf(`<a href="%s">%s</a>`, html.EscapeString(setting.AppSubURL+"/"), html.EscapeString(setting.AppName)) + } ctx.Data["ApplicationRedirectDomainHTML"] = "<strong>" + html.EscapeString(form.RedirectURI) + "</strong>" // TODO document SESSION <=> FORM err = ctx.Session.Set("client_id", app.ClientID) |