From 337a5bf0039243524caa488becc875e44c246c09 Mon Sep 17 00:00:00 2001 From: Dylan Vanmali Date: Thu, 25 Dec 2025 23:19:43 -0800 Subject: [PATCH] chore: update import paths (#7003) --- packages/oauth-provider/src/metadata.ts | 2 +- packages/oauth-provider/src/oauth.ts | 4 +++- packages/oauth-provider/src/register.ts | 2 +- packages/oauth-provider/src/token.ts | 2 +- packages/oauth-provider/src/types/oauth.ts | 2 +- packages/oauth-provider/src/utils/index.ts | 2 +- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/oauth-provider/src/metadata.ts b/packages/oauth-provider/src/metadata.ts index fdd9fafe11..71b8e89cb4 100644 --- a/packages/oauth-provider/src/metadata.ts +++ b/packages/oauth-provider/src/metadata.ts @@ -1,5 +1,5 @@ import type { GenericEndpointContext } from "@better-auth/core"; -import type { JWSAlgorithms, JwtOptions } from "better-auth/plugins/jwt"; +import type { JWSAlgorithms, JwtOptions } from "better-auth/plugins"; import type { OAuthOptions, Scope } from "./types"; import type { AuthServerMetadata, diff --git a/packages/oauth-provider/src/oauth.ts b/packages/oauth-provider/src/oauth.ts index 3a115a7374..e8d29e4451 100644 --- a/packages/oauth-provider/src/oauth.ts +++ b/packages/oauth-provider/src/oauth.ts @@ -149,7 +149,9 @@ export const oauthProvider = >(options: O) => { init: (ctx) => { // Require session id storage on database (secondary-storage only solution not yet supported) if (ctx.options.session && !ctx.options.session.storeSessionInDatabase) { - throw new BetterAuthError("sessions must be stored on database"); + throw new BetterAuthError( + "OAuth Provider requires `session.storeSessionInDatabase: true` when using secondaryStorage", + ); } // Check for jwt plugin registration diff --git a/packages/oauth-provider/src/register.ts b/packages/oauth-provider/src/register.ts index 7449e99b99..f742f9cef2 100644 --- a/packages/oauth-provider/src/register.ts +++ b/packages/oauth-provider/src/register.ts @@ -1,7 +1,7 @@ import type { GenericEndpointContext } from "@better-auth/core"; import { APIError, getSessionFromCtx } from "better-auth/api"; import { generateRandomString } from "better-auth/crypto"; -import { toExpJWT } from "../../better-auth/src/plugins/jwt/utils"; +import { toExpJWT } from "better-auth/plugins"; import type { OAuthOptions, SchemaClient, Scope } from "./types"; import type { OAuthClient } from "./types/oauth"; import { storeClientSecret } from "./utils"; diff --git a/packages/oauth-provider/src/token.ts b/packages/oauth-provider/src/token.ts index d421b111e6..a4d74c543f 100644 --- a/packages/oauth-provider/src/token.ts +++ b/packages/oauth-provider/src/token.ts @@ -2,7 +2,7 @@ import type { GenericEndpointContext } from "@better-auth/core"; import { APIError } from "better-auth/api"; import { generateRandomString } from "better-auth/crypto"; import { generateCodeChallenge } from "better-auth/oauth2"; -import { signJWT, toExpJWT } from "better-auth/plugins/jwt"; +import { signJWT, toExpJWT } from "better-auth/plugins"; import type { Session, User } from "better-auth/types"; import type { JWTPayload } from "jose"; import { SignJWT } from "jose"; diff --git a/packages/oauth-provider/src/types/oauth.ts b/packages/oauth-provider/src/types/oauth.ts index c126dfe2ed..075ddd96d3 100644 --- a/packages/oauth-provider/src/types/oauth.ts +++ b/packages/oauth-provider/src/types/oauth.ts @@ -1,4 +1,4 @@ -import type { JWSAlgorithms } from "better-auth/plugins/jwt"; +import type { JWSAlgorithms } from "better-auth/plugins"; import type { Prompt } from "."; /** diff --git a/packages/oauth-provider/src/utils/index.ts b/packages/oauth-provider/src/utils/index.ts index 0d29f5600b..f69684aac9 100644 --- a/packages/oauth-provider/src/utils/index.ts +++ b/packages/oauth-provider/src/utils/index.ts @@ -7,7 +7,7 @@ import { symmetricDecrypt, symmetricEncrypt, } from "better-auth/crypto"; -import type { jwt } from "better-auth/plugins/jwt"; +import type { jwt } from "better-auth/plugins"; import type { Auth } from "better-auth/types"; import { APIError } from "better-call"; import type { oauthProvider } from "..";