Merge branch 'main' into development

PRIME-TU-Delft · Nov 19, 2024 · ab20230 · ab20230
2 parents d798daf + b331999
commit ab20230
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/prisma/migrations/20241116131338_ordered_fields/migration.sql b/prisma/migrations/20241116131338_ordered_fields/migration.sql
diff --git a/...1118160920_tracking_changes/migration.sql → ...1118185222_tracking_changes/migration.sql b/...1118160920_tracking_changes/migration.sql → ...1118185222_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;

diff --git 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;
+		}
+	}
 });