better-auth 1.2.6-beta.7 → 1.2.7-beta.1

package/dist/plugins/sso/index.d.ts

@@ -1,8 +1,8 @@
 import * as better_call from 'better-call';
 import { z } from 'zod';
-import { O as OAuth2Tokens } from '../../shared/better-auth.BANAxdkL.js';
-import { U as User } from '../../shared/better-auth.DU2QNVc_.js';
-import '../../shared/better-auth.Bi8FQwDD.js';
+import { O as OAuth2Tokens } from '../../shared/better-auth.DNTAFSt1.js';
+import { U as User } from '../../shared/better-auth.CA2hFK4N.js';
+import '../../shared/better-auth.CYegVoq1.js';
 import 'jose';
 import 'kysely';
 import 'better-sqlite3';
@@ -56,9 +56,14 @@ interface SSOOptions {
     };
     /**
      * Disable implicit sign up for new users. When set to true for the provider,
-     * sign-in need to be calle dwith with requestSignUp as true to create new users.
+     * sign-in need to be called with with requestSignUp as true to create new users.
      */
     disableImplicitSignUp?: boolean;
+    /**
+     * Override user info with the provider info.
+     * @default false
+     */
+    defaultOverrideUserInfo?: boolean;
 }
 declare const sso: (options?: SSOOptions) => {
     id: "sso";
@@ -74,6 +79,7 @@ declare const sso: (options?: SSOOptions) => {
                     authorizationEndpoint?: string | undefined;
                     scopes?: string[] | undefined;
                     tokenEndpoint?: string | undefined;
+                    overrideUserInfo?: boolean | undefined;
                     organizationId?: string | undefined;
                     pkce?: boolean | undefined;
                     userInfoEndpoint?: string | undefined;
@@ -112,20 +118,10 @@ declare const sso: (options?: SSOOptions) => {
                 response: {
                     oidcConfig: OIDCConfig;
                     redirectURI: string;
-                    issuer: string;
-                    domain: string;
-                    organizationId: string | undefined;
-                    userId: string;
-                    providerId: string;
                 };
             } : {
                 oidcConfig: OIDCConfig;
                 redirectURI: string;
-                issuer: string;
-                domain: string;
-                organizationId: string | undefined;
-                userId: string;
-                providerId: string;
             }>;
             options: {
                 method: "POST";
@@ -166,6 +162,7 @@ declare const sso: (options?: SSOOptions) => {
                         extraFields?: Record<string, string> | undefined;
                     }>>;
                     organizationId: z.ZodOptional<z.ZodString>;
+                    overrideUserInfo: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
                 }, "strip", z.ZodTypeAny, {
                     providerId: string;
                     issuer: string;
@@ -175,6 +172,7 @@ declare const sso: (options?: SSOOptions) => {
                     authorizationEndpoint?: string | undefined;
                     scopes?: string[] | undefined;
                     tokenEndpoint?: string | undefined;
+                    overrideUserInfo?: boolean | undefined;
                     organizationId?: string | undefined;
                     pkce?: boolean | undefined;
                     userInfoEndpoint?: string | undefined;
@@ -198,6 +196,7 @@ declare const sso: (options?: SSOOptions) => {
                     authorizationEndpoint?: string | undefined;
                     scopes?: string[] | undefined;
                     tokenEndpoint?: string | undefined;
+                    overrideUserInfo?: boolean | undefined;
                     organizationId?: string | undefined;
                     pkce?: boolean | undefined;
                     userInfoEndpoint?: string | undefined;
@@ -243,6 +242,147 @@ declare const sso: (options?: SSOOptions) => {
                         responses: {
                             "200": {
                                 description: string;
+                                content: {
+                                    "application/json": {
+                                        schema: {
+                                            type: "object";
+                                            properties: {
+                                                issuer: {
+                                                    type: string;
+                                                    format: string;
+                                                    description: string;
+                                                };
+                                                domain: {
+                                                    type: string;
+                                                    description: string;
+                                                };
+                                                oidcConfig: {
+                                                    type: string;
+                                                    properties: {
+                                                        issuer: {
+                                                            type: string;
+                                                            format: string;
+                                                            description: string;
+                                                        };
+                                                        pkce: {
+                                                            type: string;
+                                                            description: string;
+                                                        };
+                                                        clientId: {
+                                                            type: string;
+                                                            description: string;
+                                                        };
+                                                        clientSecret: {
+                                                            type: string;
+                                                            description: string;
+                                                        };
+                                                        authorizationEndpoint: {
+                                                            type: string;
+                                                            format: string;
+                                                            nullable: boolean;
+                                                            description: string;
+                                                        };
+                                                        discoveryEndpoint: {
+                                                            type: string;
+                                                            format: string;
+                                                            description: string;
+                                                        };
+                                                        userInfoEndpoint: {
+                                                            type: string;
+                                                            format: string;
+                                                            nullable: boolean;
+                                                            description: string;
+                                                        };
+                                                        scopes: {
+                                                            type: string;
+                                                            items: {
+                                                                type: string;
+                                                            };
+                                                            nullable: boolean;
+                                                            description: string;
+                                                        };
+                                                        tokenEndpoint: {
+                                                            type: string;
+                                                            format: string;
+                                                            nullable: boolean;
+                                                            description: string;
+                                                        };
+                                                        tokenEndpointAuthentication: {
+                                                            type: string;
+                                                            enum: string[];
+                                                            nullable: boolean;
+                                                            description: string;
+                                                        };
+                                                        jwksEndpoint: {
+                                                            type: string;
+                                                            format: string;
+                                                            nullable: boolean;
+                                                            description: string;
+                                                        };
+                                                        mapping: {
+                                                            type: string;
+                                                            nullable: boolean;
+                                                            properties: {
+                                                                id: {
+                                                                    type: string;
+                                                                    description: string;
+                                                                };
+                                                                email: {
+                                                                    type: string;
+                                                                    description: string;
+                                                                };
+                                                                emailVerified: {
+                                                                    type: string;
+                                                                    nullable: boolean;
+                                                                    description: string;
+                                                                };
+                                                                name: {
+                                                                    type: string;
+                                                                    description: string;
+                                                                };
+                                                                image: {
+                                                                    type: string;
+                                                                    nullable: boolean;
+                                                                    description: string;
+                                                                };
+                                                                extraFields: {
+                                                                    type: string;
+                                                                    additionalProperties: {
+                                                                        type: string;
+                                                                    };
+                                                                    nullable: boolean;
+                                                                    description: string;
+                                                                };
+                                                            };
+                                                            required: string[];
+                                                        };
+                                                    };
+                                                    required: string[];
+                                                    description: string;
+                                                };
+                                                organizationId: {
+                                                    type: string;
+                                                    nullable: boolean;
+                                                    description: string;
+                                                };
+                                                userId: {
+                                                    type: string;
+                                                    description: string;
+                                                };
+                                                providerId: {
+                                                    type: string;
+                                                    description: string;
+                                                };
+                                                redirectURI: {
+                                                    type: string;
+                                                    format: string;
+                                                    description: string;
+                                                };
+                                            };
+                                            required: string[];
+                                        };
+                                    };
+                                };
                             };
                         };
                     };
@@ -366,6 +506,31 @@ declare const sso: (options?: SSOOptions) => {
                                 };
                             };
                         };
+                        responses: {
+                            "200": {
+                                description: string;
+                                content: {
+                                    "application/json": {
+                                        schema: {
+                                            type: "object";
+                                            properties: {
+                                                url: {
+                                                    type: string;
+                                                    format: string;
+                                                    description: string;
+                                                };
+                                                redirect: {
+                                                    type: string;
+                                                    description: string;
+                                                    enum: boolean[];
+                                                };
+                                            };
+                                            required: string[];
+                                        };
+                                    };
+                                };
+                            };
+                        };
                     };
                 };
             } & {
@@ -496,6 +661,7 @@ interface OIDCConfig {
     discoveryEndpoint: string;
     userInfoEndpoint?: string;
     scopes?: string[];
+    overrideUserInfo?: boolean;
     tokenEndpoint?: string;
     tokenEndpointAuthentication?: "client_secret_post" | "client_secret_basic";
     jwksEndpoint?: string;
@@ -509,4 +675,4 @@ interface OIDCConfig {
     };
 }
 
-export { sso };
+export { type OIDCConfig, type SSOOptions, type SSOProvider, sso };

package/dist/plugins/sso/index.mjs

@@ -1,10 +1,10 @@
 import { z } from 'zod';
 import { APIError } from 'better-call';
-import { a as createAuthEndpoint, h as handleOAuthUserInfo, s as sessionMiddleware } from '../../shared/better-auth.D4jH-sJA.mjs';
+import { a as createAuthEndpoint, h as handleOAuthUserInfo, s as sessionMiddleware } from '../../shared/better-auth.CWwVo_61.mjs';
 import { setSessionCookie } from '../../cookies/index.mjs';
-import '../../shared/better-auth.CepcSj5H.mjs';
+import '../../shared/better-auth.Cc72UxUH.mjs';
 import '../../shared/better-auth.8zoxzg-F.mjs';
-import '../../shared/better-auth.DH3YjMQH.mjs';
+import '../../shared/better-auth.Cqykj82J.mjs';
 import 'defu';
 import { v as validateAuthorizationCode, a as validateToken, c as createAuthorizationURL } from '../../shared/better-auth.DCVeP5-W.mjs';
 import { betterFetch, BetterFetchError } from '@better-fetch/fetch';
@@ -23,13 +23,13 @@ import '@noble/hashes/utils';
 import '../../shared/better-auth.B4Qoxdgc.mjs';
 import '@better-auth/utils/random';
 import '../../shared/better-auth.DdzSJf-n.mjs';
+import '../../shared/better-auth.tB5eU6EY.mjs';
 import '../../shared/better-auth.CW6D9eSx.mjs';
 import '../../shared/better-auth.BUPPRXfK.mjs';
 import '@better-auth/utils/hmac';
 import '../../shared/better-auth.DDEbWX-S.mjs';
 import '../../shared/better-auth.VTXNLFMT.mjs';
 import 'jose/errors';
-import '../../shared/better-auth.tB5eU6EY.mjs';
 import '@better-auth/utils/binary';
 
 const sso = (options) => {
@@ -96,7 +96,10 @@ const sso = (options) => {
             }).optional(),
             organizationId: z.string({
               description: "If organization plugin is enabled, the organization id to link the provider to"
-            }).optional()
+            }).optional(),
+            overrideUserInfo: z.boolean({
+              description: "Override user info with the provider info. Defaults to false"
+            }).default(false).optional()
           }),
           use: [sessionMiddleware],
           metadata: {
@@ -105,7 +108,160 @@ const sso = (options) => {
               description: "This endpoint is used to register an OIDC provider. This is used to configure the provider and link it to an organization",
               responses: {
                 "200": {
-                  description: "The created provider"
+                  description: "OIDC provider created successfully",
+                  content: {
+                    "application/json": {
+                      schema: {
+                        type: "object",
+                        properties: {
+                          issuer: {
+                            type: "string",
+                            format: "uri",
+                            description: "The issuer URL of the provider"
+                          },
+                          domain: {
+                            type: "string",
+                            description: "The domain of the provider, used for email matching"
+                          },
+                          oidcConfig: {
+                            type: "object",
+                            properties: {
+                              issuer: {
+                                type: "string",
+                                format: "uri",
+                                description: "The issuer URL of the provider"
+                              },
+                              pkce: {
+                                type: "boolean",
+                                description: "Whether PKCE is enabled for the authorization flow"
+                              },
+                              clientId: {
+                                type: "string",
+                                description: "The client ID for the provider"
+                              },
+                              clientSecret: {
+                                type: "string",
+                                description: "The client secret for the provider"
+                              },
+                              authorizationEndpoint: {
+                                type: "string",
+                                format: "uri",
+                                nullable: true,
+                                description: "The authorization endpoint URL"
+                              },
+                              discoveryEndpoint: {
+                                type: "string",
+                                format: "uri",
+                                description: "The discovery endpoint URL"
+                              },
+                              userInfoEndpoint: {
+                                type: "string",
+                                format: "uri",
+                                nullable: true,
+                                description: "The user info endpoint URL"
+                              },
+                              scopes: {
+                                type: "array",
+                                items: { type: "string" },
+                                nullable: true,
+                                description: "The scopes requested from the provider"
+                              },
+                              tokenEndpoint: {
+                                type: "string",
+                                format: "uri",
+                                nullable: true,
+                                description: "The token endpoint URL"
+                              },
+                              tokenEndpointAuthentication: {
+                                type: "string",
+                                enum: [
+                                  "client_secret_post",
+                                  "client_secret_basic"
+                                ],
+                                nullable: true,
+                                description: "Authentication method for the token endpoint"
+                              },
+                              jwksEndpoint: {
+                                type: "string",
+                                format: "uri",
+                                nullable: true,
+                                description: "The JWKS endpoint URL"
+                              },
+                              mapping: {
+                                type: "object",
+                                nullable: true,
+                                properties: {
+                                  id: {
+                                    type: "string",
+                                    description: "Field mapping for user ID (defaults to 'sub')"
+                                  },
+                                  email: {
+                                    type: "string",
+                                    description: "Field mapping for email (defaults to 'email')"
+                                  },
+                                  emailVerified: {
+                                    type: "string",
+                                    nullable: true,
+                                    description: "Field mapping for email verification (defaults to 'email_verified')"
+                                  },
+                                  name: {
+                                    type: "string",
+                                    description: "Field mapping for name (defaults to 'name')"
+                                  },
+                                  image: {
+                                    type: "string",
+                                    nullable: true,
+                                    description: "Field mapping for image (defaults to 'picture')"
+                                  },
+                                  extraFields: {
+                                    type: "object",
+                                    additionalProperties: { type: "string" },
+                                    nullable: true,
+                                    description: "Additional field mappings"
+                                  }
+                                },
+                                required: ["id", "email", "name"]
+                              }
+                            },
+                            required: [
+                              "issuer",
+                              "pkce",
+                              "clientId",
+                              "clientSecret",
+                              "discoveryEndpoint"
+                            ],
+                            description: "OIDC configuration for the provider"
+                          },
+                          organizationId: {
+                            type: "string",
+                            nullable: true,
+                            description: "ID of the linked organization, if any"
+                          },
+                          userId: {
+                            type: "string",
+                            description: "ID of the user who registered the provider"
+                          },
+                          providerId: {
+                            type: "string",
+                            description: "Unique identifier for the provider"
+                          },
+                          redirectURI: {
+                            type: "string",
+                            format: "uri",
+                            description: "The redirect URI for the provider callback"
+                          }
+                        },
+                        required: [
+                          "issuer",
+                          "domain",
+                          "oidcConfig",
+                          "userId",
+                          "providerId",
+                          "redirectURI"
+                        ]
+                      }
+                    }
+                  }
                 }
               }
             }
@@ -136,7 +292,8 @@ const sso = (options) => {
                 discoveryEndpoint: body.discoveryEndpoint || `${body.issuer}/.well-known/openid-configuration`,
                 mapping: body.mapping,
                 scopes: body.scopes,
-                userinfoEndpoint: body.userInfoEndpoint
+                userinfoEndpoint: body.userInfoEndpoint,
+                overrideUserInfo: ctx.body.overrideUserInfo || options?.defaultOverrideUserInfo || false
               }),
               organizationId: body.organizationId,
               userId: ctx.context.session.user.id,
@@ -222,6 +379,31 @@ const sso = (options) => {
                     }
                   }
                 }
+              },
+              responses: {
+                "200": {
+                  description: "Authorization URL generated successfully for SSO sign-in",
+                  content: {
+                    "application/json": {
+                      schema: {
+                        type: "object",
+                        properties: {
+                          url: {
+                            type: "string",
+                            format: "uri",
+                            description: "The authorization URL to redirect the user to for SSO sign-in"
+                          },
+                          redirect: {
+                            type: "boolean",
+                            description: "Indicates that the client should redirect to the provided URL",
+                            enum: [true]
+                          }
+                        },
+                        required: ["url", "redirect"]
+                      }
+                    }
+                  }
+                }
               }
             }
           }
@@ -477,7 +659,8 @@ const sso = (options) => {
               refreshTokenExpiresAt: tokenResponse.refreshTokenExpiresAt,
               scope: tokenResponse.scopes?.join(",")
             },
-            disableSignUp: options?.disableImplicitSignUp && !requestSignUp
+            disableSignUp: options?.disableImplicitSignUp && !requestSignUp,
+            overrideUserInfo: config.overrideUserInfo
           });
           if (linked.error) {
             throw ctx.redirect(