Ryan/Reactive-Resume
1
0
Fork 0
mirror of https://github.com/AmruthPillai/Reactive-Resume.git synced 2026-08-23 23:02:17 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): map oauth login to correct user id instead of account id (#3256)

Browse Source
This commit is contained in:
Rakshit Kaintura
2026-07-27 13:38:30 +02:00
committed by GitHub
parent 0eb9ce012e
commit 34c03b1f73
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/auth/src/oauth-profile.test.ts
+3 -1
View File
@@ -75,7 +75,7 @@ describe("createProfileMapper", () => {
expect(dbMock.update).toHaveBeenCalledTimes(1); expect(dbMock.update).toHaveBeenCalledTimes(1);
expect(dbMock.updateSet).toHaveBeenCalledWith({ email: "legacy.user@example.com" }); expect(dbMock.updateSet).toHaveBeenCalledWith({ email: "legacy.user@example.com" });
expect(result).toEqual({ expect(result).toEqual({
id: "legacy-user-id", id: "user-1",
name: "Legacy User", name: "Legacy User",
email: "legacy.user@example.com", email: "legacy.user@example.com",
image: "https://example.com/new.png", image: "https://example.com/new.png",
@@ -153,6 +153,7 @@ describe("createProfileMapper", () => {
expect(dbMock.select).toHaveBeenCalledTimes(2); expect(dbMock.select).toHaveBeenCalledTimes(2);
expect(result).toEqual({ expect(result).toEqual({
id: "user-1",
name: "GitHub User", name: "GitHub User",
email: "github.user@example.com", email: "github.user@example.com",
image: "https://example.com/new.png", image: "https://example.com/new.png",
@@ -189,6 +190,7 @@ describe("createProfileMapper", () => {
expect(dbMock.update).toHaveBeenCalledTimes(1); expect(dbMock.update).toHaveBeenCalledTimes(1);
expect(dbMock.updateSet).toHaveBeenCalledWith({ email: "legacy.user@example.com" }); expect(dbMock.updateSet).toHaveBeenCalledWith({ email: "legacy.user@example.com" });
expect(result).toEqual({ expect(result).toEqual({
id: "user-1",
name: "Legacy User", name: "Legacy User",
email: "legacy.user@example.com", email: "legacy.user@example.com",
image: "https://example.com/new.png", image: "https://example.com/new.png",
packages/auth/src/oauth-profile.ts
+1 -1
View File
@@ -186,7 +186,7 @@ export function createProfileMapper<TProfile extends OAuthProfile>({
await normalizeExistingUserEmail(existingUser.id, existingUser.email, existingEmail); await normalizeExistingUserEmail(existingUser.id, existingUser.email, existingEmail);
return { return {
...(existingUser.accountId ? { id: existingUser.accountId } : {}), id: existingUser.id,
name: existingUser.name, name: existingUser.name,
email: existingEmail, email: existingEmail,
image: image ?? existingUser.image, image: image ?? existingUser.image,