realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Fix goth user infer bug (#15821)

Browse source
This commit is contained in:
Lunny Xiao 2021-05-10 23:31:32 +08:00 committed by GitHub
parent e5723d6556
commit 3656a2a672
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
routers/user/auth.go
View file

@ -983,11 +983,16 @@ func LinkAccountPostRegister(ctx *context.Context) {
ctx.Data["SignInLink"] = setting.AppSubURL + "/user/link_account_signin" ctx.Data["SignInLink"] = setting.AppSubURL + "/user/link_account_signin"
ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/link_account_signup" ctx.Data["SignUpLink"] = setting.AppSubURL + "/user/link_account_signup"
gothUser := ctx.Session.Get("linkAccountGothUser") gothUserInterface := ctx.Session.Get("linkAccountGothUser")
if gothUser == nil { if gothUserInterface == nil {
ctx.ServerError("UserSignUp", errors.New("not in LinkAccount session")) ctx.ServerError("UserSignUp", errors.New("not in LinkAccount session"))
return return
} }
gothUser, ok := gothUserInterface.(goth.User)
if !ok {
ctx.ServerError("UserSignUp", fmt.Errorf("session linkAccountGothUser type is %t but not goth.User", gothUserInterface))
return
}
if ctx.HasError() { if ctx.HasError() {
ctx.HTML(http.StatusOK, tplLinkAccount) ctx.HTML(http.StatusOK, tplLinkAccount)
@ -1049,7 +1054,7 @@ func LinkAccountPostRegister(ctx *context.Context) {
} }
} }
loginSource, err := models.GetActiveOAuth2LoginSourceByName(gothUser.(goth.User).Provider) loginSource, err := models.GetActiveOAuth2LoginSourceByName(gothUser.Provider)
if err != nil { if err != nil {
ctx.ServerError("CreateUser", err) ctx.ServerError("CreateUser", err)
} }
@ -1061,10 +1066,10 @@ func LinkAccountPostRegister(ctx *context.Context) {
IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm), IsActive: !(setting.Service.RegisterEmailConfirm || setting.Service.RegisterManualConfirm),
LoginType: models.LoginOAuth2, LoginType: models.LoginOAuth2,
LoginSource: loginSource.ID, LoginSource: loginSource.ID,
LoginName: gothUser.(goth.User).UserID, LoginName: gothUser.UserID,
} }
if !createAndHandleCreatedUser(ctx, tplLinkAccount, form, u, gothUser.(*goth.User), false) { if !createAndHandleCreatedUser(ctx, tplLinkAccount, form, u, &gothUser, false) {
// error already handled // error already handled
return return
} }