fix(destory-session): testing destroy session for all devices using supabase

app/database/migrations/20240308161551_create_schema_for_session/migration.sql

@@ -0,0 +1,11 @@
+-- CreateTable
+CREATE TABLE "Session" (
+    "id" TEXT NOT NULL,
+    "expires" TIMESTAMP(3),
+    "userId" TEXT,
+    "data" JSONB NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "Session_pkey" PRIMARY KEY ("id")
+);

app/database/schema.prisma

@@ -1,6 +1,6 @@
 datasource db {
-  provider = "postgresql"
-  url      = env("DATABASE_URL")
+  provider  = "postgresql"
+  url       = env("DATABASE_URL")
   directUrl = env("DIRECT_URL")
 }
 
@@ -159,7 +159,7 @@ model Tag {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
- //@@unique([lower(name), organizationId]) //prisma doesnt support case insensitive unique index yet
+  //@@unique([lower(name), organizationId]) //prisma doesnt support case insensitive unique index yet
 }
 
 model Note {
@@ -274,7 +274,7 @@ model Location {
 
   assets Asset[]
 
- // @@unique([lower(name), organizationId]) //prisma doesnt support case insensitive unique index yet
+  // @@unique([lower(name), organizationId]) //prisma doesnt support case insensitive unique index yet
 }
 
 // Master data for roles
@@ -297,17 +297,17 @@ model TeamMember {
   id   String @id @unique @default(cuid())
   name String
 
-  organization   Organization @relation(fields: [organizationId], references: [id], onUpdate: Cascade)
-  organizationId String
+  organization    Organization @relation(fields: [organizationId], references: [id], onUpdate: Cascade)
+  organizationId  String
   custodies       Custody[]
   receivedInvites Invite[]
-  user            User?          @relation(fields: [userId], references: [id], onUpdate: Cascade)
+  user            User?        @relation(fields: [userId], references: [id], onUpdate: Cascade)
   userId          String?
 
   createdAt DateTime  @default(now())
   updatedAt DateTime  @updatedAt
   deletedAt DateTime?
-  bookings   Booking[]
+  bookings  Booking[]
 }
 
 model Custody {
@@ -550,13 +550,13 @@ model Booking {
   name   String
   status BookingStatus @default(DRAFT)
 
-  activeSchedulerReference   String?
+  activeSchedulerReference String?
 
   // Relationships
   creator   User   @relation("creator", fields: [creatorId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   creatorId String
 
-  custodianUser   User?  @relation("custodian", fields: [custodianUserId], references: [id], onDelete: Cascade, onUpdate: Cascade)
+  custodianUser   User?   @relation("custodian", fields: [custodianUserId], references: [id], onDelete: Cascade, onUpdate: Cascade)
   custodianUserId String?
 
   custodianTeamMember   TeamMember? @relation(fields: [custodianTeamMemberId], references: [id], onDelete: Cascade, onUpdate: Cascade)
@@ -573,3 +573,14 @@ model Booking {
   from      DateTime? @db.Timestamptz(3)
   to        DateTime? @db.Timestamptz(3)
 }
+
+model Session {
+  id String @id @default(cuid())
+
+  expires DateTime?
+  userId  String?
+  data    Json
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+}

app/routes/_layout+/settings.account.tsx

@@ -11,6 +11,7 @@ import Input from "~/components/forms/input";
 import { Button } from "~/components/shared/button";
 import PasswordResetForm from "~/components/user/password-reset-form";
 import ProfilePicture from "~/components/user/profile-picture";
+import { db } from "~/database";
 
 import { useUserData } from "~/hooks";
 import { sendResetPasswordLink } from "~/modules/auth";
@@ -48,22 +49,33 @@ export async function action({ context, request }: ActionFunctionArgs) {
   if (formData.get("intent") === "resetPassword") {
     const email = formData.get("email") as string;
 
-    const { error } = await sendResetPasswordLink(email);
+    const data = await db.session.findMany({
+      where: { userId: authSession.userId },
+    });
 
-    if (error) {
-      return json(
-        {
-          message: "Unable to send password reset link",
-          email: null,
-        },
-        { status: 500 }
-      );
-    }
+    const updatedData = await db.session.updateMany({
+      where: { id: { in: data.map((item) => item.id) } },
+      data: { data: {}, userId: null, expires: null },
+    });
+
+    console.log(updatedData);
+
+    // const { error } = await sendResetPasswordLink(email);
+
+    // if (error) {
+    //   return json(
+    //     {
+    //       message: "Unable to send password reset link",
+    //       email: null,
+    //     },
+    //     { status: 500 }
+    //   );
+    // }
 
     /** Logout user after 3 seconds */
-    await delay(2000);
-    context.destroySession();
-    return redirect("/login");
+    // await delay(2000);
+    // context.destroySession();
+    return redirect("/settings/account");
   }
 
   /** Handle the use update */

server/index.ts

@@ -13,7 +13,7 @@ import { ShelfStackError } from "~/utils/error";
 
 import { logger } from "./logger";
 import { cache, protect, refreshSession } from "./middleware";
-import { authSessionKey } from "./session";
+import { authSessionKey, createDatabaseSessionStorage } from "./session";
 import type { FlashData, SessionData } from "./session";
 
 /** For some reason the globals like File only work on production build
@@ -64,9 +64,19 @@ app.use(
   session({
     autoCommit: true,
     createSessionStorage() {
-      const sessionStorage = createCookieSessionStorage({
+      // const sessionStorage = createCookieSessionStorage({
+      //   cookie: {
+      //     name: "__authSession",
+      //     httpOnly: true,
+      //     path: "/",
+      //     sameSite: "lax",
+      //     secrets: [env.SESSION_SECRET],
+      //     secure: env.NODE_ENV === "production",
+      //   },
+      // });
+      const sessionStorage = createDatabaseSessionStorage({
         cookie: {
-          name: "__authSession",
+          name: "__authenticationSession",
           httpOnly: true,
           path: "/",
           sameSite: "lax",

server/middleware.ts

@@ -25,9 +25,14 @@ export function protect({
     if (isPublic) {
       return next();
     }
+    console.log("Timer start >>>>>>>>>>>>>>>>");
+    console.time("session");
+
     //@ts-expect-error fixed soon
     const session = getSession<SessionData, FlashData>(c);
     const auth = session.get(authSessionKey);
+    console.log("Timer end >>>>>>>>>>>>>>>>>>>>>>>");
+    console.timeEnd("session");
 
     if (!auth) {
       session.flash(

server/session.ts

@@ -1,3 +1,8 @@
+import type { CookieOptions } from "@remix-run/node";
+import { createSessionStorage } from "@remix-run/node";
+import { z } from "zod";
+import { db } from "~/database";
+
 export type AuthSession = {
   accessToken: string;
   refreshToken: string;
@@ -14,3 +19,50 @@ export type SessionData = {
 };
 
 export type FlashData = { errorMessage: string };
+
+const sessionSchema = z
+  .object({
+    auth: z.object({
+      email: z.string(),
+      userId: z.string(),
+      expiresAt: z.number(),
+      expiresIn: z.number(),
+      accessToken: z.string(),
+      refreshToken: z.string(),
+    }),
+  })
+  .partial();
+
+export function createDatabaseSessionStorage({
+  cookie,
+}: {
+  cookie: CookieOptions & {
+    name?: string;
+  };
+}) {
+  return createSessionStorage<SessionData, FlashData>({
+    cookie,
+    async createData(data, expires) {
+      const parsedData = sessionSchema.parse(data);
+      const createdSession = await db.session.create({
+        data: { data: parsedData, expires, userId: parsedData.auth?.userId },
+      });
+      return createdSession.id;
+    },
+    async readData(id) {
+      const data = await db.session.findFirst({ where: { id } });
+      return sessionSchema.parse(data?.data ?? {});
+    },
+    async updateData(id, data, expires) {
+      const parsedData = sessionSchema.parse(data);
+
+      await db.session.update({
+        where: { id },
+        data: { data: parsedData, expires, userId: parsedData.auth?.userId },
+      });
+    },
+    async deleteData(id) {
+      await db.session.delete({ where: { id } });
+    },
+  });
+}