From 1a8561416ee73625fc76bb46267eff90a7b46d37 Mon Sep 17 00:00:00 2001 From: Julia van der Kris Date: Sun, 17 Nov 2024 20:39:24 +0100 Subject: [PATCH 1/2] Fix Auth.js sessions not containing all user data --- src/lib/server/auth.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/server/auth.ts b/src/lib/server/auth.ts index 5530982c..73bb9258 100644 --- a/src/lib/server/auth.ts +++ b/src/lib/server/auth.ts @@ -60,5 +60,12 @@ export const { handle, signIn, signOut } = SvelteKitAuth({ adapter: PrismaAdapter(prisma), secret: env.AUTH_SECRET, debug: Boolean(env.DEBUG), - trustHost: true + trustHost: true, + + callbacks: { + // ¯\_(ツ)_/¯ + session({ session }) { + return session; + } + } }); From b331999c358f78310f2f125383882e12b35ec132 Mon Sep 17 00:00:00 2001 From: Julia van der Kris Date: Mon, 18 Nov 2024 19:55:12 +0100 Subject: [PATCH 2/2] Reset last 2 migrations to fix order --- prisma/migrations/20241116131338_ordered_fields/migration.sql | 2 -- .../migration.sql | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 prisma/migrations/20241116131338_ordered_fields/migration.sql rename prisma/migrations/{20241118160920_tracking_changes => 20241118185222_tracking_changes}/migration.sql (94%) diff --git a/prisma/migrations/20241116131338_ordered_fields/migration.sql b/prisma/migrations/20241116131338_ordered_fields/migration.sql deleted file mode 100644 index 62c3a231..00000000 --- a/prisma/migrations/20241116131338_ordered_fields/migration.sql +++ /dev/null @@ -1,2 +0,0 @@ --- AlterTable -ALTER TABLE "Domain" ALTER COLUMN "order" DROP DEFAULT; diff --git a/prisma/migrations/20241118160920_tracking_changes/migration.sql b/prisma/migrations/20241118185222_tracking_changes/migration.sql similarity index 94% rename from prisma/migrations/20241118160920_tracking_changes/migration.sql rename to prisma/migrations/20241118185222_tracking_changes/migration.sql index b1773319..99eb7c21 100644 --- a/prisma/migrations/20241118160920_tracking_changes/migration.sql +++ b/prisma/migrations/20241118185222_tracking_changes/migration.sql @@ -8,7 +8,8 @@ ALTER TABLE "Course" ADD COLUMN "unchanged" BOOLEAN NOT NULL DEFAULT true; -- AlterTable -ALTER TABLE "Domain" ADD COLUMN "unchanged" BOOLEAN NOT NULL DEFAULT true; +ALTER TABLE "Domain" ADD COLUMN "unchanged" BOOLEAN NOT NULL DEFAULT true, +ALTER COLUMN "order" DROP DEFAULT; -- AlterTable ALTER TABLE "Graph" ADD COLUMN "unchanged" BOOLEAN NOT NULL DEFAULT true;