Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix(auth): find account better

Carl-Gerhard Lindesvärda32b8b37bd7f
diff --git a/apps/api/src/controllers/oauth-callback.controller.tsx b/apps/api/src/controllers/oauth-callback.controller.tsx
index 656a7d568..a2f2e1ce5 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 000000000..98f0b637f
--- /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 7e861107f..294d66a19 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?