Merge branch 'master' into use-refine-options-title

pankod · May 29, 2024 · bb5e910 · bb5e910
2 parents 208f02f + ecb6a7d
commit bb5e910
Show file tree

Hide file tree

Showing 53 changed files with 245 additions and 121 deletions.
diff --git a/refine-nextjs/plugins/antd-example/src/app/blog-posts/show/[id]/page.tsx b/refine-nextjs/plugins/antd-example/src/app/blog-posts/show/[id]/page.tsx
@@ -59,7 +59,7 @@ export default function BlogPostShow() {
     return (
         <Show isLoading={isLoading}>
             <Title level={5}>{"ID"}</Title>
-            <NumberField value={record?.id ?? ""} />
+            <TextField value={record?.id} />
             <Title level={5}>{"Title"}</Title>
             <TextField value={record?.title} />
             <Title level={5}>{"Content"}</Title>

diff --git a/refine-nextjs/plugins/antd-example/src/app/categories/show/[id]/page.tsx b/refine-nextjs/plugins/antd-example/src/app/categories/show/[id]/page.tsx
@@ -34,7 +34,7 @@ export default function CategoryShow() {
     return (
         <Show isLoading={isLoading}>
             <Title level={5}>{"ID"}</Title>
-            <NumberField value={record?.id ?? ""} />
+            <TextField value={record?.id} />
             <Title level={5}>{"Title"}</Title>
             <TextField value={record?.title} />
         </Show>

diff --git a/refine-nextjs/plugins/data-provider-supabase/extend.js b/refine-nextjs/plugins/data-provider-supabase/extend.js
@@ -2,11 +2,11 @@ const base = {
     _app: {
         import: [],
         localImport: [
-            'import { authProvider } from "@providers/auth-provider";',
+            'import { authProviderClient } from "@providers/auth-provider";',
             'import { dataProvider } from "@providers/data-provider";',
         ],
         refineProps: [
-            "authProvider={authProvider}",
+            "authProvider={authProviderClient}",
             "dataProvider={dataProvider}",
         ],
         refineAntdImports: [],

diff --git a/refine-nextjs/plugins/data-provider-supabase/package.json b/refine-nextjs/plugins/data-provider-supabase/package.json
@@ -1,6 +1,7 @@
 {
   "dependencies": {
     "@refinedev/supabase": "^5.7.4",
+    "@supabase/ssr": "^0.3.0",
     "js-cookie": "^3.0.5"
   },
   "devDependencies": {

diff --git a/refine-nextjs/plugins/data-provider-supabase/src/middleware.ts b/refine-nextjs/plugins/data-provider-supabase/src/middleware.ts
@@ -0,0 +1,20 @@
+import { updateSession } from "@/utils/supabase/middleware";
+import type { NextRequest } from "next/server";
+
+export async function middleware(request: NextRequest) {
+    const result = await updateSession(request);
+    return result;
+}
+
+export const config = {
+    matcher: [
+        /*
+         * Match all request paths except for the ones starting with:
+         * - _next/static (static files)
+         * - _next/image (image optimization files)
+         * - favicon.ico (favicon file)
+         * Feel free to modify this pattern to include more paths.
+         */
+        "/((?!_next/static|_next/image|favicon.ico|.*\\.(?:svg|png|jpg|jpeg|gif|webp)$).*)",
+    ],
+};
diff --git a/.../providers/auth-provider/auth-provider.ts → ...ers/auth-provider/auth-provider.client.ts b/.../providers/auth-provider/auth-provider.ts → ...ers/auth-provider/auth-provider.client.ts
@@ -1,15 +1,15 @@
 "use client";
 
-import { AuthBindings } from "@refinedev/core";
-import { supabaseClient } from "@utility/supabase-client";
-import Cookies from "js-cookie";
+import type { AuthProvider } from "@refinedev/core";
+import { supabaseBrowserClient } from "@utils/supabase/client";
 
-export const authProvider: AuthBindings = {
+export const authProviderClient: AuthProvider = {
     login: async ({ email, password }) => {
-        const { data, error } = await supabaseClient.auth.signInWithPassword({
-            email,
-            password,
-        });
+        const { data, error } =
+            await supabaseBrowserClient.auth.signInWithPassword({
+                email,
+                password,
+            });
 
         if (error) {
             return {
@@ -19,10 +19,7 @@ export const authProvider: AuthBindings = {
         }
 
         if (data?.session) {
-            Cookies.set("token", data.session.access_token, {
-                expires: 30, // 30 days
-                path: "/",
-            });
+            await supabaseBrowserClient.auth.setSession(data.session);
 
             return {
                 success: true,
@@ -40,8 +37,7 @@ export const authProvider: AuthBindings = {
         };
     },
     logout: async () => {
-        Cookies.remove("token", { path: "/" });
-        const { error } = await supabaseClient.auth.signOut();
+        const { error } = await supabaseBrowserClient.auth.signOut();
 
         if (error) {
             return {
@@ -57,7 +53,7 @@ export const authProvider: AuthBindings = {
     },
     register: async ({ email, password }) => {
         try {
-            const { data, error } = await supabaseClient.auth.signUp({
+            const { data, error } = await supabaseBrowserClient.auth.signUp({
                 email,
                 password,
             });
@@ -91,10 +87,17 @@ export const authProvider: AuthBindings = {
         };
     },
     check: async () => {
-        const token = Cookies.get("token");
-        const { data } = await supabaseClient.auth.getUser(token);
+        const { data, error } = await supabaseBrowserClient.auth.getUser();
         const { user } = data;
 
+        if (error) {
+            return {
+                authenticated: false,
+                redirectTo: "/login",
+                logout: true,
+            };
+        }
+
         if (user) {
             return {
                 authenticated: true,
@@ -107,7 +110,7 @@ export const authProvider: AuthBindings = {
         };
     },
     getPermissions: async () => {
-        const user = await supabaseClient.auth.getUser();
+        const user = await supabaseBrowserClient.auth.getUser();
 
         if (user) {
             return user.data.user?.role;
@@ -116,7 +119,7 @@ export const authProvider: AuthBindings = {
         return null;
     },
     getIdentity: async () => {
-        const { data } = await supabaseClient.auth.getUser();
+        const { data } = await supabaseBrowserClient.auth.getUser();
 
         if (data?.user) {
             return {

diff --git a/...nextjs/plugins/data-provider-supabase/src/providers/auth-provider/auth-provider.server.ts b/...nextjs/plugins/data-provider-supabase/src/providers/auth-provider/auth-provider.server.ts
@@ -1,12 +1,21 @@
-import { AuthBindings } from "@refinedev/core";
-import { cookies } from "next/headers";
+import type { AuthProvider } from "@refinedev/core";
+import { createSupabaseServerClient } from "@utils/supabase/server";
 
-export const authProviderServer: Pick<AuthBindings, "check"> = {
+export const authProviderServer: Pick<AuthProvider, "check"> = {
     check: async () => {
-        const cookieStore = cookies();
-        const auth = cookieStore.get("token");
+        const { data, error } =
+            await createSupabaseServerClient().auth.getUser();
+        const { user } = data;
 
-        if (auth) {
+        if (error) {
+            return {
+                authenticated: false,
+                logout: true,
+                redirectTo: "/login",
+            };
+        }
+
+        if (user) {
             return {
                 authenticated: true,
             };

diff --git a/refine-nextjs/plugins/data-provider-supabase/src/providers/auth-provider/index.ts b/refine-nextjs/plugins/data-provider-supabase/src/providers/auth-provider/index.ts
@@ -1,2 +1,2 @@
-export * from './auth-provider'
-export * from './auth-provider.server'
+export * from "./auth-provider.client";
+export * from "./auth-provider.server";
diff --git a/refine-nextjs/plugins/data-provider-supabase/src/providers/data-provider/index.ts b/refine-nextjs/plugins/data-provider-supabase/src/providers/data-provider/index.ts
@@ -1,6 +1,6 @@
 "use client";
 
 import { dataProvider as dataProviderSupabase } from "@refinedev/supabase";
-import { supabaseClient } from "@utility/supabase-client";
+import { supabaseBrowserClient } from "@utils/supabase/client";
 
-export const dataProvider = dataProviderSupabase(supabaseClient);
+export const dataProvider = dataProviderSupabase(supabaseBrowserClient);
diff --git a/refine-nextjs/plugins/data-provider-supabase/src/utility/supabase-client.ts b/refine-nextjs/plugins/data-provider-supabase/src/utility/supabase-client.ts
diff --git a/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/client.ts b/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/client.ts
@@ -0,0 +1,12 @@
+import { createBrowserClient } from "@supabase/ssr";
+import { SUPABASE_KEY, SUPABASE_URL } from "./constants";
+
+export const supabaseBrowserClient = createBrowserClient(
+    SUPABASE_URL,
+    SUPABASE_KEY,
+    {
+        db: {
+            schema: "public",
+        },
+    },
+);
diff --git a/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/constants.ts b/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/constants.ts
@@ -0,0 +1,3 @@
+export const SUPABASE_URL = "https://iwdfzvfqbtokqetmbmbp.supabase.co";
+export const SUPABASE_KEY =
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJyb2xlIjoiYW5vbiIsImlhdCI6MTYzMDU2NzAxMCwiZXhwIjoxOTQ2MTQzMDEwfQ._gr6kXGkQBi9BM9dx5vKaNKYj_DJN1xlkarprGpM_fU";
diff --git a/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/middleware.ts b/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/middleware.ts
@@ -0,0 +1,57 @@
+import { CookieOptions, createServerClient } from "@supabase/ssr";
+import { NextRequest, NextResponse } from "next/server";
+import { SUPABASE_KEY, SUPABASE_URL } from "./constants";
+
+export async function updateSession(request: NextRequest) {
+    let response = NextResponse.next({
+        request: {
+            headers: request.headers,
+        },
+    });
+
+    const supabase = createServerClient(SUPABASE_URL, SUPABASE_KEY, {
+        cookies: {
+            get(name: string) {
+                return request.cookies.get(name)?.value;
+            },
+            set(name: string, value: string, options: CookieOptions) {
+                request.cookies.set({
+                    name,
+                    value,
+                    ...options,
+                });
+                response = NextResponse.next({
+                    request: {
+                        headers: request.headers,
+                    },
+                });
+                response.cookies.set({
+                    name,
+                    value,
+                    ...options,
+                });
+            },
+            remove(name: string, options: CookieOptions) {
+                request.cookies.set({
+                    name,
+                    value: "",
+                    ...options,
+                });
+                response = NextResponse.next({
+                    request: {
+                        headers: request.headers,
+                    },
+                });
+                response.cookies.set({
+                    name,
+                    value: "",
+                    ...options,
+                });
+            },
+        },
+    });
+
+    await supabase.auth.getUser();
+
+    return response;
+}
diff --git a/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/server.ts b/refine-nextjs/plugins/data-provider-supabase/src/utils/supabase/server.ts
@@ -0,0 +1,33 @@
+import { CookieOptions, createServerClient } from "@supabase/ssr";
+import { cookies } from "next/headers";
+import { SUPABASE_KEY, SUPABASE_URL } from "./constants";
+
+export const createSupabaseServerClient = () => {
+    const cookieStore = cookies();
+
+    return createServerClient(SUPABASE_URL, SUPABASE_KEY, {
+        cookies: {
+            get(name: string) {
+                return cookieStore.get(name)?.value;
+            },
+            set(name: string, value: string, options: CookieOptions) {
+                try {
+                    cookieStore.set({ name, value, ...options });
+                } catch (error) {
+                    // The `set` method was called from a Server Component.
+                    // This can be ignored if you have middleware refreshing
+                    // user sessions.
+                }
+            },
+            remove(name: string, options: CookieOptions) {
+                try {
+                    cookieStore.set({ name, value: "", ...options });
+                } catch (error) {
+                    // The `delete` method was called from a Server Component.
+                    // This can be ignored if you have middleware refreshing
+                    // user sessions.
+                }
+            },
+        },
+    });
+};
diff --git a/refine-nextjs/plugins/mui-example/src/app/blog-posts/show/[id]/page.tsx b/refine-nextjs/plugins/mui-example/src/app/blog-posts/show/[id]/page.tsx
@@ -62,7 +62,7 @@ export default function BlogPostShow() {
                 <Typography variant="body1" fontWeight="bold">
                     {"ID"}
                 </Typography>
-                <NumberField value={record?.id ?? ""} />
+                <TextField value={record?.id} />
 
                 <Typography variant="body1" fontWeight="bold">
                     {"Title"}

diff --git a/refine-nextjs/plugins/mui-example/src/app/categories/show/[id]/page.tsx b/refine-nextjs/plugins/mui-example/src/app/categories/show/[id]/page.tsx
@@ -37,7 +37,7 @@ export default function CategoryShow() {
                 <Typography variant="body1" fontWeight="bold">
                     {"ID"}
                 </Typography>
-                <NumberField value={record?.id ?? ""} />
+                <TextField value={record?.id} />
                 <Typography variant="body1" fontWeight="bold">
                     {"Title"}
                 </Typography>

diff --git a/refine-remix/plugins/antd-example/app/routes/_layout.blog-posts.show.$id.tsx b/refine-remix/plugins/antd-example/app/routes/_layout.blog-posts.show.$id.tsx
@@ -57,7 +57,7 @@ export default function BlogPostShow() {
   return (
       <Show isLoading={isLoading}>
           <Title level={5}>{"ID"}</Title>
-          <NumberField value={record?.id ?? ""} />
+          <TextField value={record?.id} />
           <Title level={5}>{"Title"}</Title>
           <TextField value={record?.title} />
           <Title level={5}>{"Content"}</Title>

diff --git a/refine-remix/plugins/antd-example/app/routes/_layout.categories.show.$id.tsx b/refine-remix/plugins/antd-example/app/routes/_layout.categories.show.$id.tsx
@@ -31,7 +31,7 @@ export default function CategoryShow() {
     return (
         <Show isLoading={isLoading}>
             <Title level={5}>{"ID"}</Title>
-            <NumberField value={record?.id ?? ""} />
+            <TextField value={record?.id} />
             <Title level={5}>{"Title"}</Title>
             <TextField value={record?.title} />
         </Show>

diff --git a/refine-remix/plugins/antd-example/app/routes/_layout.tsx b/refine-remix/plugins/antd-example/app/routes/_layout.tsx
@@ -2,13 +2,13 @@ import { ThemedLayoutV2, ThemedSiderV2 } from "@refinedev/antd";
 import { Outlet } from "@remix-run/react";
 import { Header } from "~/components/header";
 <%_ if (_app.isAuthProviderCheck) { _%>
-    import type { LoaderArgs } from "@remix-run/node";
+    import type { LoaderFunctionArgs } from "@remix-run/node";
     import { redirect } from "@remix-run/node";
     import { authProvider } from "~/authProvider";
 <%_ } _%>
 
 <%_ if (_app.isNextAuthCheck) { _%>
-    import type { LoaderArgs } from "@remix-run/node";
+    import type { LoaderFunctionArgs } from "@remix-run/node";
     import { redirect } from "@remix-run/node";
     import { authenticator } from "~/utils/auth.server";
 <%_ } _%>
@@ -31,7 +31,7 @@ export default function BaseLayout() {
      * If not, we're redirecting the user to the login page.
      * This is applied for all routes that are nested under this layout (_protected).
      */
-    export async function loader({ request }: LoaderArgs) {
+    export async function loader({ request }: LoaderFunctionArgs) {
     const { authenticated, redirectTo } = await authProvider.check(request);
 
     if (!authenticated) {
@@ -48,7 +48,7 @@ export default function BaseLayout() {
  * If not, we're redirecting the user to the login page.
  * This is applied for all routes that are nested under this layout (_protected).
  */
-export const loader = async ({ request }: LoaderArgs) => {
+export const loader = async ({ request }: LoaderFunctionArgs) => {
     const session = await authenticator.isAuthenticated(request);
     const pathname = new URL(request.url).pathname;