@convex-dev/better-auth 0.8.8 → 0.9.0

package/src/component/adapter.ts

@@ -10,4 +10,5 @@ export const {
   updateMany,
   deleteOne,
   deleteMany,
+  migrationRemoveUserId,
 } = createApi(schema, () => auth);

package/src/component/schema.ts

@@ -21,7 +21,7 @@ export const tables = {
     phoneNumberVerified: v.optional(v.union(v.null(), v.boolean())),
     userId: v.optional(v.union(v.null(), v.string())),
   })
-    .index("email_name", ["email", "name"])
+    .index("email_name", ["email","name"])
     .index("name", ["name"])
     .index("userId", ["userId"])
     .index("username", ["username"])
@@ -36,7 +36,7 @@ export const tables = {
     userId: v.string(),
   })
     .index("expiresAt", ["expiresAt"])
-    .index("expiresAt_userId", ["expiresAt", "userId"])
+    .index("expiresAt_userId", ["expiresAt","userId"])
     .index("token", ["token"])
     .index("userId", ["userId"]),
   account: defineTable({
@@ -54,8 +54,8 @@ export const tables = {
     updatedAt: v.number(),
   })
     .index("accountId", ["accountId"])
-    .index("accountId_providerId", ["accountId", "providerId"])
-    .index("providerId_userId", ["providerId", "userId"])
+    .index("accountId_providerId", ["accountId","providerId"])
+    .index("providerId_userId", ["providerId","userId"])
     .index("userId", ["userId"]),
   verification: defineTable({
     identifier: v.string(),
@@ -70,7 +70,8 @@ export const tables = {
     secret: v.string(),
     backupCodes: v.string(),
     userId: v.string(),
-  }).index("userId", ["userId"]),
+  })
+    .index("userId", ["userId"]),
   passkey: defineTable({
     name: v.optional(v.union(v.null(), v.string())),
     publicKey: v.string(),
@@ -100,7 +101,6 @@ export const tables = {
   })
     .index("clientId", ["clientId"])
     .index("userId", ["userId"]),
-
   oauthAccessToken: defineTable({
     accessToken: v.optional(v.union(v.null(), v.string())),
     refreshToken: v.optional(v.union(v.null(), v.string())),
@@ -116,7 +116,6 @@ export const tables = {
     .index("refreshToken", ["refreshToken"])
     .index("clientId", ["clientId"])
     .index("userId", ["userId"]),
-
   oauthConsent: defineTable({
     clientId: v.optional(v.union(v.null(), v.string())),
     userId: v.optional(v.union(v.null(), v.string())),
@@ -125,229 +124,27 @@ export const tables = {
     updatedAt: v.optional(v.union(v.null(), v.number())),
     consentGiven: v.optional(v.union(v.null(), v.boolean())),
   })
-    .index("clientId_userId", ["clientId", "userId"])
-    .index("userId", ["userId"]),
-
-  team: defineTable({
-    name: v.string(),
-    organizationId: v.string(),
-    createdAt: v.number(),
-    updatedAt: v.optional(v.union(v.null(), v.number())),
-  }).index("organizationId", ["organizationId"]),
-
-  teamMember: defineTable({
-    teamId: v.string(),
-    userId: v.string(),
-    createdAt: v.optional(v.union(v.null(), v.number())),
-  })
-    .index("teamId", ["teamId"])
+    .index("clientId_userId", ["clientId","userId"])
     .index("userId", ["userId"]),
-
-  organization: defineTable({
-    name: v.string(),
-    slug: v.optional(v.union(v.null(), v.string())),
-    logo: v.optional(v.union(v.null(), v.string())),
-    createdAt: v.number(),
-    metadata: v.optional(v.union(v.null(), v.string())),
-  })
-    .index("name", ["name"])
-    .index("slug", ["slug"]),
-
-  member: defineTable({
-    organizationId: v.string(),
-    userId: v.string(),
-    role: v.string(),
-    createdAt: v.number(),
-  })
-    .index("organizationId_userId", ["organizationId", "userId"])
-    .index("userId", ["userId"])
-    .index("role", ["role"]),
-
-  invitation: defineTable({
-    organizationId: v.string(),
-    email: v.string(),
-    role: v.optional(v.union(v.null(), v.string())),
-    teamId: v.optional(v.union(v.null(), v.string())),
-    status: v.string(),
-    expiresAt: v.number(),
-    inviterId: v.string(),
-  })
-    .index("email_organizationId_status", ["email", "organizationId", "status"])
-    .index("organizationId_status", ["organizationId", "status"])
-    .index("role", ["role"])
-    .index("teamId", ["teamId"])
-    .index("status", ["status"])
-    .index("inviterId", ["inviterId"]),
-
-  ssoProvider: defineTable({
-    issuer: v.string(),
-    oidcConfig: v.optional(v.union(v.null(), v.string())),
-    samlConfig: v.optional(v.union(v.null(), v.string())),
-    userId: v.optional(v.union(v.null(), v.string())),
-    providerId: v.string(),
-    organizationId: v.optional(v.union(v.null(), v.string())),
-    domain: v.string(),
-  })
-    .index("organizationId", ["organizationId"])
-    .index("domain", ["domain"])
-    .index("userId", ["userId"])
-    .index("providerId", ["providerId"]),
-
   jwks: defineTable({
     publicKey: v.string(),
     privateKey: v.string(),
     createdAt: v.number(),
   }),
-
-  subscription: defineTable({
-    plan: v.string(),
-    referenceId: v.string(),
-    stripeCustomerId: v.optional(v.union(v.null(), v.string())),
-    stripeSubscriptionId: v.optional(v.union(v.null(), v.string())),
-    status: v.optional(v.union(v.null(), v.string())),
-    periodStart: v.optional(v.union(v.null(), v.number())),
-    periodEnd: v.optional(v.union(v.null(), v.number())),
-    trialStart: v.optional(v.union(v.null(), v.number())),
-    trialEnd: v.optional(v.union(v.null(), v.number())),
-    cancelAtPeriodEnd: v.optional(v.union(v.null(), v.boolean())),
-    seats: v.optional(v.union(v.null(), v.number())),
-  })
-    .index("stripeSubscriptionId", ["stripeSubscriptionId"])
-    .index("stripeCustomerId", ["stripeCustomerId"])
-    .index("referenceId", ["referenceId"]),
-
-  walletAddress: defineTable({
-    userId: v.string(),
-    address: v.string(),
-    chainId: v.number(),
-    isPrimary: v.optional(v.union(v.null(), v.boolean())),
-    createdAt: v.number(),
-  }).index("userId", ["userId"]),
-
   rateLimit: defineTable({
     key: v.optional(v.union(v.null(), v.string())),
     count: v.optional(v.union(v.null(), v.number())),
     lastRequest: v.optional(v.union(v.null(), v.number())),
-  }).index("key", ["key"]),
+  })
+    .index("key", ["key"]),
   ratelimit: defineTable({
     key: v.string(),
     count: v.number(),
     lastRequest: v.number(),
-  }).index("key", ["key"]),
+  })
+    .index("key", ["key"]),
 };
 
 const schema = defineSchema(tables);
 
 export default schema;
-
-export const specialFields = {
-  user: {
-    name: {
-      sortable: true,
-    },
-    email: {
-      sortable: true,
-      unique: true,
-    },
-    username: {
-      sortable: true,
-      unique: true,
-    },
-    phoneNumber: {
-      sortable: true,
-      unique: true,
-    },
-  },
-  session: {
-    token: {
-      unique: true,
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  account: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  twoFactor: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-      },
-    },
-  },
-  passkey: {
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-      },
-    },
-  },
-  oauthApplication: {
-    clientId: {
-      unique: true,
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  oauthAccessToken: {
-    accessToken: {
-      unique: true,
-    },
-    refreshToken: {
-      unique: true,
-    },
-    clientId: {
-      references: {
-        model: "oauthApplication",
-        field: "clientId",
-        onDelete: "cascade",
-      },
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  oauthConsent: {
-    clientId: {
-      references: {
-        model: "oauthApplication",
-        field: "clientId",
-        onDelete: "cascade",
-      },
-    },
-    userId: {
-      references: {
-        model: "user",
-        field: "id",
-        onDelete: "cascade",
-      },
-    },
-  },
-  ratelimit: {
-    key: {
-      unique: true,
-    },
-  },
-};

package/src/plugins/convex/index.ts

@@ -60,7 +60,27 @@ export const convex = (
       }
     },
     hooks: {
-      before: [...bearer.hooks.before],
+      before: [
+        ...bearer.hooks.before,
+        // Don't attempt to refresh the session with a query ctx
+        {
+          matcher: (ctx) => {
+            return (
+              !ctx.context.adapter.options?.isRunMutationCtx &&
+              ctx.path === "/get-session"
+            );
+          },
+          handler: createAuthMiddleware(async (ctx) => {
+            ctx.query = { ...ctx.query, disableRefresh: true };
+            ctx.context.internalAdapter.deleteSession = async (
+              ..._args: any[]
+            ) => {
+              //skip
+            };
+            return { context: ctx };
+          }),
+        },
+      ],
       after: [
         ...oidcProvider.hooks.after,
         {

package/src/plugins/cross-domain/index.ts

@@ -35,12 +35,19 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
         options: {
           trustedOrigins: [siteUrl],
         },
+        context: {
+          oauthConfig: {
+            skipStateCookieCheck: true,
+          },
+        },
       };
     },
     hooks: {
       before: [
         {
           matcher(ctx) {
+            console.log("ctx.request?.headers", ctx.request?.headers);
+            console.log("ctx.headers", ctx.headers);
             return (
               Boolean(
                 ctx.request?.headers.get("better-auth-cookie") ||
@@ -122,6 +129,7 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
           },
           handler: createAuthMiddleware(async (ctx) => {
             const setCookie = ctx.context.responseHeaders?.get("set-cookie");
+            console.log("setCookie", setCookie);
             if (!setCookie) {
               return;
             }

package/src/react/index.tsx

@@ -93,6 +93,7 @@ function useUseAuthFromBetterAuth(authClient: AuthClient) {
       function useAuthFromBetterAuth() {
         const { data: session, isPending: isSessionPending } =
           authClient.useSession();
+        const sessionId = session?.session.id;
         const fetchAccessToken = useCallback(
           async () => {
             try {
@@ -104,7 +105,7 @@ function useUseAuthFromBetterAuth(authClient: AuthClient) {
           },
           // Build a new fetchAccessToken to trigger setAuth() whenever the
           // session changes.
-          [session]
+          [sessionId]
         );
         return useMemo(
           () => ({
@@ -112,7 +113,7 @@ function useUseAuthFromBetterAuth(authClient: AuthClient) {
             isAuthenticated: session !== null,
             fetchAccessToken,
           }),
-          [isSessionPending, session, fetchAccessToken]
+          [isSessionPending, sessionId, fetchAccessToken]
         );
       },
     [authClient]

package/src/react-start/index.ts

@@ -120,6 +120,14 @@ export const reactStartHandler = (
     throw new Error("VITE_CONVEX_SITE_URL is not set");
   }
   const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
-  request.headers.set("accept-encoding", "application/json");
-  return fetch(nextUrl, new Request(request, { redirect: "manual" }));
+  const headers = new Headers(request.headers);
+  headers.set("accept-encoding", "application/json");
+  return fetch(nextUrl, {
+    method: request.method,
+    headers,
+    redirect: "manual",
+    body: request.body,
+    // @ts-expect-error - duplex is required for streaming request bodies in modern fetch
+    duplex: "half",
+  });
 };

package/src/utils/index.ts

@@ -6,16 +6,11 @@ import {
 } from "convex/server";
 import { GenericCtx } from "../client";
 
-/**
- * @deprecated Just reference variables direct, the component will
- * use other ways to make sure the appropriate variables are available
- */
-export const requireEnv = (name: string) => {
-  const value = process.env[name];
-  if (value === undefined) {
-    throw new Error(`Missing environment variable \`${name}\``);
-  }
-  return value;
+export type RunMutationCtx<DataModel extends GenericDataModel> = (
+  | GenericMutationCtx<DataModel>
+  | GenericActionCtx<DataModel>
+) & {
+  runMutation: GenericMutationCtx<DataModel>["runMutation"];
 };
 
 export const isQueryCtx = <DataModel extends GenericDataModel>(
@@ -36,6 +31,12 @@ export const isActionCtx = <DataModel extends GenericDataModel>(
   return "runAction" in ctx;
 };
 
+export const isRunMutationCtx = <DataModel extends GenericDataModel>(
+  ctx: GenericCtx<DataModel>
+): ctx is RunMutationCtx<DataModel> => {
+  return "runMutation" in ctx;
+};
+
 export const requireQueryCtx = <DataModel extends GenericDataModel>(
   ctx: GenericCtx<DataModel>
 ): GenericQueryCtx<DataModel> => {
@@ -62,3 +63,12 @@ export const requireActionCtx = <DataModel extends GenericDataModel>(
   }
   return ctx;
 };
+
+export const requireRunMutationCtx = <DataModel extends GenericDataModel>(
+  ctx: GenericCtx<DataModel>
+): RunMutationCtx<DataModel> => {
+  if (!isRunMutationCtx(ctx)) {
+    throw new Error("Mutation or action context required");
+  }
+  return ctx;
+};

package/dist/commonjs/react/client.d.ts

@@ -1,31 +0,0 @@
-import { ConvexReactClient } from "convex/react";
-import { ReactNode } from "react";
-import { createAuthClient } from "better-auth/react";
-import { convexClient, crossDomainClient } from "../client/plugins";
-import { BetterAuthClientPlugin, ClientOptions } from "better-auth";
-export declare function useAuth(): {
-    isLoading: boolean;
-    isAuthenticated: boolean;
-    fetchAccessToken: ({ forceRefreshToken, }: {
-        forceRefreshToken: boolean;
-    }) => Promise<string | null>;
-};
-export type ConvexAuthClient = {
-    verbose?: boolean;
-    logger?: ConvexReactClient["logger"];
-};
-type CrossDomainClient = ReturnType<typeof crossDomainClient>;
-type ConvexClient = ReturnType<typeof convexClient>;
-type PluginsWithCrossDomain = (CrossDomainClient | ConvexClient | BetterAuthClientPlugin)[];
-type PluginsWithoutCrossDomain = (ConvexClient | BetterAuthClientPlugin)[];
-type AuthClientWithPlugins<Plugins extends PluginsWithCrossDomain | PluginsWithoutCrossDomain> = ReturnType<typeof createAuthClient<ClientOptions & {
-    plugins: Plugins;
-}>>;
-export type AuthClient = AuthClientWithPlugins<PluginsWithCrossDomain> | AuthClientWithPlugins<PluginsWithoutCrossDomain>;
-export declare function AuthProvider({ client, authClient, children, }: {
-    client: ConvexAuthClient;
-    authClient: AuthClient;
-    children: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
-export {};
-//# sourceMappingURL=client.d.ts.map

package/dist/commonjs/react/client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/react/client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAEL,SAAS,EAKV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAYpE,wBAAgB,OAAO;eATV,OAAO;qBACD,OAAO;sBACN,CAAC,EACjB,iBAAiB,GAClB,EAAE;QACD,iBAAiB,EAAE,OAAO,CAAC;KAC5B,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;EAK7B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC9D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AACpD,KAAK,sBAAsB,GAAG,CAC1B,iBAAiB,GACjB,YAAY,GACZ,sBAAsB,CACzB,EAAE,CAAC;AACJ,KAAK,yBAAyB,GAAG,CAAC,YAAY,GAAG,sBAAsB,CAAC,EAAE,CAAC;AAC3E,KAAK,qBAAqB,CACxB,OAAO,SAAS,sBAAsB,GAAG,yBAAyB,IAChE,UAAU,CACZ,OAAO,gBAAgB,CACrB,aAAa,GAAG;IACd,OAAO,EAAE,OAAO,CAAC;CAClB,CACF,CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,qBAAqB,CAAC,sBAAsB,CAAC,GAC7C,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;AAErD,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,UAAU,EACV,QAAQ,GACT,EAAE;IACD,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,SAAS,CAAC;CACrB,2CAmHA"}

package/dist/commonjs/react/client.js

@@ -1,96 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import isNetworkError from "is-network-error";
-import { createContext, useCallback, useContext, useEffect, useMemo, } from "react";
-const ConvexAuthInternalContext = createContext(undefined);
-export function useAuth() {
-    return useContext(ConvexAuthInternalContext);
-}
-export function AuthProvider({ client, authClient, children, }) {
-    const { data: session, isPending: isSessionPending } = authClient.useSession();
-    const verbose = client.verbose ?? false;
-    const logVerbose = useCallback((message) => {
-        if (verbose) {
-            console.debug(`${new Date().toISOString()} ${message}`);
-            client.logger?.logVerbose(message);
-        }
-    }, [verbose]);
-    const fetchToken = useCallback(async () => {
-        const initialBackoff = 100;
-        const maxBackoff = 1000;
-        let retries = 0;
-        const nextBackoff = () => {
-            const baseBackoff = initialBackoff * Math.pow(2, retries);
-            retries += 1;
-            const actualBackoff = Math.min(baseBackoff, maxBackoff);
-            const jitter = actualBackoff * (Math.random() - 0.5);
-            return actualBackoff + jitter;
-        };
-        const fetchWithRetry = async () => {
-            try {
-                const { data } = await authClient.convex.token();
-                return data?.token || null;
-            }
-            catch (e) {
-                if (!isNetworkError(e)) {
-                    throw e;
-                }
-                if (retries > 10) {
-                    logVerbose(`fetchToken failed with network error, giving up`);
-                    throw e;
-                }
-                const backoff = nextBackoff();
-                logVerbose(`fetchToken failed with network error, attempting retrying in ${backoff}ms`);
-                await new Promise((resolve) => setTimeout(resolve, backoff));
-                return fetchWithRetry();
-            }
-        };
-        return fetchWithRetry();
-    }, [client]);
-    const fetchAccessToken = useCallback(async ({ forceRefreshToken }) => {
-        if (forceRefreshToken) {
-            const token = await fetchToken();
-            logVerbose(`returning retrieved token`);
-            return token;
-        }
-        return null;
-    }, [fetchToken]);
-    useEffect(() => {
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        (async () => {
-            const url = new URL(window.location?.href);
-            const token = url.searchParams.get("ott");
-            if (token) {
-                const authClientWithCrossDomain = authClient;
-                url.searchParams.delete("ott");
-                const result = await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({
-                    token,
-                });
-                const session = result.data?.session;
-                if (session) {
-                    await authClient.getSession({
-                        fetchOptions: {
-                            headers: {
-                                Authorization: `Bearer ${session.token}`,
-                            },
-                        },
-                    });
-                    authClientWithCrossDomain.updateSession();
-                }
-                window.history.replaceState({}, "", url);
-            }
-        })();
-    }, 
-    // Explicitly chosen dependencies.
-    // This effect should mostly only run once
-    // on mount.
-    [client, authClient]);
-    const isAuthenticated = session !== null;
-    const isLoading = isSessionPending;
-    const authState = useMemo(() => ({
-        isLoading,
-        isAuthenticated,
-        fetchAccessToken,
-    }), [fetchAccessToken, isLoading, isAuthenticated]);
-    return (_jsx(ConvexAuthInternalContext.Provider, { value: authState, children: children }));
-}
-//# sourceMappingURL=client.js.map

package/dist/commonjs/react/client.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/react/client.tsx"],"names":[],"mappings":"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"}

package/dist/commonjs/react/old-index.d.ts

@@ -1,9 +0,0 @@
-import { ConvexReactClient } from "convex/react";
-import { PropsWithChildren } from "react";
-import { AuthClient } from "./client";
-export declare function ConvexBetterAuthProvider({ client, authClient, children, }: PropsWithChildren<{
-    client: ConvexReactClient;
-    authClient: AuthClient;
-}>): import("react/jsx-runtime").JSX.Element;
-export { ConvexBetterAuthProvider as ConvexProviderWithBetterAuth };
-//# sourceMappingURL=old-index.d.ts.map

package/dist/commonjs/react/old-index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"old-index.d.ts","sourceRoot":"","sources":["../../../src/react/old-index.tsx"],"names":[],"mappings":"AAEA,OAAO,EAA0B,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAW,MAAM,OAAO,CAAC;AACnD,OAAO,EACL,UAAU,EAIX,MAAM,UAAU,CAAC;AAElB,wBAAgB,wBAAwB,CAAC,EACvC,MAAM,EACN,UAAU,EACV,QAAQ,GACT,EAAE,iBAAiB,CAAC;IACnB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC,2CAgBD;AAGD,OAAO,EAAE,wBAAwB,IAAI,4BAA4B,EAAE,CAAC"}

package/dist/commonjs/react/old-index.js

@@ -1,15 +0,0 @@
-"use client";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { ConvexProviderWithAuth } from "convex/react";
-import { useMemo } from "react";
-import { AuthProvider, useAuth, } from "./client";
-export function ConvexBetterAuthProvider({ client, authClient, children, }) {
-    const convexAuthClient = useMemo(() => ({
-        verbose: client.options?.verbose,
-        logger: client.logger,
-    }), [client]);
-    return (_jsx(AuthProvider, { client: convexAuthClient, authClient: authClient, children: _jsx(ConvexProviderWithAuth, { client: client, useAuth: useAuth, children: children }) }));
-}
-// TODO: Remove, short-lived alias
-export { ConvexBetterAuthProvider as ConvexProviderWithBetterAuth };
-//# sourceMappingURL=old-index.js.map

package/dist/commonjs/react/old-index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"old-index.js","sourceRoot":"","sources":["../../../src/react/old-index.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;AAEb,OAAO,EAAE,sBAAsB,EAAqB,MAAM,cAAc,CAAC;AACzE,OAAO,EAAqB,OAAO,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAEL,YAAY,EACZ,OAAO,GAER,MAAM,UAAU,CAAC;AAElB,MAAM,UAAU,wBAAwB,CAAC,EACvC,MAAM,EACN,UAAU,EACV,QAAQ,GAIR;IACA,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CACH,CAAC;QACC,OAAO,EAAG,MAAc,CAAC,OAAO,EAAE,OAAO;QACzC,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAA4B,EAC/B,CAAC,MAAM,CAAC,CACT,CAAC;IACF,OAAO,CACL,KAAC,YAAY,IAAC,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,YAC5D,KAAC,sBAAsB,IAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,YACrD,QAAQ,GACc,GACZ,CAChB,CAAC;AACJ,CAAC;AAED,kCAAkC;AAClC,OAAO,EAAE,wBAAwB,IAAI,4BAA4B,EAAE,CAAC"}

package/dist/esm/react/client.d.ts

@@ -1,31 +0,0 @@
-import { ConvexReactClient } from "convex/react";
-import { ReactNode } from "react";
-import { createAuthClient } from "better-auth/react";
-import { convexClient, crossDomainClient } from "../client/plugins/index.js";
-import { BetterAuthClientPlugin, ClientOptions } from "better-auth";
-export declare function useAuth(): {
-    isLoading: boolean;
-    isAuthenticated: boolean;
-    fetchAccessToken: ({ forceRefreshToken, }: {
-        forceRefreshToken: boolean;
-    }) => Promise<string | null>;
-};
-export type ConvexAuthClient = {
-    verbose?: boolean;
-    logger?: ConvexReactClient["logger"];
-};
-type CrossDomainClient = ReturnType<typeof crossDomainClient>;
-type ConvexClient = ReturnType<typeof convexClient>;
-type PluginsWithCrossDomain = (CrossDomainClient | ConvexClient | BetterAuthClientPlugin)[];
-type PluginsWithoutCrossDomain = (ConvexClient | BetterAuthClientPlugin)[];
-type AuthClientWithPlugins<Plugins extends PluginsWithCrossDomain | PluginsWithoutCrossDomain> = ReturnType<typeof createAuthClient<ClientOptions & {
-    plugins: Plugins;
-}>>;
-export type AuthClient = AuthClientWithPlugins<PluginsWithCrossDomain> | AuthClientWithPlugins<PluginsWithoutCrossDomain>;
-export declare function AuthProvider({ client, authClient, children, }: {
-    client: ConvexAuthClient;
-    authClient: AuthClient;
-    children: ReactNode;
-}): import("react/jsx-runtime").JSX.Element;
-export {};
-//# sourceMappingURL=client.d.ts.map

package/dist/esm/react/client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/react/client.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,EAEL,SAAS,EAKV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAYpE,wBAAgB,OAAO;eATV,OAAO;qBACD,OAAO;sBACN,CAAC,EACjB,iBAAiB,GAClB,EAAE;QACD,iBAAiB,EAAE,OAAO,CAAC;KAC5B,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;EAK7B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;CACtC,CAAC;AAEF,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC9D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AACpD,KAAK,sBAAsB,GAAG,CAC1B,iBAAiB,GACjB,YAAY,GACZ,sBAAsB,CACzB,EAAE,CAAC;AACJ,KAAK,yBAAyB,GAAG,CAAC,YAAY,GAAG,sBAAsB,CAAC,EAAE,CAAC;AAC3E,KAAK,qBAAqB,CACxB,OAAO,SAAS,sBAAsB,GAAG,yBAAyB,IAChE,UAAU,CACZ,OAAO,gBAAgB,CACrB,aAAa,GAAG;IACd,OAAO,EAAE,OAAO,CAAC;CAClB,CACF,CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,qBAAqB,CAAC,sBAAsB,CAAC,GAC7C,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;AAErD,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,UAAU,EACV,QAAQ,GACT,EAAE;IACD,MAAM,EAAE,gBAAgB,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,SAAS,CAAC;CACrB,2CAmHA"}