From a32b8b37bd7fb0f685b3c65cd35c8f4d461ab096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= Date: Sat, 21 Dec 2024 10:42:40 +0100 Subject: [PATCH] fix(auth): find account better --- apps/api/src/controllers/oauth-callback.controller.tsx | 10 ++++++++++ .../20241221092853_add_email_to_account/migration.sql | 2 ++ packages/db/prisma/schema.prisma | 1 + 3 files changed, 13 insertions(+) create mode 100644 packages/db/prisma/migrations/20241221092853_add_email_to_account/migration.sql diff --git a/apps/api/src/controllers/oauth-callback.controller.tsx b/apps/api/src/controllers/oauth-callback.controller.tsx index 656a7d56..a2f2e1ce 100644 --- a/apps/api/src/controllers/oauth-callback.controller.tsx +++ b/apps/api/src/controllers/oauth-callback.controller.tsx @@ -128,6 +128,11 @@ export async function githubCallback( provider: 'github', providerId: String(githubUserId), }, + { + provider: 'github', + providerId: null, + email, + }, { provider: 'oauth', user: { @@ -325,6 +330,11 @@ export async function googleCallback( provider: 'google', providerId: googleId, }, + { + provider: 'google', + providerId: null, + email, + }, { provider: 'oauth', user: { diff --git a/packages/db/prisma/migrations/20241221092853_add_email_to_account/migration.sql b/packages/db/prisma/migrations/20241221092853_add_email_to_account/migration.sql new file mode 100644 index 00000000..98f0b637 --- /dev/null +++ b/packages/db/prisma/migrations/20241221092853_add_email_to_account/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "accounts" ADD COLUMN "email" TEXT; diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma index 7e861107..294d66a1 100644 --- a/packages/db/prisma/schema.prisma +++ b/packages/db/prisma/schema.prisma @@ -72,6 +72,7 @@ model Account { id String @id @default(dbgenerated("gen_random_uuid()")) userId String user User @relation(fields: [userId], references: [id], onDelete: Cascade) + email String? provider String providerId String? accessToken String?