Skip to content

Commit ad786be

Browse files
committed
working
1 parent 9935453 commit ad786be

File tree

8 files changed

+2827
-2433
lines changed

8 files changed

+2827
-2433
lines changed

packages/docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@shikijs/rehype": "3.1.0",
2525
"@shikijs/transformers": "3.1.0",
2626
"@shikijs/types": "3.1.0",
27-
"@supabase/supabase-js": "2.44.4",
27+
"@supabase/supabase-js": "2.49.4",
2828
"@tailwindcss/vite": "4.0.12",
2929
"@types/leaflet": "1.9.12",
3030
"@types/prismjs": "1.26.4",

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

Lines changed: 0 additions & 33 deletions
This file was deleted.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export function createBrowserClient<
3333
);
3434
}
3535

36-
// return browserClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey);
3736
return browserClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
3837
...options,
3938
global: {
@@ -45,7 +44,6 @@ export function createBrowserClient<
4544
},
4645
auth: {
4746
storageKey: options?.cookieOptions?.name,
48-
storage: new BrowserCookieAuthStorageAdapter(cookieOptions),
4947
},
5048
});
5149
}
Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
import type { SupabaseClient } from '@supabase/supabase-js';
2+
import { createServerClient as serverClint } from '@supabase/ssr';
3+
import type { CookieMethodsBrowser, CookieOptionsWithName } from '@supabase/ssr';
4+
import type {
5+
GenericSchema,
6+
SupabaseClientOptions,
7+
} from '@supabase/supabase-js/dist/module/lib/types';
8+
import type { RequestEventBase } from 'packages/qwik-city/lib';
9+
110
export function createServerClient<
211
Database = any,
312
SchemaName extends string & keyof Database = 'public' extends keyof Database
@@ -10,20 +19,20 @@ export function createServerClient<
1019
supabaseUrl: string,
1120
supabaseKey: string,
1221
requestEv: RequestEventBase,
13-
opts?: {
14-
options?: SupabaseClientOptionsWithoutAuth<SchemaName>;
22+
options?: SupabaseClientOptions<SchemaName> & {
23+
cookies?: CookieMethodsBrowser;
1524
cookieOptions?: CookieOptionsWithName;
25+
cookieEncoding?: 'raw' | 'base64url';
26+
isSingleton?: boolean;
1627
}
1728
): SupabaseClient<Database, SchemaName, Schema> {
18-
const options = opts?.options;
19-
const cookieOptions = opts?.cookieOptions;
2029
if (!supabaseUrl || !supabaseKey) {
2130
throw new Error(
2231
'supabaseUrl and supabaseKey are required to create a Supabase client! Find these under `Settings` > `API` in your Supabase dashboard.'
2332
);
2433
}
2534

26-
return createSupabaseClient<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
35+
return serverClint<Database, SchemaName, Schema>(supabaseUrl, supabaseKey, {
2736
...options,
2837
global: {
2938
...options?.global,
@@ -33,8 +42,20 @@ export function createServerClient<
3342
},
3443
},
3544
auth: {
36-
storageKey: cookieOptions?.name,
37-
storage: new QwikServerAuthStorageAdapter(requestEv, cookieOptions),
45+
storageKey: options?.cookieOptions?.name,
46+
},
47+
cookies: {
48+
getAll: () => {
49+
const cookies = requestEv.cookie.getAll();
50+
return Object.keys(cookies).map((name) => {
51+
return { name, value: cookies[name].value };
52+
});
53+
},
54+
setAll: (cookies) => {
55+
cookies.map((cookie) => {
56+
requestEv.cookie.set(cookie.name, cookie.value, cookie.options);
57+
});
58+
},
3859
},
3960
});
4061
}

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

Lines changed: 0 additions & 157 deletions
This file was deleted.

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

Lines changed: 0 additions & 37 deletions
This file was deleted.

packages/supabase-auth-helpers-qwik/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default defineConfig((config) => {
1919
'@builder.io/qwik-city',
2020
'@builder.io/qwik/build',
2121
'@supabase/supabase-js',
22-
'@supabase/ssr',
22+
'@supabase/auth-helpers-shared',
2323
],
2424
},
2525
},

0 commit comments

Comments
 (0)