fix: Ignore deleted users when signing up with OAuth (#4036)

kylecarbs · web-flow · commit 57c7fcf27fe2 · 2022-09-13T07:33:35.000-05:00
This prevented a deleted user from signing up again when they
were already linked with a previous account.
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -518,7 +518,11 @@ func findLinkedUser(ctx context.Context, db database.Store, linkedID string, ema
 		if err != nil {
 			return database.User{}, database.UserLink{}, xerrors.Errorf("get user by id: %w", err)
 		}
-		return user, link, nil
+		if !user.Deleted {
+			return user, link, nil
+		}
+		// If the user was deleted, act as if no account link exists.
+		user = database.User{}
 	}
 
 	for _, email := range emails {

Original file line number	Diff line number	Diff line change
`@@ -518,7 +518,11 @@ func findLinkedUser(ctx context.Context, db database.Store, linkedID string, ema`
`518`	`518`	`if err != nil {`
`519`	`519`	`return database.User{}, database.UserLink{}, xerrors.Errorf("get user by id: %w", err)`
`520`	`520`	`}`
`521`		`- return user, link, nil`
	`521`	`+ if !user.Deleted {`
	`522`	`+ return user, link, nil`
	`523`	`+ }`
	`524`	`+ // If the user was deleted, act as if no account link exists.`
	`525`	`+ user = database.User{}`
`522`	`526`	`}`
`523`	`527`
`524`	`528`	`for _, email := range emails {`