From bc61db07b219b1f9746aecd884a1f462eb9ec06b Mon Sep 17 00:00:00 2001 From: Karli Date: Thu, 4 Sep 2025 01:21:42 +0300 Subject: [PATCH] test2 --- .env | 2 +- packages/features/accounts/src/server/api.ts | 1 - packages/features/auth/src/components/oauth-providers.tsx | 1 + .../features/medusa-storefront/src/lib/data/products.ts | 4 ++-- packages/shared/src/components/ui/info-tooltip.tsx | 4 ++-- packages/shared/src/config/auth.config.ts | 2 +- packages/supabase/src/clients/browser-client.ts | 8 +++++++- packages/supabase/src/clients/middleware-client.ts | 5 +++++ packages/supabase/src/clients/server-client.ts | 5 +++++ 9 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.env b/.env index cfe6997..d809de7 100644 --- a/.env +++ b/.env @@ -13,7 +13,7 @@ NEXT_PUBLIC_THEME_COLOR="#ffffff" NEXT_PUBLIC_THEME_COLOR_DARK="#0a0a0a" # AUTH -NEXT_PUBLIC_AUTH_PASSWORD=true +NEXT_PUBLIC_AUTH_PASSWORD=false NEXT_PUBLIC_AUTH_MAGIC_LINK=false NEXT_PUBLIC_CAPTCHA_SITE_KEY= diff --git a/packages/features/accounts/src/server/api.ts b/packages/features/accounts/src/server/api.ts index 336797d..ee7b104 100644 --- a/packages/features/accounts/src/server/api.ts +++ b/packages/features/accounts/src/server/api.ts @@ -5,7 +5,6 @@ import { Database } from '@kit/supabase/database'; import { AnalysisResultDetails, UserAnalysis, - UserAnalysisResponse, } from '../types/accounts'; export type AccountWithParams = diff --git a/packages/features/auth/src/components/oauth-providers.tsx b/packages/features/auth/src/components/oauth-providers.tsx index 454b552..db41aa5 100644 --- a/packages/features/auth/src/components/oauth-providers.tsx +++ b/packages/features/auth/src/components/oauth-providers.tsx @@ -102,6 +102,7 @@ export const OauthProviders: React.FC<{ redirectTo, queryParams: props.queryParams, scopes, + skipBrowserRedirect: false, }, } satisfies SignInWithOAuthCredentials; diff --git a/packages/features/medusa-storefront/src/lib/data/products.ts b/packages/features/medusa-storefront/src/lib/data/products.ts index d242b3c..a8ea25d 100644 --- a/packages/features/medusa-storefront/src/lib/data/products.ts +++ b/packages/features/medusa-storefront/src/lib/data/products.ts @@ -14,7 +14,7 @@ export const listProducts = async ({ regionId, }: { pageParam?: number - queryParams?: HttpTypes.FindParams & HttpTypes.StoreProductParams & { "type_id[0]"?: string; id?: string[] } + queryParams?: HttpTypes.FindParams & HttpTypes.StoreProductParams & { "type_id[0]"?: string; id?: string[], category_id?: string } countryCode?: string regionId?: string }): Promise<{ @@ -63,7 +63,7 @@ export const listProducts = async ({ offset, region_id: region?.id, fields: - "*variants.calculated_price,+variants.inventory_quantity,+metadata,+tags", + "*variants.calculated_price,+variants.inventory_quantity,+metadata,+tags,+status", ...queryParams, }, headers, diff --git a/packages/shared/src/components/ui/info-tooltip.tsx b/packages/shared/src/components/ui/info-tooltip.tsx index 0573e79..10a7ae3 100644 --- a/packages/shared/src/components/ui/info-tooltip.tsx +++ b/packages/shared/src/components/ui/info-tooltip.tsx @@ -13,7 +13,7 @@ export function InfoTooltip({ content, icon, }: { - content?: string | null; + content?: JSX.Element | string | null; icon?: JSX.Element; }) { if (!content) return null; @@ -23,7 +23,7 @@ export function InfoTooltip({ {icon || } - {content} + {content} ); diff --git a/packages/shared/src/config/auth.config.ts b/packages/shared/src/config/auth.config.ts index 44d2069..32ebc73 100644 --- a/packages/shared/src/config/auth.config.ts +++ b/packages/shared/src/config/auth.config.ts @@ -40,7 +40,7 @@ const authConfig = AuthConfigSchema.parse({ providers: { password: process.env.NEXT_PUBLIC_AUTH_PASSWORD === 'true', magicLink: process.env.NEXT_PUBLIC_AUTH_MAGIC_LINK === 'true', - oAuth: ['google'], + oAuth: ['keycloak'], }, } satisfies z.infer); diff --git a/packages/supabase/src/clients/browser-client.ts b/packages/supabase/src/clients/browser-client.ts index 747945e..69bb463 100644 --- a/packages/supabase/src/clients/browser-client.ts +++ b/packages/supabase/src/clients/browser-client.ts @@ -10,5 +10,11 @@ import { getSupabaseClientKeys } from '../get-supabase-client-keys'; export function getSupabaseBrowserClient() { const keys = getSupabaseClientKeys(); - return createBrowserClient(keys.url, keys.anonKey); + return createBrowserClient(keys.url, keys.anonKey, { + auth: { + flowType: 'pkce', + autoRefreshToken: true, + persistSession: true, + }, + }); } diff --git a/packages/supabase/src/clients/middleware-client.ts b/packages/supabase/src/clients/middleware-client.ts index 608dc3b..e9c0a31 100644 --- a/packages/supabase/src/clients/middleware-client.ts +++ b/packages/supabase/src/clients/middleware-client.ts @@ -20,6 +20,11 @@ export function createMiddlewareClient( const keys = getSupabaseClientKeys(); return createServerClient(keys.url, keys.anonKey, { + auth: { + flowType: 'pkce', + autoRefreshToken: true, + persistSession: true, + }, cookies: { getAll() { return request.cookies.getAll(); diff --git a/packages/supabase/src/clients/server-client.ts b/packages/supabase/src/clients/server-client.ts index cd4c82c..c9b8d7e 100644 --- a/packages/supabase/src/clients/server-client.ts +++ b/packages/supabase/src/clients/server-client.ts @@ -15,6 +15,11 @@ export function getSupabaseServerClient() { const keys = getSupabaseClientKeys(); return createServerClient(keys.url, keys.anonKey, { + auth: { + flowType: 'pkce', + autoRefreshToken: true, + persistSession: true, + }, cookies: { async getAll() { const cookieStore = await cookies();