thepaperpilot/forgejo
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Fix NPE when editing OAuth2 applications (#27078)

Browse source 
Fixes #27072

It looks like there are some cases where `ContextUser` is not set here

---------

Co-authored-by: techknowlogick <matti@mdranta.net>
This commit is contained in:
JakobDev 2023-09-16 11:13:26 +02:00 committed by GitHub
parent f3f445862e
commit efecbbaca1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
routers/web/user/setting/oauth2_common.go
View file

@ -27,9 +27,8 @@ func (oa *OAuth2CommonHandlers) renderEditPage(ctx *context.Context) {
app := ctx.Data["App"].(*auth.OAuth2Application) app := ctx.Data["App"].(*auth.OAuth2Application)
ctx.Data["FormActionPath"] = fmt.Sprintf("%s/%d", oa.BasePathEditPrefix, app.ID) ctx.Data["FormActionPath"] = fmt.Sprintf("%s/%d", oa.BasePathEditPrefix, app.ID)
if ctx.ContextUser.IsOrganization() { if ctx.ContextUser != nil && ctx.ContextUser.IsOrganization() {
err := shared_user.LoadHeaderCount(ctx) if err := shared_user.LoadHeaderCount(ctx); err != nil {
if err != nil {
ctx.ServerError("LoadHeaderCount", err) ctx.ServerError("LoadHeaderCount", err)
return return
} }
@ -68,6 +67,7 @@ func (oa *OAuth2CommonHandlers) AddApp(ctx *context.Context) {
ctx.ServerError("GenerateClientSecret", err) ctx.ServerError("GenerateClientSecret", err)
return return
} }
oa.renderEditPage(ctx) oa.renderEditPage(ctx)
} }