Merge pull request #7544 from sreeisalso/supabase-ssr

Supabase ssr update

Author: wmertens

package.json

@@ -183,8 +183,7 @@
   "pnpm": {
     "overrides": {
       "typescript": "5.4.5",
-      "vfile": "6.0.2",
-      "@supabase/realtime-js": "2.8.4"
+      "vfile": "6.0.2"
     },
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]"

packages/docs/package.json

@@ -23,7 +23,7 @@
     "@shikijs/rehype": "3.1.0",
     "@shikijs/transformers": "3.1.0",
     "@shikijs/types": "3.1.0",
-    "@supabase/supabase-js": "2.44.4",
+    "@supabase/supabase-js": "2.49.4",
     "@tailwindcss/vite": "4.0.12",
     "@types/leaflet": "1.9.12",
     "@types/prismjs": "1.26.4",

packages/supabase-auth-helpers-qwik/package.json

@@ -1,16 +1,14 @@
 {
   "name": "supabase-auth-helpers-qwik",
-  "description": "A collection of framework specific Auth utilities for working with Supabase.",
-  "version": "0.0.3",
+  "description": "A collection of Qwik framework specific Auth utilities for working with Supabase.",
+  "version": "0.0.4",
   "author": "Qwik Team",
   "bugs": "https://github.com/QwikDev/qwik/issues",
-  "dependencies": {
-    "@supabase/auth-helpers-shared": "^0.6.3"
-  },
   "devDependencies": {
     "@builder.io/qwik": "workspace:^",
     "@builder.io/qwik-city": "workspace:^",
-    "@supabase/supabase-js": "2.44.4"
+    "@supabase/ssr": "0.6.1",
+    "@supabase/supabase-js": "2.49.4"
   },
   "exports": {
     ".": {
@@ -31,7 +29,7 @@
   "license": "MIT",
   "main": "./lib/index.qwik.mjs",
   "peerDependencies": {
-    "@supabase/supabase-js": "^2.44.4"
+    "@supabase/supabase-js": "^2.49.4"
   },
   "publishConfig": {
     "access": "public"
@@ -40,7 +38,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/QwikDev/qwik.git",
-    "directory": "packages/qwik-auth"
+    "directory": "packages/supabase-auth-helpers-qwik"
   },
   "scripts": {
     "build": "vite build --mode lib"

packages/supabase-auth-helpers-qwik/src/index.ts

@@ -1,5 +1,6 @@
 // Methods
-export { createBrowserClient, createServerClient } from './utils/createSupabaseClient';
+export { createBrowserClient } from './utils/createBrowserClient';
+export { createServerClient } from './utils/createServerClient';
 
 // Types
 export type { Session, User, SupabaseClient } from '@supabase/supabase-js';

packages/supabase-auth-helpers-qwik/src/utils/createBrowserClient.ts

@@ -0,0 +1,49 @@
+import type { SupabaseClient } from '@supabase/supabase-js';
+import {
+  createBrowserClient as browserClient,
+  type CookieMethodsBrowser,
+  type CookieOptionsWithName,
+} from '@supabase/ssr';
+import type {
+  GenericSchema,
+  SupabaseClientOptions,
+} from '@supabase/supabase-js/dist/module/lib/types';
+
+export function createBrowserClient<
+  Database = any,
+  SchemaName extends string & keyof Database = 'public' extends keyof Database
+    ? 'public'
+    : string & keyof Database,
+  Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+    ? Database[SchemaName]
+    : any,
+>(
+  supabaseUrl: string,
+  supabaseKey: string,
+  options?: SupabaseClientOptions<SchemaName> & {
+    cookies?: CookieMethodsBrowser;
+    cookieOptions?: CookieOptionsWithName;
+    cookieEncoding?: 'raw' | 'base64url';
+    isSingleton?: boolean;
+  }
+): SupabaseClient<Database, SchemaName, Schema> {
+  if (!supabaseUrl || !supabaseKey) {
+    throw new Error(
+      'supabaseUrl and supabaseKey are required to create a Supabase client! Find these under `Settings` > `API` in your Supabase dashboard.'
+    );
+  }
+
+  return browserClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
+    ...options,
+    global: {
+      ...options?.global,
+      headers: {
+        ...options?.global?.headers,
+        'X-Client-Info': '[email protected]',
+      },
+    },
+    auth: {
+      storageKey: options?.cookieOptions?.name,
+    },
+  });
+}

packages/supabase-auth-helpers-qwik/src/utils/createServerClient.ts

@@ -0,0 +1,61 @@
+import type { SupabaseClient } from '@supabase/supabase-js';
+import { createServerClient as serverClient } from '@supabase/ssr';
+import type { CookieMethodsBrowser, CookieOptionsWithName } from '@supabase/ssr';
+import type {
+  GenericSchema,
+  SupabaseClientOptions,
+} from '@supabase/supabase-js/dist/module/lib/types';
+import type { RequestEventBase } from 'packages/qwik-city/lib';
+
+export function createServerClient<
+  Database = any,
+  SchemaName extends string & keyof Database = 'public' extends keyof Database
+    ? 'public'
+    : string & keyof Database,
+  Schema extends GenericSchema = Database[SchemaName] extends GenericSchema
+    ? Database[SchemaName]
+    : any,
+>(
+  supabaseUrl: string,
+  supabaseKey: string,
+  requestEv: RequestEventBase,
+  options?: SupabaseClientOptions<SchemaName> & {
+    cookies?: CookieMethodsBrowser;
+    cookieOptions?: CookieOptionsWithName;
+    cookieEncoding?: 'raw' | 'base64url';
+    isSingleton?: boolean;
+  }
+): SupabaseClient<Database, SchemaName, Schema> {
+  if (!supabaseUrl || !supabaseKey) {
+    throw new Error(
+      'supabaseUrl and supabaseKey are required to create a Supabase client! Find these under `Settings` > `API` in your Supabase dashboard.'
+    );
+  }
+
+  return serverClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
+    ...options,
+    global: {
+      ...options?.global,
+      headers: {
+        ...options?.global?.headers,
+        'X-Client-Info': '[email protected]',
+      },
+    },
+    auth: {
+      storageKey: options?.cookieOptions?.name,
+    },
+    cookies: {
+      getAll: () => {
+        const cookies = requestEv.cookie.getAll();
+        return Object.keys(cookies).map((name) => {
+          return { name, value: cookies[name].value };
+        });
+      },
+      setAll: (cookies) => {
+        cookies.map((cookie) => {
+          requestEv.cookie.set(cookie.name, cookie.value, cookie.options);
+        });
+      },
+    },
+  });
+}