Commit215e908

committed

fix: do not use user_link for deleted accounts

1 parentab40ffe commit215e908Copy full SHA for 215e908

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3762,6 +3762,10 @@ func (q *FakeQuerier) GetUserLinkByLinkedID(_ context.Context, id string) (datab`
`3762`	`3762`	`deferq.mutex.RUnlock()`
`3763`	`3763`
`3764`	`3764`	`for_,link:=rangeq.userLinks {`
	`3765`	`+user,err:=q.getUserByIDNoLock(link.UserID)`
	`3766`	`+iferr==nil&&user.Deleted {`
	`3767`	`+continue`
	`3768`	`+}`
`3765`	`3769`	`iflink.LinkedID==id {`
`3766`	`3770`	`returnlink,nil`
`3767`	`3771`	`}`

Lines changed: 5 additions & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,14 @@`
`1`	`1`	`-- name: GetUserLinkByLinkedID :one`
`2`	`2`	`SELECT`
`3`		`-*`
	`3`	`+user_links.*`
`4`	`4`	`FROM`
`5`	`5`	`user_links`
	`6`	`+INNER JOIN`
	`7`	`+usersONuser_links.user_id=users.id`
`6`	`8`	`WHERE`
`7`		`-linked_id= $1;`
	`9`	`+linked_id= $1`
	`10`	`+AND`
	`11`	`+deleted= false;`
`8`	`12`
`9`	`13`	`-- name: GetUserLinkByUserIDLoginType :one`
`10`	`14`	`SELECT`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -661,6 +661,8 @@ func TestUserOAuth2Github(t *testing.T) {`
`661`	`661`
`662`	`662`	`client,_=fake.Login(t,client, jwt.MapClaims{})`
`663`	`663`	`deleted,err:=client.User(ctx,"me")`
	`664`	`+require.NoError(t,err)`
	`665`	`+`
`664`	`666`	`err=owner.DeleteUser(ctx,deleted.ID)`
`665`	`667`	`require.NoError(t,err)`
`666`	`668`

Comments

(0)