mirror/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-01 05:36:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Link OAuth2 account to 2FA enabled account (fix #1050) (#1052)

Browse source 
* fixes #1050 where linking an account to a 2fa enabled account failed because we forgot to really link the account when 2fa is completed

* handle errors
This commit is contained in:
Willem van Dreumel 2017-02-27 11:10:26 +01:00 committed by Lunny Xiao
parent c0f99e8229
commit 8947b711aa
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
routers/user/auth.go
View file

@ -221,6 +221,20 @@ func TwoFactorPost(ctx *context.Context, form auth.TwoFactorAuthForm) {
return
}
if ctx.Session.Get("linkAccount") != nil {
gothUser := ctx.Session.Get("linkAccountGothUser")
if gothUser == nil {
ctx.Handle(500, "UserSignIn", errors.New("not in LinkAccount session"))
return
}
err = models.LinkAccountToUser(u, gothUser.(goth.User))
if err != nil {
ctx.Handle(500, "UserSignIn", err)
return
}
}
handleSignIn(ctx, u, remember)
return
}
@ -532,8 +546,12 @@ func LinkAccountPostSignIn(ctx *context.Context, signInForm auth.SignInForm) {
_, err = models.GetTwoFactorByUID(u.ID)
if err != nil {
if models.IsErrTwoFactorNotEnrolled(err) {
models.LinkAccountToUser(u, gothUser.(goth.User))
handleSignIn(ctx, u, signInForm.Remember)
err = models.LinkAccountToUser(u, gothUser.(goth.User))
if err != nil {
ctx.Handle(500, "UserLinkAccount", err)
} else {
handleSignIn(ctx, u, signInForm.Remember)
}
} else {
ctx.Handle(500, "UserLinkAccount", err)
}