Merge branch 'main' into main

Author: ThangHuuVu

docs/pages/getting-started/providers/google.mdx

@@ -111,7 +111,7 @@ Alternatively, you can also pass options in the `params` object of `authorizatio
 
 If you need access to the RefreshToken or AccessToken for a Google account and you are not using a database to persist user accounts, this may be something you need to do.
 
-```ts filename="app/api/auth/[...nextauth]/route.ts"
+```ts filename="./auth.ts"
 import Google from "next-auth/providers/google"
 
 export const { handlers, auth, signIn, signOut } = NextAuth({

docs/pages/guides/pages/signin.mdx

@@ -5,7 +5,7 @@ import { Screenshot } from "@/components/Screenshot"
 
 To add a custom sign-in page, you'll need to define the path to your page in the [`pages`](/reference/core/types#pagesoptions) object in your Auth.js configuration. Make sure a route / page actually exists at the path you're defining here!
 
-In additionally, we'll have to export a map of `provider.id` and `provider.name` to easily consume in our custom page if we want to dynamically render the correct buttons, based on what we've defined in our `auth.ts` configuration. Because you can pass your providers to the `providers` array as both a function, or the result of calling that function, this example `providerMap` handles both cases.
+Additionally, we'll have to export a map of `provider.id` and `provider.name` to easily consume in our custom page if we want to dynamically render the correct buttons, based on what we've defined in our `auth.ts` configuration. Because you can pass your providers to the `providers` array as both a function, or the result of calling that function, this example `providerMap` handles both cases.
 
 <Code>
 <Code.Next>

packages/adapter-prisma/src/index.ts

@@ -15,8 +15,7 @@
  *
  * @module @auth/prisma-adapter
  */
-import { type PrismaClient } from "@prisma/client"
-import { PrismaClientKnownRequestError } from "@prisma/client/runtime/library"
+import { Prisma, type PrismaClient } from "@prisma/client"
 import type {
   Adapter,
   AdapterAccount,
@@ -90,7 +89,7 @@ export function PrismaAdapter(
         // If token already used/deleted, just return null
         // https://www.prisma.io/docs/reference/api-reference/error-reference#p2025
         if (
-          error instanceof PrismaClientKnownRequestError &&
+          error instanceof Prisma.PrismaClientKnownRequestError &&
           error.code === "P2025"
         )
           return null

packages/core/src/errors.ts

@@ -41,9 +41,6 @@ type ErrorType =
  * @noInheritDoc
  */
 export class AuthError extends Error {
-  /** The error type. Used to identify the error in the logs.
-   * @internal
-   */
   type: ErrorType
   /**
    * Determines on which page an error should be handled. Typically `signIn` errors can be handled in-page.
@@ -52,7 +49,6 @@ export class AuthError extends Error {
    */
   kind?: "signIn" | "error"
 
-  /** @internal */
   cause?: Record<string, unknown> & { err?: Error }
 
   /** @internal */
@@ -108,7 +104,6 @@ export class SignInError extends AuthError {
  * @noInheritDoc
  */
 export class AdapterError extends AuthError {
-  /** @internal */
   static type = "AdapterError"
 }
 
@@ -118,7 +113,6 @@ export class AdapterError extends AuthError {
  * @noInheritDoc
  */
 export class AccessDenied extends AuthError {
-  /** @internal */
   static type = "AccessDenied"
 }
 
@@ -163,7 +157,6 @@ export class AccessDenied extends AuthError {
  * @noInheritDoc
  */
 export class CallbackRouteError extends AuthError {
-  /** @internal */
   static type = "CallbackRouteError"
 }
 
@@ -177,7 +170,6 @@ export class CallbackRouteError extends AuthError {
  * @noInheritDoc
  */
 export class ErrorPageLoop extends AuthError {
-  /** @internal */
   static type = "ErrorPageLoop"
 }
 
@@ -191,7 +183,6 @@ export class ErrorPageLoop extends AuthError {
  * @noInheritDoc
  */
 export class EventError extends AuthError {
-  /** @internal */
   static type = "EventError"
 }
 
@@ -207,7 +198,6 @@ export class EventError extends AuthError {
  * @noInheritDoc
  */
 export class InvalidCallbackUrl extends AuthError {
-  /** @internal */
   static type = "InvalidCallbackUrl"
 }
 
@@ -219,7 +209,6 @@ export class InvalidCallbackUrl extends AuthError {
  * @noInheritDoc
  */
 export class CredentialsSignin extends SignInError {
-  /** @internal */
   static type = "CredentialsSignin"
   /**
    * The error code that is set in the `code` query parameter of the redirect URL.
@@ -243,7 +232,6 @@ export class CredentialsSignin extends SignInError {
  * @noInheritDoc
  */
 export class InvalidEndpoints extends AuthError {
-  /** @internal */
   static type = "InvalidEndpoints"
 }
 
@@ -255,7 +243,6 @@ export class InvalidEndpoints extends AuthError {
  * @noInheritDoc
  */
 export class InvalidCheck extends AuthError {
-  /** @internal */
   static type = "InvalidCheck"
 }
 
@@ -272,7 +259,6 @@ export class InvalidCheck extends AuthError {
  * @noInheritDoc
  */
 export class JWTSessionError extends AuthError {
-  /** @internal */
   static type = "JWTSessionError"
 }
 
@@ -285,7 +271,6 @@ export class JWTSessionError extends AuthError {
  * @noInheritDoc
  */
 export class MissingAdapter extends AuthError {
-  /** @internal */
   static type = "MissingAdapter"
 }
 
@@ -298,7 +283,6 @@ export class MissingAdapter extends AuthError {
  * @noInheritDoc
  */
 export class MissingAdapterMethods extends AuthError {
-  /** @internal */
   static type = "MissingAdapterMethods"
 }
 
@@ -310,7 +294,6 @@ export class MissingAdapterMethods extends AuthError {
  * @noInheritDoc
  */
 export class MissingAuthorize extends AuthError {
-  /** @internal */
   static type = "MissingAuthorize"
 }
 
@@ -329,7 +312,6 @@ export class MissingAuthorize extends AuthError {
  * @noInheritDoc
  */
 export class MissingSecret extends AuthError {
-  /** @internal */
   static type = "MissingSecret"
 }
 
@@ -347,7 +329,6 @@ export class MissingSecret extends AuthError {
  * @noInheritDoc
  */
 export class OAuthAccountNotLinked extends SignInError {
-  /** @internal */
   static type = "OAuthAccountNotLinked"
 }
 
@@ -359,7 +340,6 @@ export class OAuthAccountNotLinked extends SignInError {
  * @noInheritDoc
  */
 export class OAuthCallbackError extends SignInError {
-  /** @internal */
   static type = "OAuthCallbackError"
 }
 
@@ -370,7 +350,6 @@ export class OAuthCallbackError extends SignInError {
  * @noInheritDoc
  */
 export class OAuthProfileParseError extends AuthError {
-  /** @internal */
   static type = "OAuthProfileParseError"
 }
 
@@ -383,7 +362,6 @@ export class OAuthProfileParseError extends AuthError {
  * @noInheritDoc
  */
 export class SessionTokenError extends AuthError {
-  /** @internal */
   static type = "SessionTokenError"
 }
 
@@ -404,7 +382,6 @@ export class SessionTokenError extends AuthError {
  * @noInheritDoc
  */
 export class OAuthSignInError extends SignInError {
-  /** @internal */
   static type = "OAuthSignInError"
 }
 
@@ -420,7 +397,6 @@ export class OAuthSignInError extends SignInError {
  * @noInheritDoc
  */
 export class EmailSignInError extends SignInError {
-  /** @internal */
   static type = "EmailSignInError"
 }
 
@@ -435,7 +411,6 @@ export class EmailSignInError extends SignInError {
  * @noInheritDoc
  */
 export class SignOutError extends AuthError {
-  /** @internal */
   static type = "SignOutError"
 }
 
@@ -446,7 +421,6 @@ export class SignOutError extends AuthError {
  * @noInheritDoc
  */
 export class UnknownAction extends AuthError {
-  /** @internal */
   static type = "UnknownAction"
 }
 
@@ -457,7 +431,6 @@ export class UnknownAction extends AuthError {
  * @noInheritDoc
  */
 export class UnsupportedStrategy extends AuthError {
-  /** @internal */
   static type = "UnsupportedStrategy"
 }
 
@@ -466,7 +439,6 @@ export class UnsupportedStrategy extends AuthError {
  * @noInheritDoc
  */
 export class InvalidProvider extends AuthError {
-  /** @internal */
   static type = "InvalidProvider"
 }
 
@@ -483,7 +455,6 @@ export class InvalidProvider extends AuthError {
  * @noInheritDoc
  */
 export class UntrustedHost extends AuthError {
-  /** @internal */
   static type = "UntrustedHost"
 }
 
@@ -494,7 +465,6 @@ export class UntrustedHost extends AuthError {
  * @noInheritDoc
  */
 export class Verification extends AuthError {
-  /** @internal */
   static type = "Verification"
 }
 
@@ -510,7 +480,6 @@ export class Verification extends AuthError {
  * @noInheritDoc
  */
 export class MissingCSRF extends SignInError {
-  /** @internal */
   static type = "MissingCSRF"
 }
 
@@ -541,7 +510,6 @@ export function isClientError(error: Error): error is AuthError {
  * @noInheritDoc
  */
 export class DuplicateConditionalUI extends AuthError {
-  /** @internal */
   static type = "DuplicateConditionalUI"
 }
 
@@ -552,7 +520,6 @@ export class DuplicateConditionalUI extends AuthError {
  * @noInheritDoc
  */
 export class MissingWebAuthnAutocomplete extends AuthError {
-  /** @internal */
   static type = "MissingWebAuthnAutocomplete"
 }
 
@@ -561,7 +528,6 @@ export class MissingWebAuthnAutocomplete extends AuthError {
  * @noInheritDoc
  */
 export class WebAuthnVerificationError extends AuthError {
-  /** @internal */
   static type = "WebAuthnVerificationError"
 }
 
@@ -573,7 +539,6 @@ export class WebAuthnVerificationError extends AuthError {
  * @noInheritDoc
  */
 export class AccountNotLinked extends SignInError {
-  /** @internal */
   static type = "AccountNotLinked"
 }
 
@@ -582,6 +547,5 @@ export class AccountNotLinked extends SignInError {
  * @noInheritDoc
  */
 export class ExperimentalFeatureNotEnabled extends AuthError {
-  /** @internal */
   static type = "ExperimentalFeatureNotEnabled"
 }

packages/core/src/providers/asgardeo.ts

@@ -45,7 +45,7 @@ export interface AsgardeoProfile extends Record<string, any> {
  * #### Configuration
  *```ts
  * import { Auth } from "@auth/core"
- * import Asgarde from "@auth/core/providers/asgardeo";
+ * import Asgardeo from "@auth/core/providers/asgardeo";
  *
  * const request = new Request(origin)
  * const response = await Auth(request, {

packages/frameworks-qwik/src/index.ts

@@ -110,7 +110,12 @@
  */
 
 import type { AuthConfig } from "@auth/core"
-import { Auth, isAuthAction, skipCSRFCheck, customFetch } from "@auth/core"
+import {
+  Auth,
+  isAuthAction,
+  skipCSRFCheck,
+  customFetch as _customFetch,
+} from "@auth/core"
 import { AuthAction, Session } from "@auth/core/types"
 import { implicit$FirstArg, type QRL } from "@builder.io/qwik"
 import {
@@ -124,7 +129,8 @@ import { EnvGetter } from "@builder.io/qwik-city/middleware/request-handler"
 import { isServer } from "@builder.io/qwik/build"
 import { parseString, splitCookiesString } from "set-cookie-parser"
 
-export { customFetch }
+export const customFetch = isServer ? _customFetch : undefined
+
 export { AuthError, CredentialsSignin } from "@auth/core/errors"
 
 export type {
@@ -149,6 +155,7 @@ export function QwikAuthQrl(
       { providerId, redirectTo: _redirectTo, options, authorizationParams },
       req
     ) => {
+      if (!isServer) return
       const { redirectTo = _redirectTo ?? defaultRedirectTo(req), ...rest } =
         options ?? {}
 
@@ -192,6 +199,7 @@ export function QwikAuthQrl(
 
   const useSignOut = globalAction$(
     async ({ redirectTo }, req) => {
+      if (!isServer) return
       redirectTo ??= defaultRedirectTo(req)
       const authOpts = await authOptions(req)
       setEnvDefaults(req.env, authOpts)
@@ -261,6 +269,7 @@ async function authAction(
   path: string,
   authOptions: QwikAuthConfig
 ) {
+  if (!isServer) return
   const request = new Request(new URL(path, req.request.url), {
     method: req.request.method,
     headers: req.request.headers,
@@ -337,6 +346,7 @@ async function getSessionData(
 }
 
 export const setEnvDefaults = (env: EnvGetter, config: AuthConfig) => {
+  if (!isServer) return
   config.basePath = "/auth"
   if (!config.secret?.length) {
     config.secret = []