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

refine-nextjs/plugins/_base/src/components/layout/index.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { PropsWithChildren } from "react";
+import type { PropsWithChildren } from "react";
 import { Breadcrumb } from "../breadcrumb";
 import { Menu } from "../menu";
 

refine-nextjs/plugins/antd-example/src/app/blog-posts/page.tsx

@@ -9,7 +9,7 @@ import {
     ShowButton,
     useTable,
 } from "@refinedev/antd";
-import { BaseRecord, useMany } from "@refinedev/core";
+import { type BaseRecord, useMany } from "@refinedev/core";
 import { Space, Table } from "antd";
 import React from "react";
 

refine-nextjs/plugins/antd-example/src/app/categories/page.tsx

@@ -7,7 +7,7 @@ import {
     ShowButton,
     useTable,
 } from "@refinedev/antd";
-import { BaseRecord } from "@refinedev/core";
+import type { BaseRecord } from "@refinedev/core";
 import { Space, Table } from "antd";
 import React from "react";
 <%_ if (answers["data-provider"] === "data-provider-hasura") { _%>

refine-nextjs/plugins/antd/src/contexts/color-mode/index.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import React, {
-    PropsWithChildren,
+    type PropsWithChildren,
     createContext,
     useEffect,
     useState,

refine-nextjs/plugins/auth-provider-auth0/src/app/_refine_context.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import React from "react";
-import { Refine, GitHubBanner, AuthBindings, <%- (_app.refineImports || []).join("\n,") _%> } from '@refinedev/core';
+import { Refine, GitHubBanner, type AuthProvider, <%- (_app.refineImports || []).join("\n,") _%> } from '@refinedev/core';
 import { RefineKbar, RefineKbarProvider } from "@refinedev/kbar";
 import { SessionProvider, useSession, signOut, signIn } from "next-auth/react";
 import { usePathname } from 'next/navigation'
@@ -59,7 +59,7 @@ const App = (props: React.PropsWithChildren<AppProps>) => {
         return <span>loading...</span>;
     }
 
-    const authProvider: AuthBindings = {
+    const authProvider: AuthProvider = {
         login: async () => {
             signIn("auth0", {
                     callbackUrl: to ? to.toString() : "/",

refine-nextjs/plugins/auth-provider-auth0/src/app/layout.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from "next";
+import type { Metadata } from "next";
 <%- (_app.nextjsImport || []).join("\n") _%>
 import React, { Suspense } from "react";
 import { RefineContext } from "./_refine_context";

refine-nextjs/plugins/auth-provider-custom/src/providers/auth-provider/auth-provider.server.ts

@@ -1,7 +1,7 @@
-import { AuthBindings } from "@refinedev/core";
+import type { AuthProvider } from "@refinedev/core";
 import { cookies } from "next/headers";
 
-export const authProviderServer: Pick<AuthBindings, "check"> = {
+export const authProviderServer: Pick<AuthProvider, "check"> = {
     check: async () => {
         const cookieStore = cookies();
         const auth = cookieStore.get("auth");

refine-nextjs/plugins/auth-provider-custom/src/providers/auth-provider/auth-provider.ts

@@ -1,6 +1,6 @@
 "use client";
 
-import { AuthBindings } from "@refinedev/core";
+import type { AuthProvider } from "@refinedev/core";
 import Cookies from "js-cookie";
 
 const mockUsers = [
@@ -18,7 +18,7 @@ const mockUsers = [
     },
 ];
 
-export const authProvider: AuthBindings = {
+export const authProvider: AuthProvider = {
     login: async ({ email, username, password, remember }) => {
         // Suppose we actually send a request to the back end here.
         const user = mockUsers[0];

refine-nextjs/plugins/auth-provider-google/src/app/_refine_context.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import React from "react";
-import { Refine, GitHubBanner, AuthBindings, <%- (_app.refineImports || []).join("\n,") _%> } from '@refinedev/core';
+import { Refine, GitHubBanner, type AuthProvider, <%- (_app.refineImports || []).join("\n,") _%> } from '@refinedev/core';
 import { RefineKbar, RefineKbarProvider } from "@refinedev/kbar";
 import { SessionProvider, useSession, signOut, signIn } from "next-auth/react";
 import { usePathname } from 'next/navigation'
@@ -59,7 +59,7 @@ const App = (props: React.PropsWithChildren<AppProps>) => {
         return <span>loading...</span>;
     }
 
-    const authProvider: AuthBindings = {
+    const authProvider: AuthProvider = {
         login: async () => {
             signIn("google", {
                     callbackUrl: to ? to.toString() : "/",

refine-nextjs/plugins/auth-provider-google/src/app/layout.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from "next";
+import type { Metadata } from "next";
 <%- (_app.nextjsImport || []).join("\n") _%>
 import React, { Suspense } from "react";
 import { RefineContext } from "./_refine_context";

refine-nextjs/plugins/auth-provider-keycloak/src/app/_refine_context.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import React from "react";
-import { Refine, GitHubBanner, AuthBindings, <%- (_app.refineImports || []).join("\n,") _%> } from '@refinedev/core';
+import { Refine, GitHubBanner, type AuthProvider, <%- (_app.refineImports || []).join("\n,") _%> } from '@refinedev/core';
 import { RefineKbar, RefineKbarProvider } from "@refinedev/kbar";
 import { SessionProvider, useSession, signOut, signIn } from "next-auth/react";
 import { usePathname } from 'next/navigation'
@@ -59,7 +59,7 @@ const App = (props: React.PropsWithChildren<AppProps>) => {
         return <span>loading...</span>;
     }
 
-    const authProvider: AuthBindings = {
+    const authProvider: AuthProvider = {
         login: async () => {
             signIn("keycloak", {
                     callbackUrl: to ? to.toString() : "/",

refine-nextjs/plugins/auth-provider-keycloak/src/app/layout.tsx

@@ -1,4 +1,4 @@
-import { Metadata } from "next";
+import type { Metadata } from "next";
 <%- (_app.nextjsImport || []).join("\n") _%>
 import React, { Suspense } from "react";
 import { RefineContext } from "./_refine_context";

refine-nextjs/plugins/data-provider-appwrite/extend.js

@@ -2,13 +2,13 @@ const base = {
     _app: {
         import: [],
         localImport: [
-            'import { authProvider } from "@providers/auth-provider";',
-            'import { dataProvider, liveProvider } from "@providers/data-provider";',
+            'import { authProviderClient } from "@providers/auth-provider";',
+            'import { appwriteDataProvider, appwriteLiveProvider } from "@providers/data-provider";',
         ],
         refineProps: [
-            `dataProvider={dataProvider}`,
-            `liveProvider={liveProvider}`,
-            `authProvider={authProvider}`,
+            "dataProvider={appwriteDataProvider}",
+            "liveProvider={appwriteLiveProvider}",
+            "authProvider={authProviderClient}",
         ],
         refineOptions: [`liveMode: "auto",`],
         refineAntdImports: [],

refine-nextjs/plugins/data-provider-appwrite/package.json

@@ -1,12 +1,12 @@
 {
-    "dependencies": {
-        "@refinedev/appwrite": "^6.4.6",
-        "uuid": "^9.0.0",
-        "js-cookie": "^3.0.5"
-    },
-    "devDependencies": {
-        "@types/uuid": "^9.0.2",
-        "@types/js-cookie": "^3.0.6"
-    }
+  "dependencies": {
+    "@refinedev/appwrite": "^6.4.6",
+    "uuid": "^9.0.0",
+    "js-cookie": "^3.0.5",
+    "node-appwrite": "^13.0.0"
+  },
+  "devDependencies": {
+    "@types/uuid": "^9.0.2",
+    "@types/js-cookie": "^3.0.6"
+  }
 }
-

refine-nextjs/plugins/data-provider-appwrite/src/providers/auth-provider/auth-provider.ts → refine-nextjs/plugins/data-provider-appwrite/src/providers/auth-provider/auth-provider.client.ts

@@ -1,20 +1,24 @@
 "use client";
 
-import { account, appwriteClient } from "@providers/data-provider";
 import { AppwriteException } from "@refinedev/appwrite";
-import { AuthBindings } from "@refinedev/core";
-import { APPWRITE_TOKEN_KEY } from "@utility/constants";
+import type { AuthProvider } from "@refinedev/core";
+import { appwriteAccount, appwriteClient } from "@utils/appwrite/client";
+import { APPWRITE_JWT_KEY } from "@utils/constants";
 import Cookies from "js-cookie";
 import { v4 as uuidv4 } from "uuid";
 
-export const authProvider: AuthBindings = {
+export const authProviderClient: AuthProvider = {
     login: async ({ email, password }) => {
         try {
-            await account.createEmailSession(email, password);
-            const { jwt } = await account.createJWT();
+            Cookies.remove(APPWRITE_JWT_KEY, { path: "/" });
+            appwriteClient.setJWT("");
+
+            await appwriteAccount.createEmailSession(email, password);
+            const { jwt } = await appwriteAccount.createJWT();
+            appwriteClient.setJWT(jwt);
 
             if (jwt) {
-                Cookies.set(APPWRITE_TOKEN_KEY, jwt, {
+                Cookies.set(APPWRITE_JWT_KEY, jwt, {
                     expires: 30, // 30 days
                     path: "/",
                 });
@@ -37,14 +41,10 @@ export const authProvider: AuthBindings = {
     },
     logout: async () => {
         try {
-            await account.deleteSession("current");
-        } catch (error: any) {
-            return {
-                success: false,
-                error,
-            };
-        }
-        Cookies.remove(APPWRITE_TOKEN_KEY, { path: "/" });
+            await appwriteAccount.deleteSessions();
+        } catch (error) {}
+
+        Cookies.remove(APPWRITE_JWT_KEY, { path: "/" });
         appwriteClient.setJWT("");
         return {
             success: true,
@@ -53,7 +53,7 @@ export const authProvider: AuthBindings = {
     },
     register: async ({ email, password }) => {
         try {
-            await account.create(uuidv4(), email, password);
+            await appwriteAccount.create(uuidv4(), email, password);
             return {
                 success: true,
                 redirectTo: "/login",
@@ -69,18 +69,20 @@ export const authProvider: AuthBindings = {
             };
         }
     },
-    onError: async (error) => {
-        console.error(error);
+    onError: async (error: AppwriteException) => {
+        if (error.code === 401) {
+            return { logout: true, redirectTo: "/login", error };
+        }
         return { error };
     },
     check: async () => {
-        const appwriteJWT = Cookies.get(APPWRITE_TOKEN_KEY);
+        const appwriteJWT = Cookies.get(APPWRITE_JWT_KEY);
         if (appwriteJWT) {
             appwriteClient.setJWT(appwriteJWT);
         }
 
         try {
-            const session = await account.get();
+            const session = await appwriteAccount.get();
 
             if (session) {
                 return {
@@ -108,7 +110,7 @@ export const authProvider: AuthBindings = {
     },
     getPermissions: async () => null,
     getIdentity: async () => {
-        const user = await account.get();
+        const user = await appwriteAccount.get();
 
         if (user) {
             return user;

refine-nextjs/plugins/data-provider-appwrite/src/providers/auth-provider/auth-provider.server.ts

@@ -1,22 +1,22 @@
-import { AuthBindings } from "@refinedev/core";
-import { APPWRITE_TOKEN_KEY } from "@utility/constants";
-import { cookies } from "next/headers";
+import type { AuthProvider } from "@refinedev/core";
+import { getSessionClient } from "@utils/appwrite/server";
 
-export const authProviderServer: Pick<AuthBindings, "check"> = {
+export const authProviderServer: Pick<AuthProvider, "check"> = {
     check: async () => {
-        const cookieStore = cookies();
-        const auth = cookieStore.get(APPWRITE_TOKEN_KEY);
+        try {
+            const client = await getSessionClient();
+            await client.account.get();
 
-        if (auth) {
             return {
                 authenticated: true,
             };
+        } catch (error: any) {
+            return {
+                authenticated: false,
+                logout: true,
+                redirectTo: "/login",
+                error,
+            };
         }
-
-        return {
-            authenticated: false,
-            logout: true,
-            redirectTo: "/login",
-        };
     },
 };

refine-nextjs/plugins/data-provider-appwrite/src/providers/auth-provider/index.ts

@@ -1,2 +1,2 @@
-export * from './auth-provider'
+export * from './auth-provider.client'
 export * from './auth-provider.server'

refine-nextjs/plugins/data-provider-appwrite/src/providers/data-provider/index.ts

@@ -1,38 +1,12 @@
 "use client";
 
-import {
-    Account,
-    Appwrite,
-    dataProvider as appwriteDataProvider,
-    liveProvider as appwriteLiveProvider,
-    Storage,
-} from "@refinedev/appwrite";
-import {
-    APPWRITE_PROJECT,
-    APPWRITE_TOKEN_KEY,
-    APPWRITE_URL,
-} from "@utility/constants";
-import Cookies from "js-cookie";
+import { dataProvider, liveProvider } from "@refinedev/appwrite";
+import { appwriteClient } from "@utils/appwrite/client";
 
-const appwriteClient = new Appwrite();
-
-appwriteClient.setEndpoint(APPWRITE_URL).setProject(APPWRITE_PROJECT);
-
-// for client side authentication
-const appwriteJWT = Cookies.get(APPWRITE_TOKEN_KEY);
-if (appwriteJWT) {
-    appwriteClient.setJWT(appwriteJWT);
-}
-
-const account = new Account(appwriteClient);
-const storage = new Storage(appwriteClient);
-
-export { appwriteClient, account, storage };
-
-export const dataProvider = appwriteDataProvider(appwriteClient, {
+export const appwriteDataProvider = dataProvider(appwriteClient, {
     databaseId: "database",
 });
 
-export const liveProvider = appwriteLiveProvider(appwriteClient, {
+export const appwriteLiveProvider = liveProvider(appwriteClient, {
     databaseId: "database",
 });

refine-nextjs/plugins/data-provider-appwrite/src/utils/appwrite/client.ts

@@ -0,0 +1,17 @@
+'use client'
+
+import { Account, Appwrite, Storage } from '@refinedev/appwrite'
+import { APPWRITE_JWT_KEY, APPWRITE_PROJECT, APPWRITE_URL } from '@utils/constants'
+import Cookies from 'js-cookie'
+
+export const appwriteClient = new Appwrite()
+
+const appwriteJWT = Cookies.get(APPWRITE_JWT_KEY)
+if (appwriteJWT) {
+  appwriteClient.setJWT(appwriteJWT)
+}
+
+appwriteClient.setEndpoint(APPWRITE_URL).setProject(APPWRITE_PROJECT)
+
+export const appwriteAccount = new Account(appwriteClient)
+export const appwriteStorage = new Storage(appwriteClient)

refine-nextjs/plugins/data-provider-appwrite/src/utils/appwrite/server.ts

@@ -0,0 +1,20 @@
+import { Client, Account } from 'node-appwrite'
+import { cookies } from 'next/headers'
+import { APPWRITE_JWT_KEY, APPWRITE_PROJECT, APPWRITE_URL } from '@utils/constants'
+
+export const getSessionClient = async () => {
+  const client = new Client().setEndpoint(APPWRITE_URL).setProject(APPWRITE_PROJECT)
+
+  const session = cookies().get(APPWRITE_JWT_KEY)
+  if (!session || !session.value) {
+    throw new Error('No session')
+  }
+
+  client.setJWT(session.value)
+
+  return {
+    get account() {
+      return new Account(client)
+    },
+  }
+}

refine-nextjs/plugins/data-provider-appwrite/src/utility/constants.ts → refine-nextjs/plugins/data-provider-appwrite/src/utils/constants.ts

@@ -1,3 +1,3 @@
 export const APPWRITE_URL = "https://refine.appwrite.org/v1";
 export const APPWRITE_PROJECT = "61c4368b4e349";
-export const APPWRITE_TOKEN_KEY = "appwrite-jwt";
+export const APPWRITE_JWT_KEY = "appwrite-jwt";