@convex-dev/better-auth 0.9.7 → 0.9.9

package/src/client/index.ts

@@ -1,25 +1,25 @@
 import {
-  DataModelFromSchemaDefinition,
+  type DataModelFromSchemaDefinition,
   type DefaultFunctionArgs,
-  type Expand,
-  FunctionHandle,
+  type FunctionHandle,
   type FunctionReference,
-  GenericActionCtx,
+  type GenericActionCtx,
   type GenericDataModel,
-  GenericMutationCtx,
+  type GenericMutationCtx,
   type GenericQueryCtx,
-  GenericSchema,
+  type GenericSchema,
   type HttpRouter,
-  SchemaDefinition,
+  type SchemaDefinition,
   httpActionGeneric,
   internalMutationGeneric,
   mutationGeneric,
   paginationOptsValidator,
   queryGeneric,
 } from "convex/server";
-import { type GenericId, Infer, v } from "convex/values";
-import { convexAdapter } from "./adapter";
-import { AdapterInstance, Auth, betterAuth } from "better-auth";
+import { type GenericId, type Infer, v } from "convex/values";
+import { convexAdapter } from "./adapter.js";
+import { type Auth, betterAuth } from "better-auth";
+import type { DBAdapterInstance } from "better-auth/adapters";
 import { asyncMap } from "convex-helpers";
 import { partial } from "convex-helpers/validators";
 import {
@@ -29,20 +29,21 @@ import {
   listOne,
   paginate,
   selectFields,
-} from "./adapterUtils";
+} from "./adapterUtils.js";
 import { corsRouter } from "convex-helpers/server/cors";
 import { version as convexVersion } from "convex";
 import semver from "semver";
-import defaultSchema from "../component/schema";
+import defaultSchema from "../component/schema.js";
 import { getAuthTables } from "better-auth/db";
-import { api } from "../component/_generated/api";
-import { SetOptional } from "type-fest";
+import type { SetOptional } from "type-fest";
+import type { ComponentApi } from "../component/_generated/component.js";
+import type { TableNames } from "../component/_generated/dataModel.js";
 
 export { convexAdapter };
 
 export type CreateAdapter = <Ctx extends GenericCtx<GenericDataModel>>(
   ctx: Ctx
-) => AdapterInstance;
+) => DBAdapterInstance;
 
 export type CreateAuth<
   DataModel extends GenericDataModel,
@@ -66,7 +67,7 @@ if (semver.lt(convexVersion, "1.25.0")) {
 
 const whereValidator = (
   schema: SchemaDefinition<any, any>,
-  tableName: string
+  tableName: TableNames
 ) =>
   v.object({
     field: v.union(
@@ -215,7 +216,8 @@ export const createApi = <
       args: {
         input: v.union(
           ...Object.entries(schema.tables).map(
-            ([tableName, table]: [string, Schema["tables"][string]]) => {
+            ([name, table]: [string, Schema["tables"][string]]) => {
+              const tableName = name as TableNames;
               const fields = partial(table.validator.fields);
               return v.object({
                 model: v.literal(tableName),
@@ -265,7 +267,8 @@ export const createApi = <
       args: {
         input: v.union(
           ...Object.entries(schema.tables).map(
-            ([tableName, table]: [string, Schema["tables"][string]]) => {
+            ([name, table]: [string, Schema["tables"][string]]) => {
+              const tableName = name as TableNames;
               const fields = partial(table.validator.fields);
               return v.object({
                 model: v.literal(tableName),
@@ -337,7 +340,8 @@ export const createApi = <
     deleteOne: mutationGeneric({
       args: {
         input: v.union(
-          ...Object.keys(schema.tables).map((tableName: string) => {
+          ...Object.keys(schema.tables).map((name: string) => {
+            const tableName = name as TableNames;
             return v.object({
               model: v.literal(tableName),
               where: v.optional(v.array(whereValidator(schema, tableName))),
@@ -364,7 +368,8 @@ export const createApi = <
     deleteMany: mutationGeneric({
       args: {
         input: v.union(
-          ...Object.keys(schema.tables).map((tableName: string) => {
+          ...Object.keys(schema.tables).map((name: string) => {
+            const tableName = name as TableNames;
             return v.object({
               model: v.literal(tableName),
               where: v.optional(v.array(whereValidator(schema, tableName))),
@@ -444,11 +449,8 @@ export const createClient = <
   Schema extends SchemaDefinition<GenericSchema, true> = typeof defaultSchema,
 >(
   component: {
-    adapter: SetOptional<
-      UseApi<typeof api>["adapter"],
-      "migrationRemoveUserId"
-    >;
-    adapterTest?: UseApi<typeof api>["adapterTest"];
+    adapter: SetOptional<ComponentApi["adapter"], "migrationRemoveUserId">;
+    adapterTest?: ComponentApi["adapterTest"];
   },
   config?: {
     local?: {
@@ -673,8 +675,23 @@ export const createClient = <
           console.log("options.baseURL", staticAuth.options.baseURL);
           console.log("request headers", request.headers);
         }
+        const nodeENV =
+          (typeof process !== "undefined" &&
+            process.env &&
+            process.env.NODE_ENV) ||
+          "";
+        const isProduction = nodeENV === "production";
         const auth = createAuth(ctx as any);
+        const secure =
+          auth.options.advanced?.useSecureCookies !== undefined
+            ? auth.options.advanced?.useSecureCookies
+            : auth.options.baseURL !== undefined
+              ? auth.options.baseURL.startsWith("https://")
+                ? true
+                : false
+              : isProduction;
         const response = await auth.handler(request);
+        console.log({ nodeENV, isProduction, secure });
         if (config?.verbose) {
           console.log("response headers", response.headers);
         }
@@ -763,34 +780,3 @@ export const createClient = <
     },
   };
 };
-
-/* Type utils follow */
-
-export type OpaqueIds<T> =
-  T extends GenericId<infer _T>
-    ? string
-    : T extends (infer U)[]
-      ? OpaqueIds<U>[]
-      : T extends ArrayBuffer
-        ? ArrayBuffer
-        : T extends object
-          ? { [K in keyof T]: OpaqueIds<T[K]> }
-          : T;
-
-export type UseApi<API> = Expand<{
-  [mod in keyof API]: API[mod] extends FunctionReference<
-    infer FType,
-    "public",
-    infer FArgs,
-    infer FReturnType,
-    infer FComponentPath
-  >
-    ? FunctionReference<
-        FType,
-        "internal",
-        OpaqueIds<FArgs>,
-        OpaqueIds<FReturnType>,
-        FComponentPath
-      >
-    : UseApi<API[mod]>;
-}>;

package/src/client/plugins/index.ts

@@ -1,2 +1,2 @@
-export * from "../../plugins/convex/client";
-export * from "../../plugins/cross-domain/client";
+export * from "../../plugins/convex/client.js";
+export * from "../../plugins/cross-domain/client.js";

package/src/component/_generated/api.ts

@@ -0,0 +1,52 @@
+/* eslint-disable */
+/**
+ * Generated `api` utility.
+ *
+ * THIS CODE IS AUTOMATICALLY GENERATED.
+ *
+ * To regenerate, run `npx convex dev`.
+ * @module
+ */
+
+import type * as adapter from "../adapter.js";
+import type * as adapterTest from "../adapterTest.js";
+
+import type {
+  ApiFromModules,
+  FilterApi,
+  FunctionReference,
+} from "convex/server";
+import { anyApi, componentsGeneric } from "convex/server";
+
+const fullApi: ApiFromModules<{
+  adapter: typeof adapter;
+  adapterTest: typeof adapterTest;
+}> = anyApi as any;
+
+/**
+ * A utility for referencing Convex functions in your app's public API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = api.myModule.myFunction;
+ * ```
+ */
+export const api: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "public">
+> = anyApi as any;
+
+/**
+ * A utility for referencing Convex functions in your app's internal API.
+ *
+ * Usage:
+ * ```js
+ * const myFunctionReference = internal.myModule.myFunction;
+ * ```
+ */
+export const internal: FilterApi<
+  typeof fullApi,
+  FunctionReference<any, "internal">
+> = anyApi as any;
+
+export const components = componentsGeneric() as unknown as {};