Always put OAuth user info in the ExternalLoginUser table

Never set OAuth in User.LoginSource, which keeps referring to
the username/password interpretation. Fixes #1124

Author: strk

models/user.go

@@ -198,11 +198,6 @@ func (u *User) IsLocal() bool {
 	return u.LoginType <= LoginPlain
 }
 
-// IsOAuth2 returns true if user login type is LoginOAuth2.
-func (u *User) IsOAuth2() bool {
-	return u.LoginType == LoginOAuth2
-}
-
 // HasForkedRepo checks if user has already forked a repository with given ID.
 func (u *User) HasForkedRepo(repoID int64) bool {
 	_, has := HasForkedRepo(u.ID, repoID)

routers/user/auth.go

@@ -448,41 +448,26 @@ func handleOAuth2SignIn(u *models.User, gothUser goth.User, ctx *context.Context
 	ctx.Redirect(setting.AppSubURL + "/user/two_factor")
 }
 
-// OAuth2UserLoginCallback attempts to handle the callback from the OAuth2 provider and if successful
-// login the user
+// OAuth2UserLoginCallback attempts to handle the callback from the
+// OAuth2 provider and if successful login the user
 func oAuth2UserLoginCallback(loginSource *models.LoginSource, request *http.Request, response http.ResponseWriter) (*models.User, goth.User, error) {
 	gothUser, err := oauth2.ProviderCallback(loginSource.Name, request, response)
 
 	if err != nil {
 		return nil, goth.User{}, err
 	}
 
-	user := &models.User{
-		LoginName:   gothUser.UserID,
-		LoginType:   models.LoginOAuth2,
-		LoginSource: loginSource.ID,
-	}
-
-	hasUser, err := models.GetUser(user)
-	if err != nil {
-		return nil, goth.User{}, err
-	}
-
-	if hasUser {
-		return user, goth.User{}, nil
-	}
-
 	// search in external linked users
 	externalLoginUser := &models.ExternalLoginUser{
 		ExternalID:    gothUser.UserID,
 		LoginSourceID: loginSource.ID,
 	}
-	hasUser, err = models.GetExternalLogin(externalLoginUser)
+	hasUser, err := models.GetExternalLogin(externalLoginUser)
 	if err != nil {
 		return nil, goth.User{}, err
 	}
 	if hasUser {
-		user, err = models.GetUserByID(externalLoginUser.UserID)
+		user, err := models.GetUserByID(externalLoginUser.UserID)
 		return user, goth.User{}, err
 	}
 
@@ -620,19 +605,11 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au
 		return
 	}
 
-	loginSource, err := models.GetActiveOAuth2LoginSourceByName(gothUser.(goth.User).Provider)
-	if err != nil {
-		ctx.Handle(500, "CreateUser", err)
-	}
-
 	u := &models.User{
 		Name:        form.UserName,
 		Email:       form.Email,
 		Passwd:      form.Password,
 		IsActive:    !setting.Service.RegisterEmailConfirm,
-		LoginType:   models.LoginOAuth2,
-		LoginSource: loginSource.ID,
-		LoginName:   gothUser.(goth.User).UserID,
 	}
 
 	if err := models.CreateUser(u); err != nil {
@@ -656,6 +633,13 @@ func LinkAccountPostRegister(ctx *context.Context, cpt *captcha.Captcha, form au
 	}
 	log.Trace("Account created: %s", u.Name)
 
+	// Link the oAuth account to the user
+	err := models.LinkAccountToUser(u, gothUser.(goth.User))
+	if err != nil {
+		ctx.Handle(500, "UserLinkAccount", err)
+	}
+	log.Trace("Account %s linked to gothUser %s", u.Name, gothUser.(goth.User))
+
 	// Auto-set admin for the only user.
 	if models.CountUsers() == 1 {
 		u.IsAdmin = true
@@ -913,7 +897,7 @@ func ForgotPasswdPost(ctx *context.Context) {
 		return
 	}
 
-	if !u.IsLocal() && !u.IsOAuth2() {
+	if !u.IsLocal() {
 		ctx.Data["Err_Email"] = true
 		ctx.RenderWithErr(ctx.Tr("auth.non_local_account"), tplForgotPassword, nil)
 		return