From 37b6b5075107c38cc1231cc29e4d35f930800aef Mon Sep 17 00:00:00 2001
From: Ryao <69711608+RyaoChengfeng@users.noreply.github.com>
Date: Fri, 10 Jun 2022 15:58:22 +0800
Subject: [PATCH] fix: remove redundant query for OAuth user (#788)

---
 controllers/auth.go | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/controllers/auth.go b/controllers/auth.go
index fb07cb22..55171465 100644
--- a/controllers/auth.go
+++ b/controllers/auth.go
@@ -326,9 +326,6 @@ func (c *ApiController) Login() {
 				user = object.GetUser(fmt.Sprintf("%s/%s", application.Organization, userInfo.Id))
 			} else if provider.Category == "OAuth" {
 				user = object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
-				if user == nil {
-					user = object.GetUserByField(application.Organization, provider.Type, userInfo.Username)
-				}
 			}
 
 			if user != nil && user.IsDeleted == false {
@@ -424,9 +421,6 @@ func (c *ApiController) Login() {
 			}
 
 			oldUser := object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
-			if oldUser == nil {
-				oldUser = object.GetUserByField(application.Organization, provider.Type, userInfo.Username)
-			}
 			if oldUser != nil {
 				c.ResponseError(fmt.Sprintf("The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", provider.Type, userInfo.Username, userInfo.DisplayName, oldUser.Name, oldUser.DisplayName))
 				return