better-auth 0.4.0 → 0.4.2-beta.1

package/dist/cli.js

@@ -267,7 +267,7 @@ var createKyselyAdapter = async (config) => {
 };
 
 // src/cli/commands/migrate.ts
-import ora from "ora";
+import yoctoSpinner from "yocto-spinner";
 import chalk from "chalk";
 import prompts from "prompts";
 
@@ -726,7 +726,7 @@ var migrate = new Command("migrate").option(
     );
     process.exit(1);
   }
-  const spinner = ora("preparing migration...").start();
+  const spinner = yoctoSpinner({ text: "preparing migration..." }).start();
   const { toBeAdded, toBeCreated, runMigrations } = await getMigrations(config);
   if (!toBeAdded.length && !toBeCreated.length) {
     spinner.stop();
@@ -766,7 +766,7 @@ import { Command as Command2 } from "commander";
 import { z as z2 } from "zod";
 import { existsSync as existsSync3 } from "fs";
 import path4 from "path";
-import ora2 from "ora";
+import yoctoSpinner2 from "yocto-spinner";
 import prompts2 from "prompts";
 
 // src/adapters/kysely-adapter/index.ts
@@ -1105,7 +1105,7 @@ var generate = new Command2("generate").option(
     );
     return;
   }
-  const spinner = ora2("preparing schema...").start();
+  const spinner = yoctoSpinner2({ text: "preparing schema..." }).start();
   const adapter = await getAdapter(config, true).catch((e) => {
     logger.error(e.message);
     process.exit(1);

package/dist/client/plugins.d.ts

@@ -6,10 +6,10 @@ import { o as organization, j as Organization, M as Member, I as Invitation, u a
 export { g as getPasskeyActions, c as passkeyClient, a as twoFactorClient } from '../index-DCBFTxDp.js';
 import { P as Prettify } from '../helper-DPDj8Nix.js';
 import { F as FieldAttribute, B as BetterAuthOptions, b as BetterAuthPlugin } from '../index-C6jmDLjB.js';
-import '../types-Bs23H3QM.js';
-import 'zod';
-import 'arctic';
-import 'better-call';
+import * as better_call from 'better-call';
+import { z } from 'zod';
+import { U as User } from '../types-Bs23H3QM.js';
+import { OAuth2Tokens } from 'arctic';
 import '@simplewebauthn/types';
 import 'kysely';
 import 'better-sqlite3';
@@ -256,4 +256,196 @@ declare const adminClient: () => {
     $InferServerPlugin: ReturnType<typeof admin>;
 };
 
-export { adminClient, anonymousClient, inferAdditionalFields, magicLinkClient, organizationClient, phoneNumberClient, usernameClient };
+/**
+ * Configuration interface for generic OAuth providers.
+ */
+interface GenericOAuthConfig {
+    /** Unique identifier for the OAuth provider */
+    providerId: string;
+    /**
+     * URL to fetch OAuth 2.0 configuration.
+     * If provided, the authorization and token endpoints will be fetched from this URL.
+     */
+    discoveryUrl?: string;
+    /**
+     * Type of OAuth flow.
+     * @default "oauth2"
+     */
+    type?: "oauth2" | "oidc";
+    /**
+     * URL for the authorization endpoint.
+     * Optional if using discoveryUrl.
+     */
+    authorizationUrl?: string;
+    /**
+     * URL for the token endpoint.
+     * Optional if using discoveryUrl.
+     */
+    tokenUrl?: string;
+    /**
+     * URL for the user info endpoint.
+     * Optional if using discoveryUrl.
+     */
+    userInfoUrl?: string;
+    /** OAuth client ID */
+    clientId: string;
+    /** OAuth client secret */
+    clientSecret: string;
+    /**
+     * Array of OAuth scopes to request.
+     * @default []
+     */
+    scopes?: string[];
+    /**
+     * Custom redirect URI.
+     * If not provided, a default URI will be constructed.
+     */
+    redirectURI?: string;
+    /**
+     * OAuth response type.
+     * @default "code"
+     */
+    responseType?: string;
+    /**
+     * Prompt parameter for the authorization request.
+     * Controls the authentication experience for the user.
+     */
+    prompt?: string;
+    /**
+     * Whether to use PKCE (Proof Key for Code Exchange)
+     * @default false
+     */
+    pkce?: boolean;
+    /**
+     * Access type for the authorization request.
+     * Use "offline" to request a refresh token.
+     */
+    accessType?: string;
+    /**
+     * Custom function to fetch user info.
+     * If provided, this function will be used instead of the default user info fetching logic.
+     * @param tokens - The OAuth tokens received after successful authentication
+     * @returns A promise that resolves to a User object or null
+     */
+    getUserInfo?: (tokens: OAuth2Tokens) => Promise<User | null>;
+}
+interface GenericOAuthOptions {
+    /**
+     * Array of OAuth provider configurations.
+     */
+    config: GenericOAuthConfig[];
+}
+/**
+ * A generic OAuth plugin that can be used to add OAuth support to any provider
+ */
+declare const genericOAuth: (options: GenericOAuthOptions) => {
+    id: "generic-oauth";
+    endpoints: {
+        signInWithOAuth2: {
+            <C extends [better_call.Context<"/sign-in/oauth2", {
+                method: "POST";
+                query: z.ZodOptional<z.ZodObject<{
+                    /**
+                     * Redirect to the current URL after the
+                     * user has signed in.
+                     */
+                    currentURL: z.ZodOptional<z.ZodString>;
+                }, "strip", z.ZodTypeAny, {
+                    currentURL?: string | undefined;
+                }, {
+                    currentURL?: string | undefined;
+                }>>;
+                body: z.ZodObject<{
+                    providerId: z.ZodString;
+                    callbackURL: z.ZodOptional<z.ZodString>;
+                }, "strip", z.ZodTypeAny, {
+                    providerId: string;
+                    callbackURL?: string | undefined;
+                }, {
+                    providerId: string;
+                    callbackURL?: string | undefined;
+                }>;
+            }>]>(...ctx: C): Promise<C extends [{
+                asResponse: true;
+            }] ? Response : {
+                url: string;
+                state: string;
+                codeVerifier: string;
+                redirect: boolean;
+            }>;
+            path: "/sign-in/oauth2";
+            options: {
+                method: "POST";
+                query: z.ZodOptional<z.ZodObject<{
+                    /**
+                     * Redirect to the current URL after the
+                     * user has signed in.
+                     */
+                    currentURL: z.ZodOptional<z.ZodString>;
+                }, "strip", z.ZodTypeAny, {
+                    currentURL?: string | undefined;
+                }, {
+                    currentURL?: string | undefined;
+                }>>;
+                body: z.ZodObject<{
+                    providerId: z.ZodString;
+                    callbackURL: z.ZodOptional<z.ZodString>;
+                }, "strip", z.ZodTypeAny, {
+                    providerId: string;
+                    callbackURL?: string | undefined;
+                }, {
+                    providerId: string;
+                    callbackURL?: string | undefined;
+                }>;
+            };
+            method: better_call.Method | better_call.Method[];
+            headers: Headers;
+        };
+        oAuth2Callback: {
+            <C extends [better_call.Context<"/oauth2/callback/:providerId", {
+                method: "GET";
+                query: z.ZodObject<{
+                    code: z.ZodOptional<z.ZodString>;
+                    error: z.ZodOptional<z.ZodString>;
+                    state: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    state: string;
+                    code?: string | undefined;
+                    error?: string | undefined;
+                }, {
+                    state: string;
+                    code?: string | undefined;
+                    error?: string | undefined;
+                }>;
+            }>]>(...ctx: C): Promise<C extends [{
+                asResponse: true;
+            }] ? Response : never>;
+            path: "/oauth2/callback/:providerId";
+            options: {
+                method: "GET";
+                query: z.ZodObject<{
+                    code: z.ZodOptional<z.ZodString>;
+                    error: z.ZodOptional<z.ZodString>;
+                    state: z.ZodString;
+                }, "strip", z.ZodTypeAny, {
+                    state: string;
+                    code?: string | undefined;
+                    error?: string | undefined;
+                }, {
+                    state: string;
+                    code?: string | undefined;
+                    error?: string | undefined;
+                }>;
+            };
+            method: better_call.Method | better_call.Method[];
+            headers: Headers;
+        };
+    };
+};
+
+declare const genericOAuthClient: () => {
+    id: "generic-oauth-client";
+    $InferServerPlugin: ReturnType<typeof genericOAuth>;
+};
+
+export { adminClient, anonymousClient, genericOAuthClient, inferAdditionalFields, magicLinkClient, organizationClient, phoneNumberClient, usernameClient };

package/dist/client/plugins.js

@@ -522,9 +522,18 @@ var adminClient = () => {
     $InferServerPlugin: {}
   };
 };
+
+// src/plugins/generic-oauth/client.ts
+var genericOAuthClient = () => {
+  return {
+    id: "generic-oauth-client",
+    $InferServerPlugin: {}
+  };
+};
 export {
   adminClient,
   anonymousClient,
+  genericOAuthClient,
   getPasskeyActions,
   inferAdditionalFields,
   magicLinkClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth",
-  "version": "0.4.0",
+  "version": "0.4.2-beta.1",
   "description": "The most comprehensive authentication library for TypeScript.",
   "type": "module",
   "main": "./dist/index.js",
@@ -89,7 +89,6 @@
     "consola": "^3.2.3",
     "defu": "^6.1.4",
     "dotenv": "^16.4.5",
-    "execa": "^9.4.0",
     "jose": "^5.7.0",
     "kysely": "^0.27.4",
     "nanoid": "^5.0.7",
@@ -98,6 +97,8 @@
     "ora": "^8.0.1",
     "oslo": "^1.2.1",
     "prompts": "^2.4.2",
+    "tinyexec": "^0.3.0",
+    "yocto-spinner": "^0.1.1",
     "zod": "^3.22.5"
   },
   "files": [