Merge branch 'feat/nextjs-auth' into feat/nextjs-auth-example-app

* JWT Token -> JWT

* document some errors

* improve errors, docs

.github/ISSUE_TEMPLATE/1_bug_framework.yml

@@ -11,7 +11,7 @@ body:
 
         ### Important :exclamation:
 
-        _Providing incorrect/insufficient information or skipping steps to reproduce the issue will result in closing the issue and/or converting to a discussion without further explanation._
+        _Providing incorrect/insufficient information or skipping steps to reproduce the issue may result in closing the issue or converting to a discussion without further explanation._
 
         If you have a generic question specific to your project, it is best asked in Discussions under the [Questions category](https://github.com/nextauthjs/next-auth/discussions/new?category=Questions)
   # Let's wait with this until adoption in other frameworks.

.github/ISSUE_TEMPLATE/2_bug_provider.yml

@@ -31,14 +31,12 @@ body:
         - "Authentik"
         - "Azure Active Directory"
         - "Azure Active Directory B2C"
-        - "Azure DevOps"
         - "Battlenet"
         - "Beyond Identity"
         - "Box"
         - "Bungie"
         - "Cognito"
         - "Coinbase"
-        - "Descope"
         - "Discord"
         - "Dropbox"
         - "EVE Online"

.github/ISSUE_TEMPLATE/3_bug_adapter.yml

@@ -21,22 +21,20 @@ body:
       multiple: true
       options:
         - "Custom adapter"
-        - "@auth/dgraph-adapter"
-        - "@auth/drizzle-adapter"
-        - "@auth/dynamodb-adapter"
-        - "@auth/fauna-adapter"
-        - "@auth/firebase-adapter"
-        - "@auth/kysely-adapter"
-        - "@auth/mikro-orm-adapter"
-        - "@auth/mongodb-adapter"
-        - "@auth/neo4j-adapter"
-        - "@auth/pouchdb-adapter"
-        - "@auth/prisma-adapter"
-        - "@auth/sequelize-adapter"
-        - "@auth/supabase-adapter"
-        - "@auth/typeorm-adapter"
-        - "@auth/upstash-redis-adapter"
-        - "@auth/xata-adapter"
+        - "@next-auth/dgraph-adapter"
+        - "@next-auth/dynamodb-adapter"
+        - "@next-auth/fauna-adapter"
+        - "@next-auth/firebase-adapter"
+        - "@next-auth/mikro-orm-adapter"
+        - "@next-auth/mongodb-adapter"
+        - "@next-auth/neo4j-adapter"
+        - "@next-auth/pouchdb-adapter"
+        - "@next-auth/prisma-adapter"
+        - "@next-auth/sequelize-adapter"
+        - "@next-auth/supabase-adapter"
+        - "@next-auth/typeorm-legacy-adapter"
+        - "@next-auth/upstash-redis-adapter"
+        - "@next-auth/xata-adapter"
     validations:
       required: true
   - type: textarea

.github/issue-labeler.yml

@@ -1,49 +1,43 @@
 # https://github.com/github/issue-labeler#basic-examples
 
 dgraph:
-  - "@auth/dgraph-adapter"
-
-drizzle:
-  - "@auth/drizzle-adapter"
+  - "@next-auth/dgraph-adapter"
 
 dynamodb:
-  - "@auth/dynamodb-adapter"
+  - "@next-auth/dynamodb-adapter"
 
 fauna:
-  - "@auth/fauna-adapter"
+  - "@next-auth/fauna-adapter"
 
 firebase:
-  - "@auth/firebase-adapter"
-
-kysely:
-  - "@auth/kysely-adapter"
+  - "@next-auth/firebase-adapter"
 
 mikro-orm:
-  - "@auth/mikro-orm-adapter"
+  - "@next-auth/mikro-orm-adapter"
 
 mongodb:
-  - "@auth/mongodb-adapter"
+  - "@next-auth/mongodb-adapter"
 
 neo4j:
-  - "@auth/neo4j-adapter"
+  - "@next-auth/neo4j-adapter"
 
 pouchdb:
-  - "@auth/pouchdb-adapter"
+  - "@next-auth/pouchdb-adapter"
 
 prisma:
-  - "@auth/prisma-adapter"
+  - "@next-auth/prisma-adapter"
 
 sequelize:
-  - "@auth/sequelize-adapter"
+  - "@next-auth/sequelize-adapter"
 
 supabase:
-  - "@auth/supabase-adapter"
+  - "@next-auth/supabase-adapter"
 
-typeorm:
-  - "@auth/typeorm-adapter"
+typeorm-legacy:
+  - "@next-auth/typeorm-legacy-adapter"
 
 upstash-redis:
-  - "@auth/upstash-redis-adapter"
+  - "@next-auth/upstash-redis-adapter"
 
 xata:
-  - "@auth/xata-adapter"
+  - "@next-auth/xata-adapter"

.github/pr-labeler.yml

@@ -15,13 +15,12 @@ neo4j: ["packages/adapter-neo4j/**/*"]
 playgrounds: ["apps/playgrounds/**/*"]
 pouchdb: ["packages/adapter-pouchdb/**/*"]
 prisma: ["packages/adapter-prisma/**/*"]
-kysely: ["packages/adapter-kysely/**/*"]
 providers: ["packages/core/src/providers/**/*"]
 sequelize: ["packages/adapter-sequelize/**/*"]
 solidjs: ["packages/frameworks-solid-start/**/*"]
 supabase: ["packages/adapter-supabase/**/*"]
 svelte: ["packages/frameworks-sveltekit/**/*"]
 test: ["**test**/*"]
-typeorm: ["packages/adapter-typeorm/**/*"]
+typeorm-legacy: ["packages/adapter-typeorm-legacy/**/*"]
 upstash-redis: ["packages/adapter-upstash-redis/**/*"]
 xata: ["packages/adapter-xata/**/*"]

.github/version-pr/index.js

@@ -5,15 +5,14 @@ const core = require("@actions/core")
 try {
   const packageJSONPath = path.join(
     process.cwd(),
-    `packages/${process.env.PACKAGE_PATH || "next-auth"}/package.json`
+    "packages/next-auth/package.json"
   )
   const packageJSON = JSON.parse(fs.readFileSync(packageJSONPath, "utf8"))
 
   const sha8 = process.env.GITHUB_SHA.substring(0, 8)
-  const prefix = "0.0.0-"
-  const pr = process.env.PR_NUMBER
-  const source = pr ? `pr.${pr}` : "manual"
-  const packageVersion = `${prefix}${source}.${sha8}`
+  const prNumber = process.env.PR_NUMBER
+
+  const packageVersion = `0.0.0-pr.${prNumber}.${sha8}`
   packageJSON.version = packageVersion
   core.setOutput("version", packageVersion)
   fs.writeFileSync(packageJSONPath, JSON.stringify(packageJSON))

.github/workflows/release.yml

@@ -8,57 +8,6 @@ on:
       - next
       - 3.x
   pull_request:
-  # TODO: Support latest releases
-  workflow_dispatch:
-    inputs:
-      name:
-        type: choice
-        description: Package name (npm)
-        options:
-          - "@auth/core"
-          - "@auth/dgraph-adapter"
-          - "@auth/drizzle-adapter"
-          - "@auth/dynamodb-adapter"
-          - "@auth/fauna-adapter"
-          - "@auth/firebase-adapter"
-          - "@auth/mikro-orm-adapter"
-          - "@auth/mongodb-adapter"
-          - "@auth/neo4j-adapter"
-          - "@auth/pouchdb-adapter"
-          - "@auth/prisma-adapter"
-          - "@auth/sequelize-adapter"
-          - "@auth/supabase-adapter"
-          - "@auth/typeorm-adapter"
-          - "@auth/upstash-redis-adapter"
-          - "@auth/xata-adapter"
-          - "next-auth"
-      # TODO: Infer from package name
-      path:
-        type: choice
-        description: Directory name (packages/*)
-        options:
-          - "core"
-          - "frameworks-nextjs"
-          - "adapter-dgraph"
-          - "adapter-drizzle"
-          - "adapter-dynamodb"
-          - "adapter-fauna"
-          - "adapter-firebase"
-          - "adapter-mikro-orm"
-          - "adapter-mongodb"
-          - "adapter-neo4j"
-          - "adapter-pouchdb"
-          - "adapter-prisma"
-          - "adapter-sequelize"
-          - "adapter-supabase"
-          - "adapter-typeorm"
-          - "adapter-upstash-redis"
-          - "adapter-xata"
-          - "next-auth"
-env:
-  TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-  TURBO_TEAM: ${{ vars.TURBO_TEAM }}
-  FORCE_COLOR: true
 
 jobs:
   test:
@@ -75,17 +24,16 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
-      - name: Build
-        run: pnpm build
       - name: Run tests
         run: pnpm test
         timeout-minutes: 15
         env:
           UPSTASH_REDIS_URL: ${{ secrets.UPSTASH_REDIS_URL }}
           UPSTASH_REDIS_KEY: ${{ secrets.UPSTASH_REDIS_KEY }}
+          TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+          TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       # - name: Run E2E tests
       #   if: github.repository == 'nextauthjs/next-auth'
       #   run: pnpm e2e
@@ -94,7 +42,7 @@ jobs:
       #     AUTH0_USERNAME: ${{ secrets.AUTH0_USERNAME }}
       #     AUTH0_PASSWORD: ${{ secrets.AUTH0_PASSWORD }}
       #     TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-      #     TURBO_TEAM: ${{ vars.TURBO_TEAM }}
+      #     TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
       # - name: Upload E2E artifacts
       #   if: github.repository == 'nextauthjs/next-auth'
       #   uses: actions/upload-artifact@v3
@@ -125,7 +73,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
       - name: Publish to npm and GitHub
@@ -150,7 +97,6 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
-          cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
       - name: Determine version
@@ -176,36 +122,3 @@ jobs:
         env:
           VERSION: ${{ steps.determine-version.outputs.version }}
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-  release-manual:
-    name: Publish manually
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    steps:
-      - name: Init
-        uses: actions/checkout@v3
-      - name: Install pnpm
-        uses: pnpm/action-setup@v2.2.4
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "pnpm"
-      - name: Install dependencies
-        run: pnpm install
-      - name: Determine version
-        uses: ./.github/version-pr
-        id: determine-version
-        env:
-          PACKAGE_PATH: ${{ github.event.inputs.path }}
-      - name: Publish to npm
-        run: |
-          pnpm build
-          cd packages/$PACKAGE_PATH
-          echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
-          pnpm publish --no-git-checks --access public --tag experimental
-          echo "🎉 Experimental release published 📦️ on npm: https://npmjs.com/package/${{ github.event.inputs.name }}/v/${{ env.VERSION }}"
-          echo "Install via: pnpm add ${{ github.event.inputs.name }}@${{ env.VERSION }}"
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          PACKAGE_PATH: ${{ github.event.inputs.path }}
-          VERSION: ${{ steps.determine-version.outputs.version }}

.gitignore

@@ -6,8 +6,6 @@
 .env.development.local
 .env.test.local
 .env.production.local
-packages/*/.npmrc
-
 
 npm-debug.log*
 yarn-debug.log*
@@ -28,19 +26,10 @@ dist
 # Generated files
 .docusaurus
 .cache-loader
-packages/next-auth/providers
-packages/next-auth/src/providers/oauth-types.ts
-packages/next-auth/client
-packages/next-auth/css
-packages/next-auth/utils
-packages/next-auth/core
-packages/next-auth/jwt
-packages/next-auth/react
-packages/next-auth/next
+
 packages/*/*.js
 packages/*/*.d.ts
 packages/*/*.d.ts.map
-packages/*/lib
 
 # Development app
 apps/dev/src/css
@@ -67,7 +56,6 @@ packages/adapter-prisma/prisma/dev.db
 packages/adapter-prisma/prisma/migrations
 db.sqlite
 packages/adapter-supabase/supabase/.branches
-packages/adapter-drizzle/.drizzle
 
 # Tests
 coverage
@@ -89,7 +77,10 @@ packages/core/providers
 packages/core/src/lib/pages/styles.ts
 docs/docs/reference/core
 docs/docs/reference/sveltekit
+docs/docs/reference/next-auth
 
+# Next.js
+packages/next-auth/lib
 
 # SvelteKit
 packages/frameworks-sveltekit/index.*
@@ -100,7 +91,5 @@ packages/frameworks-sveltekit/vite.config.js.timestamp-*
 packages/frameworks-sveltekit/vite.config.ts.timestamp-*
 
 # Adapters
-docs/docs/reference/adapter
 
-## Drizzle migration folder
-.drizzle
+docs/docs/reference/adapter

.prettierignore

@@ -40,10 +40,6 @@ packages/core/src/lib/pages/styles.ts
 packages/frameworks-sveltekit/package
 packages/frameworks-sveltekit/vite.config.{js,ts}.timestamp-*
 
-# next-auth
-packages/next-auth/src/providers/oauth-types.ts
-packages/next-auth/css/index.css
-
 
 # Adapters
 .branches

.vscode/settings.json

@@ -1,8 +1,8 @@
 {
   "files.exclude": {
-    "packages/core/{lib,providers,*.js,*.d.ts,*.d.ts.map}": true,
-    "packages/next-auth/{client,core,css,jwt,next,providers,react,utils,*.js,*.d.ts}": true
+    "packages/core/{lib,providers,*.js,*.d.ts*}": true,
+    "packages/next-auth/{lib,*.js,*.d.ts*}": true,
   },
   "typescript.tsdk": "node_modules/typescript/lib",
   "openInGitHub.remote.branch": "main"
-}
+}

README.md

@@ -1,153 +0,0 @@
-<p align="center">
-  <br/>
-  <a href="https://authjs.dev" target="_blank"><img width="96px" src="https://authjs.dev/img/logo/logo-sm.png" /></a>
-  <h3 align="center">Auth.js</h3>
-  <p align="center">Authentication for the Web.</p>
-  <p align="center">Open Source. Full Stack. Own Your Data.</p>
-  <p align="center" style="align: center;">
-    <a href="https://npm.im/@auth/prisma-adapter">
-      <img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" />
-    </a>
-    <a href="https://www.npmtrends.com/next-auth">
-      <img src="https://img.shields.io/npm/dm/next-auth?style=flat-square" alt="Downloads" />
-    </a>
-    <a href="https://github.com/nextauthjs/next-auth/stargazers">
-      <img src="https://img.shields.io/github/stars/nextauthjs/next-auth?style=flat-square" alt="Github Stars" />
-    </a>
-    <a href="https://www.npmjs.com/package/next-auth">
-      <img src="https://img.shields.io/github/v/release/nextauthjs/next-auth?label=latest&style=flat-square" alt="Github Stable Release" />
-    </a>
-  </p>
-</p>
-
-Auth.js is a set of open-source packages that are built on Web Standard APIs for authentication in modern applications with any framework on any platform in any JS runtime.
-
-See [authjs.dev](https://authjs.dev) for our framework-specific libraries, or check out [next-auth.js.org](https://next-auth.js.org) for `next-auth` (Next.js).
-
-## Features
-
-### Flexible and easy to use
-
-- Designed to work with any OAuth service, it supports 2.0+, OIDC
-- Built-in support for [many popular sign-in services](https://github.com/nextauthjs/next-auth/tree/main/packages/core/src/providers)
-- Email/Passwordless authentication
-- Bring Your Database - or none! - stateless authentication with any backend (Active Directory, LDAP, etc.)
-- Runtime-agnostic, runs anywhere! (Vercel Edge Functions, Node.js, Serverless, etc.)
-
-### Own your data
-
-Auth.js can be used with or without a database.
-
-- An open-source solution that allows you to keep control of your data
-- Built-in support for [MySQL, MariaDB, Postgres, Microsoft SQL Server, MongoDB, SQLite, etc.](https://adapters.authjs.dev)
-- Works great with databases from popular hosting providers
-
-### Secure by default
-
-- Promotes the use of passwordless sign-in mechanisms
-- Designed to be secure by default and encourage best practices for safeguarding user data
-- Uses Cross-Site Request Forgery (CSRF) Tokens on POST routes (sign in, sign out)
-- Default cookie policy aims for the most restrictive policy appropriate for each cookie
-- When JSON Web Tokens are used, they are encrypted by default (JWE) with A256GCM
-- Features tab/window syncing and session polling to support short-lived sessions
-- Attempts to implement the latest guidance published by [Open Web Application Security Project](https://owasp.org)
-
-Advanced configuration allows you to define your routines to handle controlling what accounts are allowed to sign in, for encoding and decoding JSON Web Tokens and to set custom cookie security policies and session properties, so you can control who can sign in and how often sessions have to be re-validated.
-
-### TypeScript
-
-Auth.js libraries are written with type safety in mind. [Check out the docs](https://authjs.dev/getting-started/typescript) for more information.
-
-## Security
-
-If you think you have found a vulnerability (or are not sure) in Auth.js or any of the related packages (i.e. Adapters), we ask you to read our [Security Policy](https://authjs.dev/security) to reach out responsibly. Please do not open Pull Requests/Issues/Discussions before consulting with us.
-
-## Acknowledgments
-
-[Auth.js is made possible thanks to all of its contributors.](https://authjs.dev/contributors)
-
-<a href="https://github.com/nextauthjs/next-auth/graphs/contributors">
-  <img width="500px" src="https://contrib.rocks/image?repo=nextauthjs/next-auth" />
-</a>
-<div>
-<a href="https://vercel.com?utm_source=nextauthjs&utm_campaign=oss"></a>
-</div>
-
-### Support
-
-We have an [OpenCollective](https://opencollective.com/nextauth) for individuals and companies looking to contribute financially to the project!
-
-<!--sponsors start-->
-<table>
-  <tbody>
-    <tr>
-      <td align="center" valign="top">
-        <a href="https://vercel.com" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/14985020?v=4" alt="Vercel Logo" />
-        </a><br />
-        <div>Vercel</div><br />
-        <sub>🥉 Bronze Financial Sponsor <br /> ☁️ Infrastructure Support</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://prisma.io" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/17219288?v=4" alt="Prisma Logo" />
-        </a><br />
-        <div>Prisma</div><br />
-        <sub>🥉 Bronze Financial Sponsor</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://clerk.com" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/49538330?s=200&v=4" alt="Clerk Logo" />
-        </a><br />
-        <div>Clerk</div><br />
-        <sub>🥉 Bronze Financial Sponsor</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://lowdefy.com" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/47087496?s=200&v=4" alt="Lowdefy Logo" />
-        </a><br />
-        <div>Lowdefy</div><br />
-        <sub>🥉 Bronze Financial Sponsor</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://workos.com" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/47638084?s=200&v=4" alt="WorkOS Logo" />
-        </a><br />
-        <div>WorkOS</div><br />
-        <sub>🥉 Bronze Financial Sponsor</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://www.descope.com" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/97479186?v=4" alt="Descope Logo" />
-        </a><br />
-        <div>Descope</div><br />
-        <sub>🥉 Bronze Financial Sponsor</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://checklyhq.com" target="_blank">
-          <img width="128px" src="https://avatars.githubusercontent.com/u/25982255?v=4" alt="Checkly Logo" />
-        </a><br />
-        <div>Checkly</div><br />
-        <sub>☁️ Infrastructure Support</sub>
-      </td>
-      <td align="center" valign="top">
-        <a href="https://superblog.ai/" target="_blank">
-          <img width="128px" src="https://d33wubrfki0l68.cloudfront.net/cdc4a3833bd878933fcc131655878dbf226ac1c5/10cd6/images/logo_bolt_small.png" alt="superblog Logo" />
-        </a><br />
-        <div>superblog</div><br />
-        <sub>☁️ Infrastructure Support</sub>
-      </td>
-    </tr><tr></tr>
-  </tbody>
-</table>
-<br />
-<!--sponsors end-->
-
-## Contributing
-
-We're open to all community contributions! If you'd like to contribute in any way, please first read
-our [Contributing Guide](https://github.com/nextauthjs/.github/blob/main/CONTRIBUTING.md).
-
-## License
-
-ISC

README.md

@@ -0,0 +1 @@
+packages/next-auth/README.md

apps/dev/nextjs-v4/.env.local.example

@@ -13,9 +13,6 @@ AUTH0_ID=
 AUTH0_SECRET=
 AUTH0_ISSUER=
 
-DESCOPE_ID=
-DESCOPE_SECRET=
-
 KEYCLOAK_ID=
 KEYCLOAK_SECRET=
 KEYCLOAK_ISSUER=

apps/dev/nextjs-v4/README.md

@@ -3,4 +3,4 @@
 This folder contains a Next.js app using NextAuth.js for local development. See the following section on how to start:
 
 [Setting up local environment
-](https://github.com/nextauthjs/.github/blob/main/CONTRIBUTING.md#setting-up-local-environment)
+](https://github.com/nextauthjs/next-auth/blob/main/CONTRIBUTING.md#setting-up-local-environment)

apps/dev/nextjs-v4/package.json

@@ -14,10 +14,10 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@auth/fauna-adapter": "workspace:*",
-    "@auth/prisma-adapter": "workspace:*",
-    "@auth/supabase-adapter": "workspace:*",
-    "@auth/typeorm-adapter": "workspace:*",
+    "@next-auth/fauna-adapter": "workspace:*",
+    "@next-auth/prisma-adapter": "workspace:*",
+    "@next-auth/supabase-adapter": "workspace:*",
+    "@next-auth/typeorm-legacy-adapter": "workspace:*",
     "@prisma/client": "^3",
     "@supabase/supabase-js": "^2.0.5",
     "faunadb": "^4",

apps/dev/nextjs-v4/pages/api/auth-old/[...nextauth].ts

@@ -37,22 +37,22 @@ import WorkOS from "next-auth/providers/workos"
 
 // // Prisma
 // import { PrismaClient } from "@prisma/client"
-// import { PrismaAdapter } from "@auth/prisma-adapter"
+// import { PrismaAdapter } from "@next-auth/prisma-adapter"
 // const client = globalThis.prisma || new PrismaClient()
 // if (process.env.NODE_ENV !== "production") globalThis.prisma = client
 // const adapter = PrismaAdapter(client)
 
 // // Fauna
 // import { Client as FaunaClient } from "faunadb"
-// import { FaunaAdapter } from "@auth/fauna-adapter"
+// import { FaunaAdapter } from "@next-auth/fauna-adapter"
 // const opts = { secret: process.env.FAUNA_SECRET, domain: process.env.FAUNA_DOMAIN }
 // const client = globalThis.fauna || new FaunaClient(opts)
 // if (process.env.NODE_ENV !== "production") globalThis.fauna = client
 // const adapter = FaunaAdapter(client)
 
 // // TypeORM
-// import { TypeORMAdapter } from "@auth/typeorm-adapter"
-// const adapter = TypeORMAdapter({
+// import { TypeORMLegacyAdapter } from "@next-auth/typeorm-legacy-adapter"
+// const adapter = TypeORMLegacyAdapter({
 //   type: "sqlite",
 //   name: "next-auth-test-memory",
 //   database: "./typeorm/dev.db",
@@ -60,7 +60,7 @@ import WorkOS from "next-auth/providers/workos"
 // })
 
 // // Supabase
-// import { SupabaseAdapter } from "@auth/supabase-adapter"
+// import { SupabaseAdapter } from "@next-auth/supabase-adapter"
 // const adapter = SupabaseAdapter({
 //   url: process.env.NEXT_PUBLIC_SUPABASE_URL,
 //   secret: process.env.SUPABASE_SERVICE_ROLE_KEY,
@@ -78,130 +78,45 @@ export const authOptions: NextAuthOptions = {
       credentials: { password: { label: "Password", type: "password" } },
       async authorize(credentials) {
         if (credentials.password !== "pw") return null
-        return {
-          name: "Fill Murray",
-          email: "bill@fillmurray.com",
-          image: "https://www.fillmurray.com/64/64",
-          id: "1",
-          foo: "",
-        }
+        return { name: "Fill Murray", email: "bill@fillmurray.com", image: "https://www.fillmurray.com/64/64", id: "1", foo: "" }
       },
     }),
-    Apple({
-      clientId: process.env.APPLE_ID,
-      clientSecret: process.env.APPLE_SECRET,
-    }),
-    Auth0({
-      clientId: process.env.AUTH0_ID,
-      clientSecret: process.env.AUTH0_SECRET,
-      issuer: process.env.AUTH0_ISSUER,
-    }),
+    Apple({ clientId: process.env.APPLE_ID, clientSecret: process.env.APPLE_SECRET }),
+    Auth0({ clientId: process.env.AUTH0_ID, clientSecret: process.env.AUTH0_SECRET, issuer: process.env.AUTH0_ISSUER }),
     AzureAD({
       clientId: process.env.AZURE_AD_CLIENT_ID,
       clientSecret: process.env.AZURE_AD_CLIENT_SECRET,
       tenantId: process.env.AZURE_AD_TENANT_ID,
     }),
-    AzureB2C({
-      clientId: process.env.AZURE_B2C_ID,
-      clientSecret: process.env.AZURE_B2C_SECRET,
-      issuer: process.env.AZURE_B2C_ISSUER,
-    }),
-    BoxyHQSAML({
-      issuer: "https://jackson-demo.boxyhq.com",
-      clientId: "tenant=boxyhq.com&product=saml-demo.boxyhq.com",
-      clientSecret: "dummy",
-    }),
+    AzureB2C({ clientId: process.env.AZURE_B2C_ID, clientSecret: process.env.AZURE_B2C_SECRET, issuer: process.env.AZURE_B2C_ISSUER }),
+    BoxyHQSAML({ issuer: "https://jackson-demo.boxyhq.com", clientId: "tenant=boxyhq.com&product=saml-demo.boxyhq.com", clientSecret: "dummy" }),
     // Cognito({ clientId: process.env.COGNITO_ID, clientSecret: process.env.COGNITO_SECRET, issuer: process.env.COGNITO_ISSUER }),
-    Discord({
-      clientId: process.env.DISCORD_ID,
-      clientSecret: process.env.DISCORD_SECRET,
-    }),
-    DuendeIDS6({
-      clientId: "interactive.confidential",
-      clientSecret: "secret",
-      issuer: "https://demo.duendesoftware.com",
-    }),
-    Facebook({
-      clientId: process.env.FACEBOOK_ID,
-      clientSecret: process.env.FACEBOOK_SECRET,
-    }),
-    Foursquare({
-      clientId: process.env.FOURSQUARE_ID,
-      clientSecret: process.env.FOURSQUARE_SECRET,
-    }),
-    Freshbooks({
-      clientId: process.env.FRESHBOOKS_ID,
-      clientSecret: process.env.FRESHBOOKS_SECRET,
-    }),
-    GitHub({
-      clientId: process.env.GITHUB_ID,
-      clientSecret: process.env.GITHUB_SECRET,
-    }),
-    Gitlab({
-      clientId: process.env.GITLAB_ID,
-      clientSecret: process.env.GITLAB_SECRET,
-    }),
-    Google({
-      clientId: process.env.GOOGLE_ID,
-      clientSecret: process.env.GOOGLE_SECRET,
-    }),
+    Discord({ clientId: process.env.DISCORD_ID, clientSecret: process.env.DISCORD_SECRET }),
+    DuendeIDS6({ clientId: "interactive.confidential", clientSecret: "secret", issuer: "https://demo.duendesoftware.com" }),
+    Facebook({ clientId: process.env.FACEBOOK_ID, clientSecret: process.env.FACEBOOK_SECRET }),
+    Foursquare({ clientId: process.env.FOURSQUARE_ID, clientSecret: process.env.FOURSQUARE_SECRET }),
+    Freshbooks({ clientId: process.env.FRESHBOOKS_ID, clientSecret: process.env.FRESHBOOKS_SECRET }),
+    GitHub({ clientId: process.env.GITHUB_ID, clientSecret: process.env.GITHUB_SECRET }),
+    Gitlab({ clientId: process.env.GITLAB_ID, clientSecret: process.env.GITLAB_SECRET }),
+    Google({ clientId: process.env.GOOGLE_ID, clientSecret: process.env.GOOGLE_SECRET }),
     // IDS4({ clientId: process.env.IDS4_ID, clientSecret: process.env.IDS4_SECRET, issuer: process.env.IDS4_ISSUER }),
-    Instagram({
-      clientId: process.env.INSTAGRAM_ID,
-      clientSecret: process.env.INSTAGRAM_SECRET,
-    }),
+    Instagram({ clientId: process.env.INSTAGRAM_ID, clientSecret: process.env.INSTAGRAM_SECRET }),
     // Keycloak({ clientId: process.env.KEYCLOAK_ID, clientSecret: process.env.KEYCLOAK_SECRET, issuer: process.env.KEYCLOAK_ISSUER }),
-    Line({
-      clientId: process.env.LINE_ID,
-      clientSecret: process.env.LINE_SECRET,
-    }),
-    LinkedIn({
-      clientId: process.env.LINKEDIN_ID,
-      clientSecret: process.env.LINKEDIN_SECRET,
-    }),
-    Mailchimp({
-      clientId: process.env.MAILCHIMP_ID,
-      clientSecret: process.env.MAILCHIMP_SECRET,
-    }),
+    Line({ clientId: process.env.LINE_ID, clientSecret: process.env.LINE_SECRET }),
+    LinkedIn({ clientId: process.env.LINKEDIN_ID, clientSecret: process.env.LINKEDIN_SECRET }),
+    Mailchimp({ clientId: process.env.MAILCHIMP_ID, clientSecret: process.env.MAILCHIMP_SECRET }),
     // Okta({ clientId: process.env.OKTA_ID, clientSecret: process.env.OKTA_SECRET, issuer: process.env.OKTA_ISSUER }),
-    Osu({
-      clientId: process.env.OSU_CLIENT_ID,
-      clientSecret: process.env.OSU_CLIENT_SECRET,
-    }),
-    Patreon({
-      clientId: process.env.PATREON_ID,
-      clientSecret: process.env.PATREON_SECRET,
-    }),
-    Slack({
-      clientId: process.env.SLACK_ID,
-      clientSecret: process.env.SLACK_SECRET,
-    }),
-    Spotify({
-      clientId: process.env.SPOTIFY_ID,
-      clientSecret: process.env.SPOTIFY_SECRET,
-    }),
-    Trakt({
-      clientId: process.env.TRAKT_ID,
-      clientSecret: process.env.TRAKT_SECRET,
-    }),
-    Twitch({
-      clientId: process.env.TWITCH_ID,
-      clientSecret: process.env.TWITCH_SECRET,
-    }),
-    Twitter({
-      clientId: process.env.TWITTER_ID,
-      clientSecret: process.env.TWITTER_SECRET,
-    }),
+    Osu({ clientId: process.env.OSU_CLIENT_ID, clientSecret: process.env.OSU_CLIENT_SECRET }),
+    Patreon({ clientId: process.env.PATREON_ID, clientSecret: process.env.PATREON_SECRET }),
+    Slack({ clientId: process.env.SLACK_ID, clientSecret: process.env.SLACK_SECRET }),
+    Spotify({ clientId: process.env.SPOTIFY_ID, clientSecret: process.env.SPOTIFY_SECRET }),
+    Trakt({ clientId: process.env.TRAKT_ID, clientSecret: process.env.TRAKT_SECRET }),
+    Twitch({ clientId: process.env.TWITCH_ID, clientSecret: process.env.TWITCH_SECRET }),
+    Twitter({ clientId: process.env.TWITTER_ID, clientSecret: process.env.TWITTER_SECRET }),
     // TwitterLegacy({ clientId: process.env.TWITTER_LEGACY_ID, clientSecret: process.env.TWITTER_LEGACY_SECRET }),
     Vk({ clientId: process.env.VK_ID, clientSecret: process.env.VK_SECRET }),
-    Wikimedia({
-      clientId: process.env.WIKIMEDIA_ID,
-      clientSecret: process.env.WIKIMEDIA_SECRET,
-    }),
-    WorkOS({
-      clientId: process.env.WORKOS_ID,
-      clientSecret: process.env.WORKOS_SECRET,
-    }),
+    Wikimedia({ clientId: process.env.WIKIMEDIA_ID, clientSecret: process.env.WIKIMEDIA_SECRET }),
+    WorkOS({ clientId: process.env.WORKOS_ID, clientSecret: process.env.WORKOS_SECRET }),
   ],
 }
 

apps/dev/nextjs/.env.local.example

@@ -22,9 +22,6 @@ BEYOND_IDENTITY_CLIENT_ID=
 BEYOND_IDENTITY_CLIENT_SECRET=
 BEYOND_IDENTITY_ISSUER=
 
-DESCOPE_ID=
-DESCOPE_SECRET=
-
 GITHUB_ID=
 GITHUB_SECRET=
 

apps/dev/nextjs/app/api/auth/[...nextauth]/route.ts

@@ -0,0 +1,3 @@
+import { handlers } from "auth"
+export const { GET, POST } = handlers
+export const runtime = "edge"

apps/dev/nextjs/app/api/protected/route.ts

@@ -0,0 +1,10 @@
+import { auth } from "auth"
+import { NextResponse } from "next/server"
+
+export const GET = auth(function GET(req) {
+  if (req.auth) {
+    return NextResponse.json(req.auth)
+  }
+
+  return NextResponse.json({ message: "Not authenticated" }, { status: 401 })
+})

apps/dev/nextjs/app/server-component/page.tsx

@@ -1,6 +1,37 @@
-import { unstable_getServerSession } from "next-auth/next"
+import { auth } from "auth"
+import { cookies, headers } from "next/headers"
+
+function SignIn({ id, children }: any) {
+  const $cookies = cookies()
+  const csrfToken = $cookies.get("next-auth.csrf-token")?.value.split("|")[0]
+  return (
+    <form action={`/api/auth/signin/${id}`} method="post">
+      <button type="submit">{children}</button>
+      <input type="hidden" name="csrfToken" value={csrfToken} />
+    </form>
+  )
+}
+
+function SignOut({ children }: any) {
+  const $cookies = cookies()
+  const csrfToken = $cookies.get("next-auth.csrf-token")?.value.split("|")[0]
+  return (
+    <form action="/api/auth/signout" method="post">
+      <button type="submit">{children}</button>
+      <input type="hidden" name="csrfToken" value={csrfToken} />
+    </form>
+  )
+}
 
 export default async function Page() {
-  const session = await unstable_getServerSession()
-  return <pre>{JSON.stringify(session, null, 2)}</pre>
+  const session = await auth(headers())
+  if (session) {
+    return (
+      <>
+        <pre>{JSON.stringify(session, null, 2)}</pre>
+        <SignOut>Sign out</SignOut>
+      </>
+    )
+  }
+  return <SignIn id="github">Sign in with github</SignIn>
 }

apps/dev/nextjs/auth.ts

@@ -0,0 +1,21 @@
+import { NextAuth } from "next-auth"
+import GitHub from "@auth/core/providers/github"
+
+export const { handlers, auth } = NextAuth({
+  providers: [GitHub],
+  callbacks: {
+    async authorized({ request, auth }) {
+      // if (request.method === "POST") {
+      // const [, token] = request.headers.get("Authorization")?.split(" ")
+      // const valid = validateToken(token)
+      // // If the request has a valid auth token, it is authorized
+      // if (valid) return true
+      // return NextResponse.json("Invalid auth token", { status: 401 })
+      // }
+
+      // Logged in users are authorized, otherwise, will redirect to login
+      // You could also return a custom redirect instead of the sign-in page
+      return !!auth
+    },
+  },
+})

apps/dev/nextjs/components/footer.js

@@ -1,6 +1,6 @@
 import Link from "next/link"
 import styles from "./footer.module.css"
-import packageJSON from "package.json"
+import packageJSON from "next-auth/package.json"
 
 export default function Footer() {
   return (

apps/dev/nextjs/components/header.js

@@ -76,12 +76,6 @@ export default function Header() {
           <li className={styles.navItem}>
             <Link href="/middleware-protected">Middleware protected</Link>
           </li>
-          <li className={styles.navItem}>
-            <Link href="/supabase-client-rls">Supabase RLS</Link>
-          </li>
-          <li className={styles.navItem}>
-            <Link href="/supabase-ssr">Supabase RLS(SSR)</Link>
-          </li>
         </ul>
       </nav>
     </header>

apps/dev/nextjs/middleware.ts

@@ -1,45 +1,10 @@
-export { default } from "next-auth/middleware"
+// export { auth as default } from "auth"
+import { auth } from "auth"
+import { NextResponse } from "next/server"
+
+export default auth((req) => {
+  if (req.auth) return NextResponse.json(req.auth)
+  return NextResponse.json("Not authorized", { status: 401 })
+})
 
 export const config = { matcher: ["/middleware-protected"] }
-
-// Other ways to use this middleware
-
-// import withAuth from "next-auth/middleware"
-// import { withAuth } from "next-auth/middleware"
-
-// export function middleware(req, ev) {
-//   return withAuth(req)
-// }
-
-// export function middleware(req, ev) {
-//   return withAuth(req, ev)
-// }
-
-// export function middleware(req, ev) {
-//   return withAuth(req, {
-//     callbacks: {
-//       authorized: ({ token }) => !!token,
-//     },
-//   })
-// }
-
-// export default withAuth(function middleware(req, ev) {
-//   console.log(req.nextauth.token)
-// })
-
-// export default withAuth(
-//   function middleware(req, ev) {
-//     console.log(req, ev)
-//   },
-//   {
-//     callbacks: {
-//       authorized: ({ token }) => token.name === "Balázs Orbán",
-//     },
-//   }
-// )
-
-// export default withAuth({
-//   callbacks: {
-//     authorized: ({ token }) => !!token,
-//   },
-// })

apps/dev/nextjs/package.json

@@ -15,14 +15,15 @@
   "license": "ISC",
   "dependencies": {
     "@auth/core": "workspace:*",
-    "@auth/fauna-adapter": "workspace:*",
-    "@auth/prisma-adapter": "workspace:*",
-    "@auth/supabase-adapter": "workspace:*",
-    "@auth/typeorm-adapter": "workspace:*",
+    "next-auth": "workspace:*",
+    "@next-auth/fauna-adapter": "workspace:*",
+    "@next-auth/prisma-adapter": "workspace:*",
+    "@next-auth/supabase-adapter": "workspace:*",
+    "@next-auth/typeorm-legacy-adapter": "workspace:*",
     "@prisma/client": "^3",
     "@supabase/supabase-js": "^2.0.5",
     "faunadb": "^4",
-    "next": "13.4.0",
+    "next": "13.3.2-canary.12",
     "next-auth": "workspace:*",
     "nodemailer": "^6",
     "react": "^18",

apps/dev/nextjs/pages/api/auth-old/[...nextauth].ts

@@ -2,15 +2,14 @@ import { Auth, type AuthConfig } from "@auth/core"
 
 // Providers
 import Apple from "@auth/core/providers/apple"
-// import Asgardeo from "@auth/core/providers/asgardeo"
+import Asgardeo from "@auth/core/providers/asgardeo"
 import Auth0 from "@auth/core/providers/auth0"
 import AzureAD from "@auth/core/providers/azure-ad"
 import AzureB2C from "@auth/core/providers/azure-ad-b2c"
-// import BeyondIdentity from "@auth/core/providers/beyondidentity"
+import BeyondIdentity from "@auth/core/providers/beyondidentity"
 import BoxyHQSAML from "@auth/core/providers/boxyhq-saml"
 // import Cognito from "@auth/core/providers/cognito"
 import Credentials from "@auth/core/providers/credentials"
-import Descope from "@auth/core/providers/descope"
 import Discord from "@auth/core/providers/discord"
 import DuendeIDS6 from "@auth/core/providers/duende-identity-server6"
 // import Email from "@auth/core/providers/email"
@@ -42,22 +41,22 @@ import WorkOS from "@auth/core/providers/workos"
 
 // // Prisma
 // import { PrismaClient } from "@prisma/client"
-// import { PrismaAdapter } from "@auth/prisma-adapter"
+// import { PrismaAdapter } from "@next-auth/prisma-adapter"
 // const client = globalThis.prisma || new PrismaClient()
 // if (process.env.NODE_ENV !== "production") globalThis.prisma = client
 // const adapter = PrismaAdapter(client)
 
 // // Fauna
 // import { Client as FaunaClient } from "faunadb"
-// import { FaunaAdapter } from "@auth/fauna-adapter"
+// import { FaunaAdapter } from "@next-auth/fauna-adapter"
 // const opts = { secret: process.env.FAUNA_SECRET, domain: process.env.FAUNA_DOMAIN }
 // const client = globalThis.fauna || new FaunaClient(opts)
 // if (process.env.NODE_ENV !== "production") globalThis.fauna = client
 // const adapter = FaunaAdapter(client)
 
 // // TypeORM
-// import { TypeORMAdapter } from "@auth/typeorm-adapter"
-// const adapter = TypeORMAdapter({
+// import { TypeORMLegacyAdapter } from "@next-auth/typeorm-legacy-adapter"
+// const adapter = TypeORMLegacyAdapter({
 //   type: "sqlite",
 //   name: "next-auth-test-memory",
 //   database: "./typeorm/dev.db",
@@ -65,7 +64,7 @@ import WorkOS from "@auth/core/providers/workos"
 // })
 
 // // Supabase
-// import { SupabaseAdapter } from "@auth/supabase-adapter"
+// import { SupabaseAdapter } from "@next-auth/supabase-adapter"
 // const adapter = SupabaseAdapter({
 //   url: process.env.NEXT_PUBLIC_SUPABASE_URL,
 //   secret: process.env.SUPABASE_SERVICE_ROLE_KEY,
@@ -86,8 +85,8 @@ export const authConfig: AuthConfig = {
         return { name: "Fill Murray", email: "bill@fillmurray.com", image: "https://www.fillmurray.com/64/64", id: "1", foo: "" }
       },
     }),
-    Apple({ clientId: process.env.APPLE_ID, clientSecret: process.env.APPLE_SECRET as string }),
-    // Asgardeo({ clientId: process.env.ASGARDEO_CLIENT_ID, clientSecret: process.env.ASGARDEO_CLIENT_SECRET, issuer: process.env.ASGARDEO_ISSUER }),
+    Apple({ clientId: process.env.APPLE_ID, clientSecret: process.env.APPLE_SECRET }),
+    Asgardeo({ clientId: process.env.ASGARDEO_CLIENT_ID, clientSecret: process.env.ASGARDEO_CLIENT_SECRET, issuer: process.env.ASGARDEO_ISSUER }),
     Auth0({ clientId: process.env.AUTH0_ID, clientSecret: process.env.AUTH0_SECRET, issuer: process.env.AUTH0_ISSUER }),
     AzureAD({
       clientId: process.env.AZURE_AD_CLIENT_ID,
@@ -95,20 +94,19 @@ export const authConfig: AuthConfig = {
       tenantId: process.env.AZURE_AD_TENANT_ID,
     }),
     AzureB2C({ clientId: process.env.AZURE_B2C_ID, clientSecret: process.env.AZURE_B2C_SECRET, issuer: process.env.AZURE_B2C_ISSUER }),
-    // BeyondIdentity({
-    //   clientId: process.env.BEYOND_IDENTITY_CLIENT_ID,
-    //   clientSecret: process.env.BEYOND_IDENTITY_CLIENT_SECRET,
-    //   issuer: process.env.BEYOND_IDENTITY_ISSUER,
-    // }),
+    BeyondIdentity({
+      clientId: process.env.BEYOND_IDENTITY_CLIENT_ID,
+      clientSecret: process.env.BEYOND_IDENTITY_CLIENT_SECRET,
+      issuer: process.env.BEYOND_IDENTITY_ISSUER,
+    }),
     BoxyHQSAML({ issuer: "https://jackson-demo.boxyhq.com", clientId: "tenant=boxyhq.com&product=saml-demo.boxyhq.com", clientSecret: "dummy" }),
     // Cognito({ clientId: process.env.COGNITO_ID, clientSecret: process.env.COGNITO_SECRET, issuer: process.env.COGNITO_ISSUER }),
-    Descope({ clientId: process.env.DESCOPE_ID, clientSecret: process.env.DESCOPE_SECRET }),
     Discord({ clientId: process.env.DISCORD_ID, clientSecret: process.env.DISCORD_SECRET }),
     DuendeIDS6({ clientId: "interactive.confidential", clientSecret: "secret", issuer: "https://demo.duendesoftware.com" }),
     Facebook({ clientId: process.env.FACEBOOK_ID, clientSecret: process.env.FACEBOOK_SECRET }),
     Foursquare({ clientId: process.env.FOURSQUARE_ID, clientSecret: process.env.FOURSQUARE_SECRET }),
     Freshbooks({ clientId: process.env.FRESHBOOKS_ID, clientSecret: process.env.FRESHBOOKS_SECRET }),
-    GitHub({ clientId: process.env.GITHUB_ID, clientSecret: process.env.GITHUB_SECRET, redirectProxyUrl: process.env.AUTH_REDIRECT_PROXY_URL }),
+    GitHub({ clientId: process.env.GITHUB_ID, clientSecret: process.env.GITHUB_SECRET, redirectProxy: process.env.AUTH_REDIRECT_PROXY_URL }),
     Gitlab({ clientId: process.env.GITLAB_ID, clientSecret: process.env.GITLAB_SECRET }),
     Google({ clientId: process.env.GOOGLE_ID, clientSecret: process.env.GOOGLE_SECRET }),
     // IDS4({ clientId: process.env.IDS4_ID, clientSecret: process.env.IDS4_SECRET, issuer: process.env.IDS4_ISSUER }),
@@ -117,7 +115,7 @@ export const authConfig: AuthConfig = {
     Line({ clientId: process.env.LINE_ID, clientSecret: process.env.LINE_SECRET }),
     LinkedIn({ clientId: process.env.LINKEDIN_ID, clientSecret: process.env.LINKEDIN_SECRET }),
     Mailchimp({ clientId: process.env.MAILCHIMP_ID, clientSecret: process.env.MAILCHIMP_SECRET }),
-    Notion({ clientId: process.env.NOTION_ID, clientSecret: process.env.NOTION_SECRET, redirectUri: process.env.NOTION_REDIRECT_URI as string }),
+    Notion({ clientId: process.env.NOTION_ID, clientSecret: process.env.NOTION_SECRET, redirectUri: process.env.NOTION_REDIRECT_URI }),
     // Okta({ clientId: process.env.OKTA_ID, clientSecret: process.env.OKTA_SECRET, issuer: process.env.OKTA_ISSUER }),
     Osu({ clientId: process.env.OSU_CLIENT_ID, clientSecret: process.env.OSU_CLIENT_SECRET }),
     Patreon({ clientId: process.env.PATREON_ID, clientSecret: process.env.PATREON_SECRET }),

apps/dev/nextjs/pages/api/examples/protected.ts

@@ -1,9 +1,9 @@
 // This is an example of to protect an API route
-import { unstable_getServerSession } from "next-auth/next"
-import { authOptions } from "../auth/[...nextauth]"
+import { authConfig } from "../auth-old/[...nextauth]"
+import { getServerSession } from "next-auth/next"
 
 export default async (req, res) => {
-  const session = await unstable_getServerSession(req, res, authOptions)
+  const session = await getServerSession(req, res, authConfig as any)
 
   if (session) {
     res.send({

apps/dev/nextjs/pages/api/examples/session.js

@@ -1,8 +0,0 @@
-// This is an example of how to access a session from an API route
-import { unstable_getServerSession } from "next-auth/next"
-import { authOptions } from "../auth/[...nextauth]"
-
-export default async (req, res) => {
-  const session = await unstable_getServerSession(req, res, authOptions)
-  res.json(session)
-}

apps/dev/nextjs/pages/api/examples/session.ts

@@ -0,0 +1,8 @@
+import { authConfig } from "../auth-old/[...nextauth]"
+// This is an example of how to access a session from an API route
+import { getServerSession } from "next-auth/next"
+
+export default async (req, res) => {
+  const session = await getServerSession(req, res, authConfig as any)
+  res.json(session)
+}

apps/dev/nextjs/pages/api/examples/supabase-rls.js

@@ -1,30 +0,0 @@
-// This is an example of how to query data from Supabase with RLS.
-// Learn more about Row Levele Security (RLS): https://supabase.com/docs/guides/auth/row-level-security
-import { unstable_getServerSession } from "next-auth/next"
-import { authOptions } from "../auth/[...nextauth]"
-import { createClient } from "@supabase/supabase-js"
-
-export default async (req, res) => {
-  const session = await unstable_getServerSession(req, res, authOptions)
-
-  if (!session)
-    return res.send(JSON.stringify({ error: "No session!" }, null, 2))
-
-  const { supabaseAccessToken } = session
-
-  const supabase = createClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL,
-    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
-    {
-      global: {
-        headers: {
-          Authorization: `Bearer ${supabaseAccessToken}`,
-        },
-      },
-    }
-  )
-  // Now you can query with RLS enabled.
-  const { data, error } = await supabase.from("users").select("*")
-
-  res.send(JSON.stringify({ supabaseAccessToken, data, error }, null, 2))
-}

apps/dev/nextjs/pages/protected-ssr.js

@@ -1,6 +1,6 @@
 // This is an example of how to protect content using server rendering
-import { unstable_getServerSession } from "next-auth/next"
-import { authOptions } from "./api/auth/[...nextauth]"
+import { getServerSession } from "next-auth/next"
+import { authConfig } from "./api/auth-old/[...nextauth]"
 import Layout from "../components/layout"
 import AccessDenied from "../components/access-denied"
 
@@ -26,11 +26,7 @@ export default function Page({ content, session }) {
 }
 
 export async function getServerSideProps(context) {
-  const session = await unstable_getServerSession(
-    context.req,
-    context.res,
-    authOptions
-  )
+  const session = await getServerSession(context.req, context.res, authConfig)
   let content = null
 
   if (session) {

apps/dev/nextjs/pages/server.js

@@ -1,6 +1,6 @@
-import { unstable_getServerSession } from "next-auth/next"
+import { getServerSession } from "next-auth/next"
 import Layout from "../components/layout"
-import { authOptions } from "./api/auth/[...nextauth]"
+import { authConfig } from "./api/auth-old/[...nextauth]"
 
 export default function Page() {
   // As this page uses Server Side Rendering, the `session` will be already
@@ -12,11 +12,11 @@ export default function Page() {
     <Layout>
       <h1>Server Side Rendering</h1>
       <p>
-        This page uses the <strong>unstable_getServerSession()</strong> method
-        in <strong>getServerSideProps()</strong>.
+        This page uses the <strong>getServerSession()</strong> method in{" "}
+        <strong>getServerSideProps()</strong>.
       </p>
       <p>
-        Using <strong>unstable_getServerSession()</strong> in{" "}
+        Using <strong>getServerSession()</strong> in{" "}
         <strong>getServerSideProps()</strong> is currently the recommended
         approach, although the API may still change, if you need to support
         Server Side Rendering with authentication.
@@ -40,11 +40,7 @@ export default function Page() {
 export async function getServerSideProps(context) {
   return {
     props: {
-      session: await unstable_getServerSession(
-        context.req,
-        context.res,
-        authOptions
-      ),
+      session: await getServerSession(context.req, context.res, authConfig),
     },
   }
 }

apps/dev/nextjs/pages/supabase-client-rls.js

@@ -1,48 +0,0 @@
-import Layout from "../components/layout"
-import { useState, useEffect } from "react"
-import { useSession } from "next-auth/react"
-import { createClient } from "@supabase/supabase-js"
-
-export default function Page() {
-  const { data: session } = useSession()
-  const [data, setData] = useState(null)
-
-  useEffect(() => {
-    if (session) {
-      // User is logged in, let's fetch their data.
-      const { supabaseAccessToken } = session
-      const supabase = createClient(
-        process.env.NEXT_PUBLIC_SUPABASE_URL,
-        process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
-        {
-          global: {
-            headers: { Authorization: `Bearer ${supabaseAccessToken}` },
-          },
-        }
-      )
-      // Fetch data with RLS enabled.
-      supabase
-        .from("users")
-        .select("*")
-        .then(({ data }) => setData(data))
-    }
-  }, [session])
-
-  return (
-    <Layout>
-      <h1>Fetch Data from Supabase with RLS</h1>
-      <h2>Client-side data fetching with RLS:</h2>
-      <pre>{JSON.stringify(data, null, 2)}</pre>
-      <h2>API Example</h2>
-      <p>
-        You can also use Supabase in API routes. See the code in the
-        `/pages/api/examples/supabase-rls.js` file.
-      </p>
-      <p>
-        <em>You must be signed in to see responses.</em>
-      </p>
-      <p>/api/examples/supabase-rls</p>
-      <iframe src="/api/examples/supabase-rls" />
-    </Layout>
-  )
-}

apps/dev/nextjs/pages/supabase-ssr.js

@@ -1,68 +0,0 @@
-// This is an example of how to protect content using server rendering
-// and fetching data from Supabase with RLS enabled.
-import { unstable_getServerSession } from "next-auth/next"
-import { authOptions } from "./api/auth/[...nextauth]"
-import { createClient } from "@supabase/supabase-js"
-import Layout from "../components/layout"
-import AccessDenied from "../components/access-denied"
-
-export default function Page({ data, session }) {
-  // If no session exists, display access denied message
-  if (!session) {
-    return (
-      <Layout>
-        <AccessDenied />
-      </Layout>
-    )
-  }
-
-  // If session exists, display content
-  return (
-    <Layout>
-      <h1>Protected Page</h1>
-      <p>Data fetched during SSR from Supabase with RSL enabled:</p>
-      <pre>{JSON.stringify(data, null, 2)}</pre>
-    </Layout>
-  )
-}
-
-export async function getServerSideProps(context) {
-  const session = await unstable_getServerSession(
-    context.req,
-    context.res,
-    authOptions
-  )
-
-  if (!session)
-    return {
-      props: {
-        session,
-        data: null,
-        error: "No session",
-      },
-    }
-
-  const { supabaseAccessToken } = session
-
-  const supabase = createClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL,
-    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
-    {
-      global: {
-        headers: {
-          Authorization: `Bearer ${supabaseAccessToken}`,
-        },
-      },
-    }
-  )
-  // Now you can query with RLS enabled.
-  const { data, error } = await supabase.from("users").select("*")
-
-  return {
-    props: {
-      session,
-      data,
-      error,
-    },
-  }
-}

apps/dev/nextjs/types/nextauth.d.ts

@@ -18,3 +18,12 @@ declare module "next-auth" {
     foo: string
   }
 }
+
+
+declare global {
+  namespace NodeJS {
+    interface ProcessEnv {
+      [key: string]: string;
+    }
+  }
+}

apps/dev/sveltekit/package.json

@@ -15,8 +15,8 @@
     "@sveltejs/kit": "next",
     "svelte": "3.55.0",
     "svelte-check": "2.10.2",
-    "typescript": "5.2.2",
-    "vite": "4.0.5"
+    "typescript": "4.9.4",
+    "vite": "4.0.1"
   },
   "dependencies": {
     "@auth/core": "workspace:*",

apps/examples/next.config.js

@@ -0,0 +1,4 @@
+/** @type {import("next").NextConfig} */
+module.exports = {
+  reactStrictMode: true,
+}

apps/examples/nextjs/.env.local.example

@@ -1,14 +1,11 @@
 NEXTAUTH_URL=http://localhost:3000
-NEXTAUTH_SECRET= # Linux: `openssl rand -hex 32` or go to https://generate-secret.now.sh/32
+NEXTAUTH_SECRET= # Linux: `openssl rand -hex 32` or go to https://generate-secret.vercel.app/32
 
 
 AUTH0_ID=
 AUTH0_SECRET=
 AUTH0_ISSUER=
 
-DESCOPE_ID=
-DESCOPE_SECRET=
-
 FACEBOOK_ID=
 FACEBOOK_SECRET=
 

apps/examples/nextjs/README.md

@@ -8,7 +8,7 @@
    <a href="https://nextjs.org" target="_blank">
    <img height="64" src="https://nextjs.org/static/favicon/android-chrome-192x192.png" />
    </a>
-   <h3 align="center"><b>NextAuth.js</b> - Example App</h3>
+   <h3 align="center"><b>next-auth</b> - Example App</h3>
    <p align="center">
    Open Source. Full Stack. Own Your Data.
    </p>
@@ -36,7 +36,7 @@ This is an example application that shows how `next-auth` is applied to a basic
 
 The deployed version can be found at [`next-auth-example.vercel.app`](https://next-auth-example.vercel.app)
 
-Go to [next-auth.js.org](https://next-auth.js.org) for more information and documentation.
+Go to [authjs.dev](https://authjs.dev) for more information and documentation.
 
 ## Getting Started
 
@@ -66,7 +66,7 @@ You **can** skip configuring a database and come back to it later if you want.
 
 For more information about setting up a database, please check out the following links:
 
-- Docs: [next-auth.js.org/adapters/overview](https://next-auth.js.org/adapters/overview)
+- Docs: [authjs.dev/reference/adapters](https://authjs.dev/reference/adapters)
 
 ### 3. Configure Authentication Providers
 
@@ -76,7 +76,7 @@ For more information about setting up a database, please check out the following
 
 e.g. For Google OAuth you would use: `http://localhost:3000/api/auth/callback/google`
 
-A list of configured providers and their callback URLs is available from the endpoint `/api/auth/providers`. You can find more information at https://next-auth.js.org/configuration/providers/oauth
+A list of configured providers and their callback URLs is available from the endpoint `/api/auth/providers`. You can find more information at [authjs.dev/getting-started/oauth-tutorial](https://authjs.dev/getting-started/oauth-tutorial)
 
 3. You can also choose to specify an SMTP server for passwordless sign in via email.
 
@@ -106,4 +106,4 @@ Follow the [Deployment documentation](https://authjs.dev/guides/basics/deploymen
 <a href="https://vercel.com?utm_source=nextauthjs&utm_campaign=oss">
 <img width="170px" src="https://raw.githubusercontent.com/nextauthjs/next-auth/main/docs/static/img/powered-by-vercel.svg" alt="Powered By Vercel" />
 </a>
-<p align="left">Thanks to Vercel sponsoring this project by allowing it to be deployed for free for the entire Auth.js Team</p>
+<p align="left">Thanks to Vercel sponsoring this project by allowing it to be deployed for free for the entire Auth.js Team</p>

apps/examples/nextjs/app/api/auth/[...nextauth]/route.ts

@@ -0,0 +1,3 @@
+import { handlers } from "auth"
+export const { GET, POST } = handlers
+export const runtime = "edge"

apps/examples/nextjs/app/api/protected/route.ts

@@ -0,0 +1,10 @@
+import { auth } from "auth"
+import { NextResponse } from "next/server"
+
+export const GET = auth(function GET(req) {
+  if (req.auth) {
+    return NextResponse.json(req.auth)
+  }
+
+  return NextResponse.json({ message: "Not authenticated" }, { status: 401 })
+})

apps/examples/nextjs/app/client/page.tsx

@@ -1,15 +1,13 @@
-import Layout from "../components/layout"
-
-export default function ClientPage() {
+export default function Page() {
   return (
-    <Layout>
+    <>
       <h1>Client Side Rendering</h1>
       <p>
         This page uses the <strong>useSession()</strong> React Hook in the{" "}
-        <strong>&lt;Header/&gt;</strong> component.
+        <strong>&lt;/Header&gt;</strong> component.
       </p>
       <p>
-        The <strong>useSession()</strong> React Hook is easy to use and allows
+        The <strong>useSession()</strong> React Hook easy to use and allows
         pages to render very quickly.
       </p>
       <p>
@@ -22,6 +20,6 @@ export default function ClientPage() {
         The disadvantage of <strong>useSession()</strong> is that it requires
         client side JavaScript.
       </p>
-    </Layout>
+    </>
   )
 }

apps/examples/nextjs/app/layout.tsx

@@ -0,0 +1,24 @@
+import Header from "components/header"
+import Footer from "components/footer"
+import './styles.css'
+
+export default function RootLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  return (
+    <html>
+      <head></head>
+      <body>
+        <Header />
+        <main>
+          {children}
+        </main>
+        <Footer />
+      </body>
+    </html>
+  )
+}
+
+export const runtime = "experimental-edge"

apps/examples/nextjs/app/page.tsx

@@ -0,0 +1,13 @@
+export default function Page() {
+  return (
+    <>
+      <h1>NextAuth.js Example</h1>
+      <p>
+        This is an example site to demonstrate how to use{" "}
+        <a href="https://authjs.dev">NextAuth.js</a> for authentication.
+      </p>
+    </>
+  )
+}
+
+export const runtime = "experimental-edge"

apps/examples/nextjs/app/server-component/page.tsx

@@ -0,0 +1,39 @@
+import { auth } from "auth"
+import { cookies, headers } from "next/headers"
+
+function SignIn({ id, children, className }: any) {
+  const $cookies = cookies()
+  const csrfToken = $cookies.get("next-auth.csrf-token")?.value.split("|")[0]
+  return (
+    <form action={`/api/auth/signin/${id}`} method="post">
+      <button className={className} type="submit">{children}</button>
+      <input type="hidden" name="csrfToken" value={csrfToken} />
+    </form>
+  )
+}
+
+function SignOut({ children }: any) {
+  const $cookies = cookies()
+  const csrfToken = $cookies.get("next-auth.csrf-token")?.value.split("|")[0]
+  return (
+    <form action="/api/auth/signout" method="post">
+      <button type="submit">{children}</button>
+      <input type="hidden" name="csrfToken" value={csrfToken} />
+    </form>
+  )
+}
+
+export default async function Page() {
+  const session = await auth(headers())
+  if (session) {
+    return (
+      <>
+        <pre>{JSON.stringify(session, null, 2)}</pre>
+        <SignOut>Sign out</SignOut>
+      </>
+    )
+  }
+  return <SignIn id="github">Sign in with github</SignIn>
+}
+
+export const runtime = "experimental-edge"

apps/examples/nextjs/app/styles.css

@@ -1,4 +1,5 @@
 body {
+  color: red;
   font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont,
     "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif,
     "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
@@ -6,7 +7,7 @@ body {
   max-width: 680px;
   margin: 0 auto;
   background: #fff;
-  color: #333;
+  color: var(--color-text);
 }
 
 li,

apps/examples/nextjs/auth.ts

@@ -0,0 +1,21 @@
+import NextAuth from "next-auth"
+import GitHub from "@auth/core/providers/github"
+
+export const { handlers, auth } = NextAuth({
+  providers: [GitHub],
+  callbacks: {
+    async authorized({ request, auth }) {
+      // if (request.method === "POST") {
+      // const [, token] = request.headers.get("Authorization")?.split(" ")
+      // const valid = validateToken(token)
+      // // If the request has a valid auth token, it is authorized
+      // if (valid) return true
+      // return NextResponse.json("Invalid auth token", { status: 401 })
+      // }
+
+      // Logged in users are authorized, otherwise, will redirect to login
+      // You could also return a custom redirect instead of the sign-in page
+      return !!auth
+    },
+  },
+})

apps/examples/nextjs/components/footer.tsx

@@ -1,6 +1,6 @@
 import Link from "next/link"
 import styles from "./footer.module.css"
-import packageJSON from "../package.json"
+import packageJSON from "next-auth/package.json"
 
 export default function Footer() {
   return (
@@ -8,10 +8,10 @@ export default function Footer() {
       <hr />
       <ul className={styles.navItems}>
         <li className={styles.navItem}>
-          <a href="https://next-auth.js.org">Documentation</a>
+          <a href="https://authjs.dev">Documentation</a>
         </li>
         <li className={styles.navItem}>
-          <a href="https://www.npmjs.com/package/next-auth">NPM</a>
+          <a href="https://www.npmjs.com/package/@auth/core">NPM</a>
         </li>
         <li className={styles.navItem}>
           <a href="https://github.com/nextauthjs/next-auth-example">GitHub</a>
@@ -20,7 +20,7 @@ export default function Footer() {
           <Link href="/policy">Policy</Link>
         </li>
         <li className={styles.navItem}>
-          <em>next-auth@{packageJSON.dependencies["next-auth"]}</em>
+          <em>{packageJSON.version}</em>
         </li>
       </ul>
     </footer>

apps/examples/nextjs/components/header.module.css

@@ -1,5 +1,6 @@
 /* Set min-height to avoid page reflow while session loading */
 .signedInStatus {
+  position: relative;
   display: block;
   min-height: 4rem;
   width: 100%;

apps/examples/nextjs/components/header.tsx

@@ -1,65 +1,63 @@
 import Link from "next/link"
-import { signIn, signOut, useSession } from "next-auth/react"
+import { auth } from "auth"
+import { cookies, headers } from "next/headers"
 import styles from "./header.module.css"
 
-// The approach used in this component shows how to build a sign in and sign out
+function SignIn({ id, children, className }: any) {
+  const $cookies = cookies()
+  const csrfToken = $cookies.get("next-auth.csrf-token")?.value.split("|")[0]
+  return (
+    <form action={`/api/auth/signin/${id}`} method="post">
+      <button className={className} type="submit">{children}</button>
+      <input type="hidden" name="csrfToken" value={csrfToken} />
+    </form>
+  )
+}
+
+function SignOut({ children, className }: any) {
+  const $cookies = cookies()
+  const csrfToken = $cookies.get("next-auth.csrf-token")?.value.split("|")[0]
+  return (
+    <form action="/api/auth/signout" method="post">
+      <button className={className} type="submit">{children}</button>
+      <input type="hidden" name="csrfToken" value={csrfToken} />
+    </form>
+  )
+}
+
+// The approach used in this component shows how to built a sign in and sign out
 // component that works on pages which support both client and server side
 // rendering, and avoids any flash incorrect content on initial page load.
-export default function Header() {
-  const { data: session, status } = useSession()
-  const loading = status === "loading"
+export default async function Header() {
+  const session = await auth(headers())
 
   return (
     <header>
       <noscript>
-        <style>{`.nojs-show { opacity: 1; top: 0; }`}</style>
+        <style>{".nojs-show { opacity: 1; top: 0; }"}</style>
       </noscript>
       <div className={styles.signedInStatus}>
-        <p
-          className={`nojs-show ${
-            !session && loading ? styles.loading : styles.loaded
-          }`}
-        >
+        <p className={`nojs-show ${styles.loaded}`}>
           {!session && (
             <>
               <span className={styles.notSignedInText}>
                 You are not signed in
               </span>
-              <a
-                href={`/api/auth/signin`}
-                className={styles.buttonPrimary}
-                onClick={(e) => {
-                  e.preventDefault()
-                  signIn()
-                }}
-              >
-                Sign in
-              </a>
+              <SignIn className={styles.buttonPrimary}>Sign In</SignIn>
             </>
           )}
-          {session?.user && (
+          {session && (
             <>
               {session.user.image && (
-                <span
-                  style={{ backgroundImage: `url('${session.user.image}')` }}
-                  className={styles.avatar}
-                />
+                <img src={session.user.image} className={styles.avatar} />
               )}
               <span className={styles.signedInText}>
                 <small>Signed in as</small>
                 <br />
-                <strong>{session.user.email ?? session.user.name}</strong>
+                <strong>{session.user.email} </strong>
+                {session.user.name ? `(${session.user.name})` : null}
               </span>
-              <a
-                href={`/api/auth/signout`}
-                className={styles.button}
-                onClick={(e) => {
-                  e.preventDefault()
-                  signOut()
-                }}
-              >
-                Sign out
-              </a>
+              <SignOut className={styles.button}>Sign Out</SignOut>
             </>
           )}
         </p>
@@ -73,7 +71,7 @@ export default function Header() {
             <Link href="/client">Client</Link>
           </li>
           <li className={styles.navItem}>
-            <Link href="/server">Server</Link>
+            <Link href="/server-component">Server</Link>
           </li>
           <li className={styles.navItem}>
             <Link href="/protected">Protected</Link>
@@ -82,13 +80,12 @@ export default function Header() {
             <Link href="/api-example">API</Link>
           </li>
           <li className={styles.navItem}>
-            <Link href="/admin">Admin</Link>
-          </li>
-          <li className={styles.navItem}>
-            <Link href="/me">Me</Link>
+            <Link href="/middleware-protected">Middleware protected</Link>
           </li>
         </ul>
       </nav>
     </header>
   )
 }
+
+export const runtime = "experimental-edge"

apps/examples/nextjs/components/layout.tsx

@@ -1,13 +0,0 @@
-import Header from "./header"
-import Footer from "./footer"
-import type { ReactNode } from "react"
-
-export default function Layout({ children }: { children: ReactNode }) {
-  return (
-    <>
-      <Header />
-      <main>{children}</main>
-      <Footer />
-    </>
-  )
-}

apps/examples/nextjs/middleware.ts

@@ -1,17 +1,10 @@
-import { withAuth } from "next-auth/middleware"
+// export { auth as default } from "auth"
+import { auth } from "auth"
+import { NextResponse } from "next/server"
 
-// More on how NextAuth.js middleware works: https://next-auth.js.org/configuration/nextjs#middleware
-export default withAuth({
-  callbacks: {
-    authorized({ req, token }) {
-      // `/admin` requires admin role
-      if (req.nextUrl.pathname === "/admin") {
-        return token?.userRole === "admin"
-      }
-      // `/me` only requires the user to be logged in
-      return !!token
-    },
-  },
+export default auth((req) => {
+  if (req.auth) return NextResponse.json(req.auth)
+  return NextResponse.json("Not authorized", { status: 401 })
 })
 
-export const config = { matcher: ["/admin", "/me"] }
+export const config = { matcher: ["/middleware-protected"] }

apps/examples/nextjs/next-auth.d.ts

@@ -1,10 +0,0 @@
-import "next-auth/jwt"
-
-// Read more at: https://next-auth.js.org/getting-started/typescript#module-augmentation
-
-declare module "next-auth/jwt" {
-  interface JWT {
-    /** The user's role. */
-    userRole?: "admin"
-  }
-}

apps/examples/nextjs/next.config.js

@@ -1,4 +1,9 @@
 /** @type {import("next").NextConfig} */
 module.exports = {
-  reactStrictMode: true,
+  webpack(config) {
+    config.experiments = { ...config.experiments, topLevelAwait: true }
+    return config
+  },
+  experimental: { appDir: true },
+  typescript: { ignoreBuildErrors: true },
 }

apps/examples/nextjs/package.json

@@ -1,5 +1,6 @@
 {
   "private": true,
+  "name": "nextjs-example-app",
   "description": "An example project for NextAuth.js with Next.js",
   "repository": "https://github.com/nextauthjs/next-auth-example.git",
   "bugs": {
@@ -18,14 +19,15 @@
     "Lluis Agusti <hi@llu.lu>"
   ],
   "dependencies": {
+    "@auth/core": "workspace:*",
     "next": "latest",
-    "next-auth": "latest",
+    "next-auth": "workspace:*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/node": "^18.16.2",
     "@types/react": "^18.2.0",
-    "typescript": "5.2.2"
+    "typescript": "^5.0.4"
   }
 }

apps/examples/nextjs/pages/_app.tsx

@@ -1,18 +0,0 @@
-import { SessionProvider } from "next-auth/react"
-import "./styles.css"
-
-import type { AppProps } from "next/app"
-import type { Session } from "next-auth"
-
-// Use of the <SessionProvider> is mandatory to allow components that call
-// `useSession()` anywhere in your application to access the `session` object.
-export default function App({
-  Component,
-  pageProps: { session, ...pageProps },
-}: AppProps<{ session: Session }>) {
-  return (
-    <SessionProvider session={session}>
-      <Component {...pageProps} />
-    </SessionProvider>
-  )
-}

apps/examples/nextjs/pages/admin.tsx

@@ -1,17 +0,0 @@
-import Layout from "../components/layout"
-
-export default function Page() {
-  return (
-    <Layout>
-      <h1>This page is protected by Middleware</h1>
-      <p>Only admin users can see this page.</p>
-      <p>
-        To learn more about the NextAuth middleware see&nbsp;
-        <a href="https://next-auth.js.org/configuration/nextjs#middleware">
-          the docs
-        </a>
-        .
-      </p>
-    </Layout>
-  )
-}

apps/examples/nextjs/pages/api-example.tsx

@@ -1,19 +0,0 @@
-import Layout from "../components/layout"
-
-export default function ApiExamplePage() {
-  return (
-    <Layout>
-      <h1>API Example</h1>
-      <p>The examples below show responses from the example API endpoints.</p>
-      <p>
-        <em>You must be signed in to see responses.</em>
-      </p>
-      <h2>Session</h2>
-      <p>/api/examples/session</p>
-      <iframe src="/api/examples/session" />
-      <h2>JSON Web Token</h2>
-      <p>/api/examples/jwt</p>
-      <iframe src="/api/examples/jwt" />
-    </Layout>
-  )
-}

apps/examples/nextjs/pages/api/auth/[...nextauth].ts

@@ -1,44 +0,0 @@
-import NextAuth, { NextAuthOptions } from "next-auth"
-import GoogleProvider from "next-auth/providers/google"
-import FacebookProvider from "next-auth/providers/facebook"
-import GithubProvider from "next-auth/providers/github"
-import TwitterProvider from "next-auth/providers/twitter"
-import Auth0Provider from "next-auth/providers/auth0"
-
-// For more information on each option (and a full list of options) go to
-// https://next-auth.js.org/configuration/options
-export const authOptions: NextAuthOptions = {
-  // https://next-auth.js.org/configuration/providers/oauth
-  providers: [
-    Auth0Provider({
-      clientId: process.env.AUTH0_ID,
-      clientSecret: process.env.AUTH0_SECRET,
-      issuer: process.env.AUTH0_ISSUER,
-    }),
-    FacebookProvider({
-      clientId: process.env.FACEBOOK_ID,
-      clientSecret: process.env.FACEBOOK_SECRET,
-    }),
-    GithubProvider({
-      clientId: process.env.GITHUB_ID,
-      clientSecret: process.env.GITHUB_SECRET,
-    }),
-    GoogleProvider({
-      clientId: process.env.GOOGLE_ID,
-      clientSecret: process.env.GOOGLE_SECRET,
-    }),
-    TwitterProvider({
-      clientId: process.env.TWITTER_ID,
-      clientSecret: process.env.TWITTER_SECRET,
-      version: "2.0",
-    }),
-  ],
-  callbacks: {
-    async jwt({ token }) {
-      token.userRole = "admin"
-      return token
-    },
-  },
-}
-
-export default NextAuth(authOptions)

apps/examples/nextjs/pages/api/examples/jwt.ts

@@ -1,14 +0,0 @@
-// This is an example of how to read a JSON Web Token from an API route
-import { getToken } from "next-auth/jwt"
-
-import type { NextApiRequest, NextApiResponse } from "next"
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse
-) {
-  // If you don't have the NEXTAUTH_SECRET environment variable set,
-  // you will have to pass your secret as `secret` to `getToken`
-  const token = await getToken({ req })
-  res.send(JSON.stringify(token, null, 2))
-}

apps/examples/nextjs/pages/api/examples/protected.ts

@@ -1,23 +0,0 @@
-// This is an example of to protect an API route
-import { getServerSession } from "next-auth/next"
-import { authOptions } from "../auth/[...nextauth]"
-
-import type { NextApiRequest, NextApiResponse } from "next"
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse
-) {
-  const session = await getServerSession(req, res, authOptions)
-
-  if (session) {
-    return res.send({
-      content:
-        "This is protected content. You can access this content because you are signed in.",
-    })
-  }
-
-  res.send({
-    error: "You must be signed in to view the protected content on this page.",
-  })
-}

apps/examples/nextjs/pages/api/examples/session.ts

@@ -1,13 +0,0 @@
-// This is an example of how to access a session from an API route
-import { getServerSession } from "next-auth"
-import { authOptions } from "../auth/[...nextauth]"
-
-import type { NextApiRequest, NextApiResponse } from "next"
-
-export default async function handler(
-  req: NextApiRequest,
-  res: NextApiResponse
-) {
-  const session = await getServerSession(req, res, authOptions)
-  res.send(JSON.stringify(session, null, 2))
-}

apps/examples/nextjs/pages/index.tsx

@@ -1,13 +0,0 @@
-import Layout from "../components/layout"
-
-export default function IndexPage() {
-  return (
-    <Layout>
-      <h1>NextAuth.js Example</h1>
-      <p>
-        This is an example site to demonstrate how to use{" "}
-        <a href="https://next-auth.js.org">NextAuth.js</a> for authentication.
-      </p>
-    </Layout>
-  )
-}

apps/examples/nextjs/pages/me.tsx

@@ -1,12 +0,0 @@
-import { useSession } from "next-auth/react"
-import Layout from "../components/layout"
-
-export default function MePage() {
-  const { data } = useSession()
-
-  return (
-    <Layout>
-      <pre>{JSON.stringify(data, null, 2)}</pre>
-    </Layout>
-  )
-}

apps/examples/nextjs/pages/policy.tsx

@@ -1,32 +0,0 @@
-import Layout from "../components/layout"
-
-export default function PolicyPage() {
-  return (
-    <Layout>
-      <p>
-        This is an example site to demonstrate how to use{" "}
-        <a href="https://next-auth.js.org">NextAuth.js</a> for authentication.
-      </p>
-      <h2>Terms of Service</h2>
-      <p>
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-        OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-        MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-        IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-        CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-        TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-        SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-      </p>
-      <h2>Privacy Policy</h2>
-      <p>
-        This site uses JSON Web Tokens and an in-memory database which resets
-        every ~2 hours.
-      </p>
-      <p>
-        Data provided to this site is exclusively used to support signing in and
-        is not passed to any third party services, other than via SMTP or OAuth
-        for the purposes of authentication.
-      </p>
-    </Layout>
-  )
-}

apps/examples/nextjs/pages/protected.tsx

@@ -1,40 +0,0 @@
-import { useState, useEffect } from "react"
-import { useSession } from "next-auth/react"
-import Layout from "../components/layout"
-import AccessDenied from "../components/access-denied"
-
-export default function ProtectedPage() {
-  const { data: session } = useSession()
-  const [content, setContent] = useState()
-
-  // Fetch content from protected route
-  useEffect(() => {
-    const fetchData = async () => {
-      const res = await fetch("/api/examples/protected")
-      const json = await res.json()
-      if (json.content) {
-        setContent(json.content)
-      }
-    }
-    fetchData()
-  }, [session])
-
-  // If no session exists, display access denied message
-  if (!session) {
-    return (
-      <Layout>
-        <AccessDenied />
-      </Layout>
-    )
-  }
-
-  // If session exists, display content
-  return (
-    <Layout>
-      <h1>Protected Page</h1>
-      <p>
-        <strong>{content ?? "\u00a0"}</strong>
-      </p>
-    </Layout>
-  )
-}

apps/examples/nextjs/pages/server.tsx

@@ -1,44 +0,0 @@
-import { getServerSession } from "next-auth/next"
-import { authOptions } from "./api/auth/[...nextauth]"
-import Layout from "../components/layout"
-
-import type { GetServerSidePropsContext } from "next"
-import { useSession } from "next-auth/react"
-
-export default function ServerSidePage() {
-  const { data: session } = useSession()
-  // As this page uses Server Side Rendering, the `session` will be already
-  // populated on render without needing to go through a loading stage.
-  return (
-    <Layout>
-      <h1>Server Side Rendering</h1>
-      <p>
-        This page uses the <strong>getServerSession()</strong> method in{" "}
-        <strong>getServerSideProps()</strong>.
-      </p>
-      <p>
-        Using <strong>getServerSession()</strong> in{" "}
-        <strong>getServerSideProps()</strong> is the recommended approach if you
-        need to support Server Side Rendering with authentication.
-      </p>
-      <p>
-        The advantage of Server Side Rendering is this page does not require
-        client side JavaScript.
-      </p>
-      <p>
-        The disadvantage of Server Side Rendering is that this page is slower to
-        render.
-      </p>
-      <pre>{JSON.stringify(session, null, 2)}</pre>
-    </Layout>
-  )
-}
-
-// Export the `session` prop to use sessions with Server Side Rendering
-export async function getServerSideProps(context: GetServerSidePropsContext) {
-  return {
-    props: {
-      session: await getServerSession(context.req, context.res, authOptions),
-    },
-  }
-}

apps/examples/nextjs/process.d.ts

@@ -12,7 +12,5 @@ declare namespace NodeJS {
     GOOGLE_SECRET: string
     AUTH0_ID: string
     AUTH0_SECRET: string
-    DESCOPE_ID: string
-    DESCOPE_SECRET: string
   }
 }

apps/examples/nextjs/tsconfig.json

@@ -1,10 +1,14 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
+    "target": "esnext",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
     "allowJs": true,
     "skipLibCheck": true,
-    "strict": true,
+    "strict": false,
     "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
@@ -12,15 +16,24 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
+    "incremental": true,
     "jsx": "preserve",
-    "incremental": true
+    "baseUrl": ".",
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "strictNullChecks": true
   },
   "include": [
-    "process.d.ts",
     "next-env.d.ts",
-    "next-auth.d.ts",
     "**/*.ts",
-    "**/*.tsx"
+    "**/*.tsx",
+    ".next/types/**/*.ts"
   ],
-  "exclude": ["node_modules"]
+  "exclude": [
+    "node_modules",
+    "jest.config.js"
+  ]
 }

apps/examples/solid-start/package.json

@@ -13,7 +13,7 @@
     "solid-start-node": "^0.2.9",
     "solid-start-vercel": "^0.2.9",
     "tailwindcss": "^3.2.4",
-    "typescript": "5.2.2",
+    "typescript": "^4.8.3",
     "vite": "^3.1.0"
   },
   "dependencies": {

apps/examples/sveltekit/package.json

@@ -18,7 +18,7 @@
     "@sveltejs/kit": "next",
     "svelte": "3.55.0",
     "svelte-check": "2.10.2",
-    "typescript": "5.2.2",
+    "typescript": "4.9.4",
     "vite": "4.0.1"
   },
   "dependencies": {

apps/playgrounds/nuxt/composables/useSession.ts

@@ -1,4 +1,4 @@
-import { Session } from "@auth/core/types"
+import { Session } from "@auth/core"
 
 export default function useSession() {
   return useState<Session | null>("session", () => null)

apps/playgrounds/nuxt/lib/auth/client.ts

@@ -43,7 +43,7 @@ export async function signIn<
 
   // TODO: Handle custom base path
   // TODO: Remove this since Sveltekit offers the CSRF protection via origin check
-  const { csrfToken } = await $fetch<{ csrfToken: string }>("/api/auth/csrf")
+  const { csrfToken } = await $fetch("/api/auth/csrf")
 
   console.log(_signInUrl)
 

apps/playgrounds/nuxt/lib/auth/server.ts

@@ -1,14 +1,13 @@
-import { AuthConfig, Session } from "@auth/core/types"
-import { Auth } from "@auth/core"
+import { AuthHandler, AuthOptions, Session } from "@auth/core"
 import { fromNodeMiddleware, H3Event } from "h3"
 import getURL from "requrl"
 import { createMiddleware } from "@hattip/adapter-node"
 
-export function NuxtAuthHandler(options: AuthConfig) {
+export function NuxtAuthHandler(options: AuthOptions) {
   async function handler(ctx: { request: Request }) {
     options.trustHost ??= true
 
-    return Auth(ctx.request, options)
+    return AuthHandler(ctx.request, options)
   }
 
   const middleware = createMiddleware(handler)
@@ -18,7 +17,7 @@ export function NuxtAuthHandler(options: AuthConfig) {
 
 export async function getSession(
   event: H3Event,
-  options: AuthConfig
+  options: AuthOptions
 ): Promise<Session | null> {
   options.trustHost ??= true
 
@@ -31,7 +30,7 @@ export async function getSession(
     nodeHeaders.append(key, headers[key] as any)
   })
 
-  const response = await Auth(
+  const response = await AuthHandler(
     new Request(url, { headers: nodeHeaders }),
     options
   )

apps/playgrounds/nuxt/package.json

@@ -1,21 +1,21 @@
 {
-  "name": "next-auth-nuxt",
+  "name": "playground-nuxt",
   "private": true,
   "scripts": {
-    "build": "nuxt build",
-    "dev": "nuxt prepare && nuxt dev",
+    "build": "nuxt prepare && nuxt build",
+    "dev": "nuxt prepare &&  export NODE_OPTIONS='--no-experimental-fetch' && nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview"
   },
   "devDependencies": {
     "@nuxt/eslint-config": "^0.1.1",
     "eslint": "^8.29.0",
-    "h3": "1.6.6",
-    "nuxt": "3.5.1"
+    "h3": "1.0.2",
+    "nuxt": "3.0.0"
   },
   "dependencies": {
     "@auth/core": "workspace:*",
-    "@hattip/adapter-node": "^0.0.34",
+    "@hattip/adapter-node": "^0.0.22",
     "requrl": "^3.0.2"
   }
 }

apps/playgrounds/nuxt/plugins/auth.ts

@@ -1,4 +1,4 @@
-import { Session } from "@auth/core/types"
+import { Session } from "@auth/core"
 
 export default defineNuxtPlugin(async () => {
   const session = useSession()

apps/playgrounds/nuxt/server/api/auth/[...].ts

@@ -1,10 +1,10 @@
 import { NuxtAuthHandler } from "@/lib/auth/server"
 import GithubProvider from "@auth/core/providers/github"
-import type { AuthConfig } from "@auth/core"
+import type { AuthOptions } from "@auth/core"
 
 const runtimeConfig = useRuntimeConfig()
 
-export const authOptions = {
+export const authOptions: AuthOptions = {
   secret: runtimeConfig.secret,
   providers: [
     GithubProvider({
@@ -12,6 +12,6 @@ export const authOptions = {
       clientSecret: runtimeConfig.github.clientSecret,
     }),
   ],
-} as AuthConfig
+}
 
 export default NuxtAuthHandler(authOptions)

docs/README.md

@@ -37,31 +37,22 @@ This documentation site is based on the [Docusaurus](https://docusaurus.io) fram
 
 To start a local environment of this project, please do the following.
 
-1. Clone the repo:
-
-```sh
-git clone git@github.com:nextauthjs/next-auth.git
-cd next-auth
-```
-
-2. Set up the correct pnpm version, using [Corepack](https://nodejs.org/api/corepack.html). Run the following in the project'a root:
-
-```sh
-corepack enable pnpm
-```
-
-(Now, if you run `pnpm --version`, it should print the same verion as the `packageManager` property in the [`package.json` file](https://github.com/nextauthjs/next-auth/blob/main/package.json))
-
-3. Install packages. Developing requires Node.js v18:
-
-```sh
-pnpm install
-```
-
-4. Start the development server
+1. Clone the repository.
 
 ```bash
-$ pnpm dev:docs
+$ git clone https://github.com/nextauthjs/docs.git
+```
+
+2. Install dependencies
+
+```bash
+$ npm install
+```
+
+3. Start the development server
+
+```bash
+$ npm start
 ```
 
 And thats all! Now you should have a local copy of this docs site running at [localhost:3000](http://localhost:3000)!

docs/docs/concepts/faq.md

@@ -7,7 +7,7 @@ title: Frequently Asked Questions
 
 ### Is Auth.js commercial software?
 
-Auth.js is an open-source project built by individual contributors.
+Auth.js is an open source project built by individual contributors.
 
 It is not commercial software and is not associated with a commercial organization.
 
@@ -17,7 +17,7 @@ It is not commercial software and is not associated with a commercial organizati
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>What databases does Auth.js support?</h3>
+  <h3 style={{display:"inline-block"}}>What databases does Auth.js support?</h3>
 </summary>
 <p>
 
@@ -30,7 +30,7 @@ You can use also Auth.js with any database using a custom database adapter, or b
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>What authentication services does Auth.js support?</h3>
+  <h3 style={{display:"inline-block"}}>What authentication services does Auth.js support?</h3>
 </summary>
 <p>
 
@@ -38,16 +38,16 @@ You can use also Auth.js with any database using a custom database adapter, or b
 (See also: <a href="/reference/providers/oauth-builtin">Providers</a>)
 </p>
 
-Auth.js also supports email for passwordless sign-in, which is useful for account recovery or for people who are not able to use an account with the configured OAuth services (e.g. due to service outage, account suspension or otherwise becoming locked out of an account).
+Auth.js also supports email for passwordless sign in, which is useful for account recovery or for people who are not able to use an account with the configured OAuth services (e.g. due to service outage, account suspension or otherwise becoming locked out of an account).
 
-You can also use a custom-based provider to support signing in with a username and password stored in an external database and/or using two-factor authentication.
+You can also use a custom based provider to support signing in with a username and password stored in an external database and/or using two factor authentication.
 
 </p>
 </details>
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Does Auth.js support signing in with a username and password?</h3>
+  <h3 style={{display:"inline-block"}}>Does Auth.js support signing in with a username and password?</h3>
 </summary>
 <p>
 
@@ -55,44 +55,44 @@ Auth.js is designed to avoid the need to store passwords for user accounts.
 
 If you have an existing database of usernames and passwords, you can use a custom credentials provider to allow signing in with a username and password stored in an existing database.
 
-_If you use a custom credentials provider user accounts will not be persisted in a database by Auth.js (even if one is configured). The option to use JSON Web Tokens for session tokens (which allow sign-in without using a session database) must be enabled to use a custom credentials provider._
+_If you use a custom credentials provider user accounts will not be persisted in a database by Auth.js (even if one is configured). The option to use JSON Web Tokens for session tokens (which allow sign in without using a session database) must be enabled to use a custom credentials provider._
 
 </p>
 </details>
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Can I use Auth.js with a website that does not use Next.js?</h3>
+  <h3 style={{display:"inline-block"}}>Can I use Auth.js with a website that does not use Next.js?</h3>
 </summary>
 <p>
 
 Auth.js is designed for use with Next.js and Serverless.
 
-If you are using a different framework for your website, you can create a website that handles sign-in with Next.js and then access those sessions on a website that does not use Next.js as long as the websites are on the same domain.
+If you are using a different framework for your website, you can create a website that handles sign in with Next.js and then access those sessions on a website that does not use Next.js as long as the websites are on the same domain.
 
-If you use Auth.js on a website with a different subdomain than the rest of your website (e.g. `auth.example.com` vs `www.example.com`) you will need to set a custom cookie domain policy for the Session Token cookie. (See also: [Cookies](/reference/configuration/auth-config#cookies))
+If you use Auth.js on a website with a different subdomain then the rest of your website (e.g. `auth.example.com` vs `www.example.com`) you will need to set a custom cookie domain policy for the Session Token cookie. (See also: [Cookies](/reference/configuration/auth-config#cookies))
 
-Auth.js does not currently support automatically signing into sites on different top-level domains (e.g. `www.example.com` vs `www.example.org`) using a single session.
+Auth.js does not currently support automatically signing into sites on different top level domains (e.g. `www.example.com` vs `www.example.org`) using a single session.
 
 </p>
 </details>
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Can I use Auth.js with React Native?</h3>
+  <h3 style={{display:"inline-block"}}>Can I use Auth.js with React Native?</h3>
 </summary>
 <p>
 
-Auth.js is designed as a secure, confidential client and implements a server-side authentication flow.
+Auth.js is designed as a secure, confidential client and implements a server side authentication flow.
 
-It is not intended to be used in native applications on desktop or mobile applications, which typically implement public clients (e.g. with client/secrets embedded in the application).
+It is not intended to be used in native applications on desktop or mobile applications, which typically implement public clients (e.g. with client / secrets embedded in the application).
 
 </p>
 </details>
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Is Auth.js supporting TypeScript?</h3>
+  <h3 style={{display:"inline-block"}}>Is Auth.js supporting TypeScript?</h3>
 </summary>
 <p>
 
@@ -103,11 +103,11 @@ Yes! Check out the [TypeScript docs](/getting-started/typescript)
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Is Auth.js compatible with Next.js 12 Middleware?</h3>
+  <h3 style={{display:"inline-block"}}>Is Auth.js compatible with Next.js 12 Middleware?</h3>
 </summary>
 <p>
 
-[Next.js Middleware](https://nextjs.org/docs/middleware) is supported. Head over to [this page](https://next-auth.js.org/configuration/nextjs#middleware)
+[Next.js Middleware](https://nextjs.org/docs/middleware) is supported. Head over to the [this page](/reference/nextjs/#middleware)
 
 </p>
 </details>
@@ -118,7 +118,7 @@ Yes! Check out the [TypeScript docs](/getting-started/typescript)
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>What databases are supported by Auth.js?</h3>
+  <h3 style={{display:"inline-block"}}>What databases are supported by Auth.js?</h3>
 </summary>
 <p>
 
@@ -131,13 +131,13 @@ It also provides an Adapter API which allows you to connect it to any database.
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>What does Auth.js use databases for?</h3>
+  <h3 style={{display:"inline-block"}}>What does Auth.js use databases for?</h3>
 </summary>
 <p>
 
-Databases in Auth.js are used for persisting users, OAuth accounts, email sign-in tokens and sessions.
+Databases in Auth.js are used for persisting users, OAuth accounts, email sign in tokens and sessions.
 
-Specifying a database is optional if you don't need to persist user data or support email sign-in. If you don't specify a database then JSON Web Tokens will be enabled for session storage and used to store session data.
+Specifying a database is optional if you don't need to persist user data or support email sign in. If you don't specify a database then JSON Web Tokens will be enabled for session storage and used to store session data.
 
 If you are using a database with Auth.js, you can still explicitly enable JSON Web Tokens for sessions (instead of using database sessions).
 
@@ -146,24 +146,24 @@ If you are using a database with Auth.js, you can still explicitly enable JSON W
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Should I use a database?</h3>
+  <h3 style={{display:"inline-block"}}>Should I use a database?</h3>
 </summary>
 <p>
 
-- Using Auth.js without a database works well for internal tools - where you need to control who can sign in, but when you do not need to create user accounts for them in your application.
+- Using Auth.js without a database works well for internal tools - where you need to control who is able to sign in, but when you do not need to create user accounts for them in your application.
 
-- Using Auth.js with a database is usually a better approach for a consumer-facing application where you need to persist accounts (e.g. for billing, to contact customers, etc).
+- Using Auth.js with a database is usually a better approach for a consumer facing application where you need to persist accounts (e.g. for billing, to contact customers, etc).
 
 </p>
 </details>
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>What database should I use?</h3>
+  <h3 style={{display:"inline-block"}}>What database should I use?</h3>
 </summary>
 <p>
 
-Managed database solutions for MySQL, Postgres and MongoDB (and compatible databases) are well supported by cloud providers such as Amazon, Google, Microsoft and Atlas.
+Managed database solutions for MySQL, Postgres and MongoDB (and compatible databases) are well supported from cloud providers such as Amazon, Google, Microsoft and Atlas.
 
 If you are deploying directly to a particular cloud platform you may also want to consider serverless database offerings they have (e.g. [Amazon Aurora Serverless on AWS](https://aws.amazon.com/rds/aurora/serverless/)).
 
@@ -174,49 +174,51 @@ If you are deploying directly to a particular cloud platform you may also want t
 
 ## Security
 
-Parts of this section have been moved to their [page](/security)](/security).
+Parts of this section has been moved to its [own page](/security).
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>How do I get Refresh Tokens and Access Tokens for an OAuth account?</h3>
+  <h3 style={{display:"inline-block"}}>How do I get Refresh Tokens and Access Tokens for an OAuth account?</h3>
 </summary>
 <p>
 
 Auth.js provides a solution for authentication, session management and user account creation.
 
-Auth.js records Refresh Tokens and Access Tokens on sign-in (if supplied by the provider) and it will pass them, along with the User ID, Provider and Provider Account ID, to either:
+Auth.js records Refresh Tokens and Access Tokens on sign in (if supplied by the provider) and it will pass them, along with the User ID, Provider and Provider Account ID, to either:
 
 1. A database - if a database connection string is provided
-2. The JSON Web Token callback - if JWT sessions are enabled (e.g. if no database is specified)
+2. The JSON Web Token callback - if JWT sessions are enabled (e.g. if no database specified)
 
 You can then look them up from the database or persist them to the JSON Web Token.
 
-Note: Auth.js does not currently handle Access Token rotation for OAuth providers for you, however, you can check out [this tutorial](/guides/basics/refresh-token-rotation) if you want to implement it.
+Note: Auth.js does not currently handle Access Token rotation for OAuth providers for you, however you can check out [this tutorial](/guides/basics/refresh-token-rotation) if you want to implement it.
+
+We also have an [example repository](https://github.com/nextauthjs/next-auth-refresh-token-example) / project based upon Auth.js v4 where we demonstrate how to use a refresh token to refresh the provided access token.
 
 </p>
 </details>
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>When I sign in with another account with the same email address, why are accounts not linked automatically?</h3>
+  <h3 style={{display:"inline-block"}}>When I sign in with another account with the same email address, why are accounts not linked automatically?</h3>
 </summary>
 <p>
 
-Automatic account linking on sign-in is not secure between arbitrary providers - except for allowing users to sign in via email addresses as a fallback (as they must verify their email address as part of the flow).
+Automatic account linking on sign in is not secure between arbitrary providers - with the exception of allowing users to sign in via an email addresses as a fallback (as they must verify their email address as part of the flow).
 
-When an email address is associated with an OAuth account it does not necessarily mean that it has been verified as belonging to the account holder — how email address verification is handled is not part of the OAuth specification and varies between providers (e.g. some do not verify first, some do verify first, others return metadata indicating the verification status).
+When an email address is associated with an OAuth account it does not necessarily mean that it has been verified as belonging to account holder — how email address verification is handled is not part of the OAuth specification and varies between providers (e.g. some do not verify first, some do verify first, others return metadata indicating the verification status).
 
-With automatic account linking on sign-in, this can be exploited by bad parties to hijack accounts by creating an OAuth account associated with the email address of another user.
+With automatic account linking on sign in, this can be exploited by bad actors to hijack accounts by creating an OAuth account associated with the email address of another user.
 
-For this reason, it is not secure to automatically link accounts between arbitrary providers on sign-in, which is why this feature is generally not provided by an authentication service and is not provided by Auth.js.
+For this reason it is not secure to automatically link accounts between arbitrary providers on sign in, which is why this feature is generally not provided by authentication service and is not provided by Auth.js.
 
 Automatic account linking is seen on some sites, sometimes insecurely. It can be technically possible to do automatic account linking securely if you trust all the providers involved to ensure they have securely verified the email address associated with the account, but requires placing trust (and transferring the risk) to those providers to handle the process securely.
 
-Examples of scenarios where this is secure include an OAuth provider you control (e.g. that only authorizes users internal to your organization) or a provider you explicitly trust to have verified the users' email address.
+Examples of scenarios where this is secure include with an OAuth provider you control (e.g. that only authorizes users internal to your organization) or with a provider you explicitly trust to have verified the users email address.
 
-Automatic account linking is not a planned feature of Auth.js, however, there is scope to improve the user experience of account linking and of handling this flow, securely. Typically this involves providing a fallback option to sign in via email, which is already possible (and recommended), but the current implementation of this flow could be improved.
+Automatic account linking is not a planned feature of Auth.js, however there is scope to improve the user experience of account linking and of handling this flow, in a secure way. Typically this involves providing a fallback option to sign in via email, which is already possible (and recommended), but the current implementation of this flow could be improved on.
 
-Providing support for secure account linking and unlinking of additional providers - which can only be done if a user is already signed in - was originally a feature in v1.x but has not been present since v2.0, and is planned to return in a future release.
+Providing support for secure account linking and unlinking of additional providers - which can only be done if a user is already signed in already - was originally a feature in v1.x but has not been present since v2.0, is planned to return in a future release.
 
 </p>
 </details>
@@ -227,11 +229,11 @@ Providing support for secure account linking and unlinking of additional provide
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>Why doesn't Auth.js support [a particular feature]?</h3>
+  <h3 style={{display:"inline-block"}}>Why doesn't Auth.js support [a particular feature]?</h3>
 </summary>
 <p>
 
-Auth.js is an open-source project built by individual contributors who are volunteers writing code and providing support in their spare time.
+Auth.js is an open source project built by individual contributors who are volunteers writing code and providing support in their spare time.
 
 If you would like Auth.js to support a particular feature, the best way to help make it happen is to raise a feature request describing the feature and offer to work with other contributors to develop and test it.
 
@@ -242,13 +244,13 @@ If you are not able to develop a feature yourself, you can offer to sponsor some
 
 <details>
 <summary>
-  <h3 style={{display: "inline-block"}}>I disagree with a design decision, how can I change your mind?</h3>
+  <h3 style={{display:"inline-block"}}>I disagree with a design decision, how can I change your mind?</h3>
 </summary>
 <p>
 
 Product design decisions on Auth.js are made by core team members.
 
-You can raise suggestions as feature requests for enhancement.
+You can raise suggestions as feature requests / requests for enhancement.
 
 Requests that provide the detail requested in the template and follow the format requested may be more likely to be supported, as additional detail prompted in the templates often provides important context.
 
@@ -284,7 +286,7 @@ JSON Web Tokens can be used for session tokens, but are also used for lots of ot
 
 - JSON Web Tokens in Auth.js are secured using cryptographic encryption (JWE) to store the included information directly in a JWT session token. You may then use the token to pass information between services and APIs on the same domain without having to contact a database to verify the included information.
 
-- You can use JWT to securely store information you do not mind the client knowing even without encryption, as the JWT is stored in a server-readable-only cookie so data in the JWT is not accessible to third-party JavaScript running on your site.
+- You can use JWT to securely store information you do not mind the client knowing even without encryption, as the JWT is stored in a server-readable-only cookie so data in the JWT is not accessible to third party JavaScript running on your site.
 
 </p>
 </details>
@@ -295,15 +297,15 @@ JSON Web Tokens can be used for session tokens, but are also used for lots of ot
 </summary>
 <p>
 
-- It's difficult to invalidate a JSON Web Token - doing so requires maintaining a server-side blocklist of the tokens (at least until they expire) and checking every token against the list every time a token is presented.
+- You cannot as easily expire a JSON Web Token - doing so requires maintaining a server side blocklist of invalid tokens (at least until they expire) and checking every token against the list every time a token is presented.
 
   Shorter session expiry times are used when using JSON Web Tokens as session tokens to allow sessions to be invalidated sooner and simplify this problem.
 
-  Auth.js client includes advanced features to mitigate the downsides of using shorter session expiry times on the user experience, including automatic session token rotation, optionally sending keep-alive messages to prevent short-lived sessions from expiring if there is a window or tab opened, background re-validation, and automatic tab/window syncing that keeps sessions in sync across windows any time session state changes or a window or tab gains or loses focus.
+  Auth.js client includes advanced features to mitigate the downsides of using shorter session expiry times on the user experience, including automatic session token rotation, optionally sending keep alive messages to prevent short lived sessions from expiring if there is an window or tab open, background re-validation, and automatic tab/window syncing that keeps sessions in sync across windows any time session state changes or a window or tab gains or loses focus.
 
 - As with database session tokens, JSON Web Tokens are limited in the amount of data you can store in them. There is typically a limit of around 4096 bytes per cookie, though the exact limit varies between browsers, proxies and hosting services. If you want to support most browsers, then do not exceed 4096 bytes per cookie. If you want to save more data, you will need to persist your sessions in a database (Source: [browsercookielimits.iain.guru](http://browsercookielimits.iain.guru/))
 
-  The more data you try to store in a token and the more other cookies you set, the closer you will come to this limit. Auth.js uses cookie chunking so that cookies over the 4kb limit get split and reassembled upon parsing. However, since this data needs to be transmitted on every request, in case you wish to store more than ~4 KB of data you're probably at the point where you want to store a unique ID in the token and persist the data elsewhere (e.g. in a server-side key/value store).
+  The more data you try to store in a token and the more other cookies you set, the closer you will come to this limit. Since v4 we have implemented cookie chunking so that cookies over the 4kb limit get split and reassembled upon parsing. However since this data needs to be transmitted on every request, if you wish to store more than ~4 KB of data you're probably at the point where you want to store a unique ID in the token and persist the data elsewhere (e.g. in a server-side key/value store).
 
 - Data stored in an encrypted JSON Web Token (JWE) may be compromised at some point.
 
@@ -311,7 +313,7 @@ JSON Web Tokens can be used for session tokens, but are also used for lots of ot
 
   Avoid storing any data in a token that might be problematic if it were to be decrypted in the future.
 
-- If you do not explicitly specify a secret for Auth.js, existing sessions will be invalidated any time your Auth.js configuration changes, as Auth.js will default to an auto-generated secret. Since v4 this only impacts development and generating a secret is required in production.
+- If you do not explicitly specify a secret for for Auth.js, existing sessions will be invalidated any time your Auth.js configuration changes, as Auth.js will default to an auto-generated secret. Since v4 this only impacts development and generating a secret is required in production.
 
 </p>
 </details>
@@ -322,10 +324,12 @@ JSON Web Tokens can be used for session tokens, but are also used for lots of ot
 </summary>
 <p>
 
-By default, tokens are encrypted (JWE).
+By default tokens are not signed (JWS) but are encrypted (JWE). Since v4 we have implemented cookie chunking so that cookies over the 4kb limit get split and reassembled upon parsing.
 
 You can specify other valid algorithms - [as specified in RFC 7518](https://tools.ietf.org/html/rfc7517) - with either a secret (for symmetric encryption) or a public/private key pair (for asymmetric encryption).
 
+Auth.js will generate keys for you, but this will generate a warning at start up.
+
 Using explicit public/private keys for signing is strongly recommended.
 
 </p>

docs/docs/getting-started/credentials-tutorial.mdx

@@ -2,9 +2,6 @@
 title: Credentials authentication
 ---
 
-import Tabs from "@theme/Tabs"
-import TabItem from "@theme/TabItem"
-
 Auth.js is built in a way that is flexible to integrate it with any authentication back-end you or your company may already have.
 
 This library has been designed to handle the user session client-wise, to support multiple authentication methods (OAuth, Email, etc...) so that you're not forced to run your own authentication service.
@@ -19,49 +16,34 @@ The functionality provided for credentials based authentication is intentionally
 
 Integrating the Credentials Provider is as simple as initializing it in the Auth.js configuration file:
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
+```ts title="pages/api/auth/[...nextauth].ts"
+import NextAuth from "next-auth"
+import CredentialsProvider from "next-auth/providers/credentials"
 
-  ```ts title="pages/api/auth/[...nextauth].ts"
-  import NextAuth from "next-auth"
-  import CredentialsProvider from "next-auth/providers/credentials"
+export default NextAuth({
+  providers: [
+    CredentialsProvider({
+      async authorize(credentials) {
+        const authResponse = await fetch("/users/login", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify(credentials),
+        })
 
-  export default NextAuth({
-    providers: [
-      CredentialsProvider({
-        async authorize(credentials) {
-          const authResponse = await fetch("/users/login", {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-            },
-            body: JSON.stringify(credentials),
-          })
+        if (!authResponse.ok) {
+          return null
+        }
 
-          if (!authResponse.ok) {
-            return null
-          }
+        const user = await authResponse.json()
 
-          const user = await authResponse.json()
-
-          return user
-        },
-      }),
-    ],
-  })
-  ```
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
+        return user
+      },
+    }),
+  ],
+})
+```
 
 :::note
 Check the [Credentials Provider options](/reference/core/providers_credentials) for further customization

docs/docs/getting-started/email-tutorial.mdx

@@ -7,8 +7,6 @@ import startPageImg from "./img/email-tutorial-start.png"
 import checkPageImg from "./img/email-tutorial-check.png"
 import mailboxImg from "./img/email-tutorial-mailbox.png"
 import loggedInImg from "./img/email-tutorial-logged.png"
-import Tabs from "@theme/Tabs"
-import TabItem from "@theme/TabItem"
 
 Aside from authenticating users in Auth.js via [OAuth](/getting-started/oauth-tutorial), you can also enable the option to authenticate them via "magic links". These are links that are sent to the user's email and when clicking on them they'll sign up the user automatically.
 
@@ -36,7 +34,7 @@ npm install -D nodemailer
 
 ## 2. Setting up a SMTP service
 
-Next we need a [SMTP service](https://sendgrid.com/blog/what-is-an-smtp-server/) which will be in charge of sending emails from our application. There's a number of services available for this, however [here are the ones](https://community.nodemailer.com/2-0-0-beta/setup-smtp/well-known-services) known to work with `nodemailer`.
+Next we need a [SMTP service](https://sendgrid.com/blog/what-is-an-smtp-server/) which will be in charge of sending emails from our application. There's a number of services available for this, however [here are the ones](http://nodemailer.com/smtp/well-known/) known to work with `nodemailer`.
 
 :::info
 For this tutorial, we're going to be using [Sendgrid](https://sendgrid.com/), but any of the services linked above should work the same
@@ -66,43 +64,26 @@ Note that we're also specifying from which domain email are going to be sent fro
 
 Nice! We're getting there. Now we need to read supply this values as the configuration for our Email Provider. Open `pages/api/auth/[...nextauth].ts` and do the following:
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
+```ts title="pages/api/auth/[...nextauth].ts"
+import NextAuth from "next-auth"
+import Email from "next-auth/providers/email"
 
-  
-  ```ts title="pages/api/auth/[...nextauth].ts"
-  import NextAuth from "next-auth"
-  import Email from "next-auth/providers/email"
-
-  export default NextAuth({
-    providers: [
-      Email({
-        server: {
-          host: process.env.SMTP_HOST,
-          port: Number(process.env.SMTP_PORT),
-          auth: {
-            user: process.env.SMTP_USER,
-            pass: process.env.SMTP_PASSWORD,
-          },
+export default NextAuth({
+  providers: [
+    Email({
+      server: {
+        host: process.env.SMTP_HOST,
+        port: Number(process.env.SMTP_PORT),
+        auth: {
+          user: process.env.SMTP_USER,
+          pass: process.env.SMTP_PASSWORD,
         },
-        from: process.env.EMAIL_FROM,
-      }),
-    ],
-  })
-  ```
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
-
+      },
+      from: process.env.EMAIL_FROM,
+    }),
+  ],
+})
+```
 
 ## 3. Setting up an adapter
 
@@ -110,12 +91,12 @@ Finally, we'll need to set up a database adapter to store verification tokens th
 
 An **Adapter** in Auth.js connects your application to whatever database or backend system you want to use to store data for users, their accounts, sessions, etc...
 
-For this tutorial, we're going to use the **MongoDB** adapter, but any of the other adapters will work just fine.
+For this tutorial, we're going to use the **MongoDB** adapter, other any of the other adapters will work just fine.
 
 First, let's start by installing the adapter package:
 
 ```bash npm2yarn2pnpm
-npm install -D  @auth/mongodb-adapter mongodb
+npm install -D  @next-auth/mongodb-adapter mongodb
 ```
 
 and create a simple MongoDB client:
@@ -158,46 +139,30 @@ export default clientPromise
 
 And now let's reference this new adapter from our Auth.js configuration file:
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
-
-  ```diff title="pages/api/auth/[...nextauth].ts"
-  import NextAuth from "next-auth"
-  import EmailProvider from "next-auth/providers/email"
-  + import { MongoDBAdapter } from "@auth/mongodb-adapter"
-  + import clientPromise from "../../../lib/mongodb/client"
-
-  export default NextAuth({
-    secret: process.env.NEXTAUTH_SECRET,
-  + adapter: MongoDBAdapter(clientPromise),
-    providers: [
-      EmailProvider({
-        server: {
-          host: process.env.EMAIL_SERVER_HOST,
-          port: process.env.EMAIL_SERVER_PORT,
-          auth: {
-            user: process.env.EMAIL_SERVER_USER,
-            pass: process.env.EMAIL_SERVER_PASSWORD
-          }
-        },
-        from: process.env.EMAIL_FROM
-      }),
-    ],
-  })
-  ```
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
+```diff title="pages/api/auth/[...nextauth].ts"
+import NextAuth from "next-auth"
+import EmailProvider from "next-auth/providers/email"
++ import { MongoDBAdapter } from "@next-auth/mongodb-adapter"
++ import clientPromise from "../../../lib/mongodb/client"
 
+export default NextAuth({
+  secret: process.env.NEXTAUTH_SECRET,
++ adapter: MongoDBAdapter(clientPromise),
+  providers: [
+    EmailProvider({
+      server: {
+        host: process.env.EMAIL_SERVER_HOST,
+        port: process.env.EMAIL_SERVER_PORT,
+        auth: {
+          user: process.env.EMAIL_SERVER_USER,
+          pass: process.env.EMAIL_SERVER_PASSWORD
+        }
+      },
+      from: process.env.EMAIL_FROM
+    }),
+  ],
+})
+```
 
 ## 4. Wiring all together
 

docs/docs/getting-started/oauth-tutorial.mdx

@@ -36,10 +36,6 @@ This tutorial assumes you have a Next.js application set up. If you don't, you c
 npm install next-auth
 ```
 
-:::info
-We are working on a new release of `next-auth` that will make it easier to set up Auth.js with Next.js. You can follow the development [on this PR](https://github.com/nextauthjs/next-auth/pull/7443)
-:::
-
 ### Creating the server config
 
 Create the following [API route](https://nextjs.org/docs/api-routes/dynamic-api-routes#catch-all-api-routes) file. This route contains the necessary configuration for NextAuth.js, as well as the dynamic route handler:
@@ -100,12 +96,11 @@ NextAuth.js provides [`useSession()`](/reference/react/#usesession) - a [React H
 
 ```ts title="pages/_app.tsx"
 import { SessionProvider } from "next-auth/react"
-import type { AppProps } from "next/app"
 
 export default function App({
   Component,
   pageProps: { session, ...pageProps },
-}: AppProps) {
+}) {
   return (
     <SessionProvider session={session}>
       <Component {...pageProps} />
@@ -156,7 +151,7 @@ export default function CamperVanPage() {
 
 ### Protecting API Routes
 
-To protect your API Routes (blocking unauthorized access to resources), you can use [`getServerSession()`](https://next-auth.js.org/configuration/nextjs#getserversession) to know whether a session exists or not:
+To protect your API Routes (blocking unauthorized access to resources), you can use [`getServerSession()`](/reference/nextjs#getserversession) to know whether a session exists or not:
 
 ```ts title="pages/api/movies/list.ts"
 import { getServerSession } from "next-auth/next"
@@ -218,7 +213,7 @@ The callback URL we insert should have the following pattern:
 
 In this case, given we want to try our authentication working locally on our machine and we're using **GitHub** as our OAuth provider, it'll be:
 
-<Tabs groupId="frameworks" queryString>
+<Tabs groupId="frameworks">
   <TabItem value="next" label="Next.js" default>
 
 ```
@@ -244,13 +239,10 @@ http://localhost:5173/auth/callback/github
 TODO Core
   </TabItem>
 </Tabs>
-
 :::info
 The last part of the URL, `[provider]`, is the ID of the provider you're using. In this case, we're using GitHub, so it's `github`. If you're using Google, it'll be `google`, etc... We keep track of the provider IDs internally.
-
 The same id is used in the `signIn()` method we saw earlier.
 :::
-
 To register, tap on "Register application" button.
 
 The next screen shows all the configurations for your newly created OAuth app. For now, we need two things from it - the **Client ID** and **Client Secret**:
@@ -289,7 +281,7 @@ GITHUB_SECRET=67890
 
 Here is our server configuration file again:
 
-<Tabs groupId="frameworks" queryString>
+<Tabs groupId="frameworks">
   <TabItem value="next" label="Next.js" default>
 
 ```ts title="pages/api/auth/[...nextauth].ts"

docs/docs/getting-started/typescript.md

@@ -9,9 +9,6 @@ https://github.com/nextauthjs/next-auth-example
 
 ---
 
-import Tabs from "@theme/Tabs"
-import TabItem from "@theme/TabItem"
-
 ## Adapters
 
 If you're writing your own custom Adapter, you can take advantage of the types to make sure your implementation conforms to what's expected:
@@ -49,45 +46,30 @@ This will work in code editors with a strong TypeScript integration like VSCode
 
 Let's look at `Session`:
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
+```ts title="pages/api/auth/[...nextauth].ts"
+import NextAuth from "next-auth"
 
-  ```ts title="pages/api/auth/[...nextauth].ts"
-  import NextAuth from "next-auth"
-
-  export default NextAuth({
-    callbacks: {
-      session({ session, token, user }) {
-        return session // The return type will match the one returned in `useSession()`
-      },
+export default NextAuth({
+  callbacks: {
+    session({ session, token, user }) {
+      return session // The return type will match the one returned in `useSession()`
     },
-  })
-  ```
+  },
+})
+```
 
-  ```ts title="pages/index.ts"
-  import { useSession } from "next-auth/react"
+```ts title="pages/index.ts"
+import { useSession } from "next-auth/react"
 
-  export default function IndexPage() {
-    // `session` will match the returned value of `callbacks.session()` from `NextAuth()`
-    const { data: session } = useSession()
+export default function IndexPage() {
+  // `session` will match the returned value of `callbacks.session()` from `NextAuth()`
+  const { data: session } = useSession()
 
-    return (
-      // Your component
-    )
-  }
-  ```
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
+  return (
+    // Your component
+  )
+}
+```
 
 To extend/augment this type, create a `types/next-auth.d.ts` file in your project:
 

docs/docs/guides/adapters/using-a-database-adapter.md

@@ -2,12 +2,12 @@
 title: Using a database adapter
 ---
 
-An **Adapter** in Auth.js connects your application to whatever database or backend system you want to use to store data for users, their accounts, sessions, etc. Adapters are optional, unless you need to persist user information in your own database, or you want to implement certain flows. The [Email Provider](/getting-started/email-tutorial) requires an adapter to be able to save [Verification Tokens](/reference/adapters#verification-token).
+An **Adapter** in Auth.js connects your application to whatever database or backend system you want to use to store data for users, their accounts, sessions, etc. Adapters are optional, unless you need to persist user information in your own database, or you want to implement certain flows. The [Email Provider](/getting-started/email-tutorial) requires an adapter to be able to save [Verification Tokens](/reference/adapters/models#verification-token).
 
 :::tip
 When using a database, you can still use JWT for session handling for fast access. See the [`session.strategy`](/reference/configuration/auth-config#session) option. Read about the trade-offs of JWT in the [FAQ](/concepts/faq#json-web-tokens).
 :::
 
-We have a list of official adapters that are distributed as their own packages under the `@auth/{name}-adapter` namespace. Their source code is available in their various adapters package directories at [`nextauthjs/next-auth`](https://github.com/nextauthjs/next-auth/tree/main/packages):
+We have a list of official adapters that are distributed as their own packages under the `@next-auth/{name}-adapter` namespace. Their source code is available in their various adapters package directories at [`nextauthjs/next-auth`](https://github.com/nextauthjs/next-auth/tree/main/packages):
 
 - [All available adapters](/reference/adapters)

docs/docs/guides/basics/callbacks.md

@@ -12,7 +12,7 @@ If you want to pass data such as an Access Token or User ID to the browser when
 
 You can specify a handler for any of the callbacks below.
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"s
   callbacks: {
     async signIn({ user, account, profile, email, credentials }) {
       return true
@@ -35,7 +35,7 @@ The documentation below shows how to implement each callback, their default beha
 
 Use the `signIn()` callback to control if a user is allowed to sign in.
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 callbacks: {
   async signIn({ user, account, profile, email, credentials }) {
     const isAllowedToSignIn = true
@@ -79,7 +79,7 @@ By default only URLs on the same URL as the site are allowed, you can use the re
 
 The default redirect callback looks like this:
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 callbacks: {
   async redirect({ url, baseUrl }) {
     // Allows relative callback URLs
@@ -107,7 +107,7 @@ Requests to `/api/auth/signin`, `/api/auth/session` and calls to `getSession()`,
 
 The contents _user_, _account_, _profile_ and _isNewUser_ will vary depending on the provider and on if you are using a database or not. You can persist data such as User ID, OAuth Access Token in this token. To make it available in the browser, check out the [`session()` callback](#session-callback) as well.
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 callbacks: {
   async jwt({ token, account }) {
     // Persist the OAuth access_token to the token right after signin
@@ -132,7 +132,7 @@ e.g. `getSession()`, `useSession()`, `/api/auth/session`
 - When using database sessions, the User object is passed as an argument.
 - When using JSON Web Tokens for sessions, the JWT payload is provided instead.
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 callbacks: {
   async session({ session, token, user }) {
     // Send properties to the client, like an access_token from a provider.

docs/docs/guides/basics/deployment.md

@@ -34,7 +34,7 @@ Most OAuth providers cannot be configured with multiple callback URLs or using a
 
 However, Auth.js **supports Preview deployments**, even **with OAuth providers**:
 
-1. Determine a stable deployment URL. Eg.: A deployment whose URL does not change between builds, for example. `auth.yourdomain.com` (using a subdomain is not a requirement, this can simply be the main site's URL too.),
+1. Determine a stable deployment URL. Eg.: A deployment whose URL does not change between builds, for example. `auth.yourdomain.com`),
 2. Set `AUTH_REDIRECT_PROXY_URL` to that URL, adding the path up until your `[...nextauth]` route. Eg.: (`https://auth.yourdomain.com/api/auth`)
 3. For your OAuth provider, set the callback URL using the stable deployment URL. Eg.: For GitHub `https://auth.yourdomain.com/api/auth/callback/github`)
 
@@ -42,9 +42,6 @@ However, Auth.js **supports Preview deployments**, even **with OAuth providers**
 To support preview deployments, the `AUTH_SECRET` value needs to be the same for the stable deployment and deployments that will need OAuth support.
 :::
 
-:::note
-If you are storing users in a [database](reference/adapters), we recommend using a different OAuth app for development/production so that you don't mix your test and production user base.
-:::
 
 <details>
 <summary>

docs/docs/guides/basics/initialization.md

@@ -2,14 +2,6 @@
 title: Custom Initialization
 ---
 
-import Tabs from "@theme/Tabs"
-import TabItem from "@theme/TabItem"
-
-
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
-
-
 In Next.js, you can define an API route that will catch all requests that begin with a certain path. Conveniently, this is called [Catch all API routes](https://nextjs.org/docs/api-routes/dynamic-api-routes#catch-all-api-routes).
 
 When you define a `/pages/api/auth/[...nextauth]` JS/TS file, you instruct Auth.js that every API request beginning with `/api/auth/*` should be handled by the code written in the `[...nextauth]` file.
@@ -128,15 +120,3 @@ This way of initializing `NextAuth` is very powerful, but should be used sparing
 :::warning
 Changing parts of the request that is essential to `NextAuth` to do it's job - like messing with the [default cookies](/reference/configuration/auth-config#cookies) - can have unforeseen consequences, and have the potential to introduce security holes if done incorrectly. Only change those if you understand consequences.
 :::
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>

docs/docs/guides/basics/overriding-jwt.md

@@ -4,10 +4,10 @@ sidebar_label: Custom JWT encoding
 ---
 
 :::warning
-If you use middleware to protect routes, make sure the same method is also set in the [`middleware.ts` options](https://next-auth.js.org/configuration/nextjs#custom-jwt-decode-method)
+If you use middleware to protect routes, make sure the same method is also set in the [`_middleware.ts` options](/reference/nextjs/#custom-jwt-decode-method)
 :::
 
-Auth.js uses encrypted JSON Web Tokens ([JWE](https://datatracker.ietf.org/doc/html/rfc7516)) by default. Unless you have a good reason, we recommend keeping this behavior. Although you can override this using the `encode` and `decode` methods. Both methods must be defined at the same time.
+Auth.js uses encrypted JSON Web Tokens ([JWE](https://datatracker.ietf.org/doc/html/rfc7516)) by default. Unless you have a good reason, we recommend keeping this behaviour. Although you can override this using the `encode` and `decode` methods. Both methods must be defined at the same time.
 
 ```js
 jwt: {

docs/docs/guides/basics/pages.md

@@ -2,16 +2,13 @@
 title: Pages
 ---
 
-import Tabs from "@theme/Tabs"
-import TabItem from "@theme/TabItem"
-
 Auth.js automatically creates simple, unbranded authentication pages for handling Sign in, Sign out, Email Verification and displaying error messages.
 
 The options displayed on the sign-up page are automatically generated based on the providers specified in the options passed to Auth.js.
 
 To add a custom login page, you can use the `pages` option:
 
-```javascript title="auth.js"
+```javascript title="pages/api/auth/[...nextauth].js"
 ...
   pages: {
     signIn: '/auth/signin',
@@ -79,11 +76,6 @@ In addition, you can define the background color and text color of the button wi
 
 In order to get the available authentication providers and the URLs to use for them, you can make a request to the API endpoint `/api/auth/providers`:
 
-
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
-
-
 ```jsx title="pages/auth/signin.js"
 import { getProviders, signIn } from "next-auth/react"
 
@@ -108,18 +100,6 @@ export async function getServerSideProps(context) {
   }
 }
 ```
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
-
 
 There is another, more fully styled example signin page available [here](https://github.com/ndom91/next-auth-example-sign-in-page).
 
@@ -127,10 +107,6 @@ There is another, more fully styled example signin page available [here](https:/
 
 If you create a custom sign in form for email sign in, you will need to submit both fields for the **email** address and **csrfToken** from **/api/auth/csrf** in a POST request to **/api/auth/signin/email**.
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
-
-
 ```jsx title="pages/auth/email-signin.js"
 import { getCsrfToken } from "next-auth/react"
 
@@ -155,18 +131,6 @@ export async function getServerSideProps(context) {
 }
 ```
 
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
-
 You can also use the `signIn()` function which will handle obtaining the CSRF token for you:
 
 ```js
@@ -177,10 +141,6 @@ signIn("email", { email: "jsmith@example.com" })
 
 If you create a sign in form for credentials based authentication, you will need to pass a **csrfToken** from **/api/auth/csrf** in a `POST` request to **/api/auth/callback/credentials**.
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js" default>
-
-
 ```jsx title="pages/auth/credentials-signin.js"
 import { getCsrfToken } from "next-auth/react"
 
@@ -210,18 +170,6 @@ export async function getServerSideProps(context) {
 }
 ```
 
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)">
-    TODO Core
-  </TabItem>
-</Tabs>
-
 You can also use the `signIn()` function which will handle obtaining the CSRF token for you:
 
 ```js

docs/docs/guides/basics/refresh-token-rotation.md

@@ -2,9 +2,6 @@
 title: Refresh token rotation
 ---
 
-import Tabs from "@theme/Tabs"
-import TabItem from "@theme/TabItem"
-
 Refresh token rotation is the practice of updating an `access_token` on behalf of the user, without requiring interaction (eg.: re-sign in). `access_token`s are usually issued for a limited time. After they expire, the service verifying them will ignore the value. Instead of asking the user to sign in again to obtain a new `access_token`, certain providers support exchanging a `refresh_token` for a new `access_token`, renewing the expiry time. Let's see how this can be achieved.
 
 :::note
@@ -29,20 +26,6 @@ Using the [jwt](../../reference/core/types#jwt) and [session](../../reference/co
 
 Below is a sample implementation using Google's Identity Provider. Please note that the OAuth 2.0 request in the `refreshAccessToken()` function will vary between different providers, but the core logic should remain similar.
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js">
-
-  TODO Next.js
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)" default>
-
 ```ts
 import { Auth } from "@auth/core"
 import { type TokenSet } from "@auth/core/types"
@@ -126,32 +109,15 @@ declare module "@auth/core/jwt" {
 }
 ```
 
-  </TabItem>
-</Tabs>
-
 #### Database strategy
 
 Using the database strategy is very similar, but instead of preserving the `access_token` and `refresh_token`, we save it, well, in the database.
 
-<Tabs groupId="frameworks" queryString>
-  <TabItem value="next" label="Next.js">
-
-  What
-
-  </TabItem>
-  <TabItem value="sveltekit" label="SvelteKit">
-    TODO SvelteKit
-  </TabItem>
-  <TabItem value="solidstart" label="SolidStart">
-    TODO SolidStart
-  </TabItem>
-  <TabItem value="core" label="Vanilla (No Framework)" default>
-
 ```ts
 import { Auth } from "@auth/core"
 import { type TokenSet } from "@auth/core/types"
 import Google from "@auth/core/providers/google"
-import { PrismaAdapter } from "@auth/prisma-adapter"
+import { PrismaAdapter } from "@next-auth/prisma-adapter"
 import { PrismaClient } from "@prisma/client"
 
 const prisma = new PrismaClient()
@@ -229,8 +195,6 @@ declare module "@auth/core/jwt" {
   }
 }
 ```
-  </TabItem>
-</Tabs>
 
 ### Client Side
 

docs/docs/guides/basics/securing-pages-and-api-routes.md

@@ -2,19 +2,19 @@
 title: Securing Pages & API routes
 ---
 
-You can protect client and server-side rendered pages and API routes with Auth.js.
+You can easily protect client and server side rendered pages and API routes with Auth.js.
 
 _You can find working examples of the approaches shown below in the [example project](https://github.com/nextauthjs/next-auth-example/)._
 
 :::tip
-The methods `getSession()` and `getToken()` both return an `object` if a session is valid and `null` if a session is not valid or has expired.
+The methods `getSession()` and `getToken()` both return an `object` if a session is valid and `null` if a session is invalid or has expired.
 :::
 
 ## Securing Pages
 
 ### Client Side
 
-If data on a page is fetched using calls to secure API routes - i.e. routes that use `getSession(`)` or `getToken()` to access the session - you can use the `useSession` React Hook to secure pages.
+If data on a page is fetched using calls to secure API routes - i.e. routes which use `getSession()` or `getToken()` to access the session - you can use the `useSession` React Hook to secure pages.
 
 ```js title="pages/client-side-example.js"
 import { useSession, getSession } from "next-auth/react"
@@ -41,7 +41,7 @@ export default function Page() {
 
 ### Next.js (Middleware)
 
-With NextAuth.js 4.2.0 and Next.js 12, you can now protect your pages via the middleware pattern more easily. If you would like to protect all pages, you can create a `_middleware.js` file in your root `pages` directory which looks like this.
+With Auth.js 4.2.0 and Next.js 12, you can now protect your pages via the middleware pattern more easily. If you would like to protect all pages, you can create a `_middleware.js` file in your root `pages` directory which looks like this.
 
 ```js title="/middleware.js"
 export { default } from "next-auth/middleware"
@@ -49,15 +49,15 @@ export { default } from "next-auth/middleware"
 
 Otherwise, if you only want to protect a subset of pages, you could put it in a subdirectory as well, for example in `/pages/admin/_middleware.js` would protect all pages under `/admin`.
 
-For the time being, the `withAuth` middleware only supports `"jwt"` as a [session strategy](/reference/configuration/auth-config#session).
+For the time being, the `withAuth` middleware only supports `"jwt"` as [session strategy](/reference/configuration/auth-config#session).
 
-More details can be found [here](https://next-auth.js.org/configuration/nextjs#middleware).
+More details can be found [here](/reference/nextjs/#middleware).
 
 ### Server Side
 
-You can protect server-side rendered pages using the `unstable_getServerSession` method. This is different from the old `getSession()` method, in that it does not do an extra fetch out over the internet to confirm data from itself, increasing performance significantly.
+You can protect server side rendered pages using the `unstable_getServerSession` method. This is different from the old `getSession()` method, in that it does not do an extra fetch out over the internet to confirm data from itself, increasing performance significantly.
 
-You need to add this to every server-rendered page you want to protect. Be aware, `unstable_getServerSession` takes slightly different arguments than the method it is replacing, `getSession`.
+You need to add this to every server rendered page you want to protect. Be aware, `unstable_getServerSession` takes slightly different arguments than the method it is replacing, `getSession`.
 
 ```js title="pages/server-side-example.js"
 import { unstable_getServerSession } from "next-auth/next"
@@ -136,7 +136,7 @@ export default async (req, res) => {
 
 ### Using getToken()
 
-If you are using JSON Web Tokens you can use the `getToken()` helper to access the contents of the JWT without having to handle JWT decryption/verification yourself. This method can only be used server side.
+If you are using JSON Web Tokens you can use the `getToken()` helper to access the contents of the JWT without having to handle JWT decryption / verification yourself. This method can only be used server side.
 
 ```js title="pages/api/get-token-example.js"
 // This is an example of how to read a JSON Web Token from an API route
@@ -157,7 +157,7 @@ export default async (req, res) => {
 ```
 
 :::tip
-You can use the `getToken()` helper function in any application as long as you set the `NEXTAUTH_URL` environment variable and the application can read the JWT cookie (e.g. is on the same domain).
+You can use the `getToken()` helper function in any application as long as you set the `NEXTAUTH_URL` environment variable and the application is able to read the JWT cookie (e.g. is on the same domain).
 :::
 
 :::note

docs/docs/guides/corporate-proxies/avoid-corporate-link-checking-email-provider.md

@@ -22,7 +22,7 @@ This can be done by simply returning a `200` response on `HEAD` requests at the
 
 For example
 
-```jsx title="auth.js"
+```jsx title="/pages/api/auth/[...nextauth].js"
 import type { NextApiRequest, NextApiResponse } from "next"
 import NextAuth from "next-auth"
 

docs/docs/guides/corporate-proxies/corporate-proxy.md

@@ -24,7 +24,7 @@ index 77161bd..1082fba 100644
 
  var _openidClient = require("openid-client");
 
-+import { HttpsProxyAgent } from 'https-proxy-agent';
++var HttpsProxyAgent = require("https-proxy-agent");
 +
  async function openidClient(options) {
    const provider = options.provider;

docs/docs/guides/providers/credentials-provider.md

@@ -35,7 +35,7 @@ If you return an object it will be persisted to the JSON Web Token and the user
 
 The Credentials provider's `authorize()` method also provides the request object as the second parameter (see the example below).
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 import CredentialsProvider from "next-auth/providers/credentials";
 ...
 providers: [

docs/docs/guides/providers/email-http-api.md

@@ -17,15 +17,15 @@ We will also refer to the [Prisma Adapter](/reference/adapter/prisma). A [databa
 
 ## Setup
 
-First, if you do not have a project using Auth.js, clone and set up a basic Auth.js project like the one [provided in our example repo](https://github.com/nextauthjs/next-auth-example).
+First, if you do not have a project using Auth.js, clone and set up a basic Auth.js project like the one [provided in](https://github.com/nextauthjs/next-auth-example.git) our example repo](https://github.com/nextauthjs/next-auth-example.git).
 
 - Install the [Prisma Adapter](/reference/adapter/prisma)
 - Generate an API key from your cloud Email provider of choice and add it to your `.env.*` file. For example, mine is going to be called `SENDGRID_API`
 - Add the following configuration to your configuration file:
 
-```js title="auth.ts"
+```js title="pages/api/auth/[...nextauth].ts"
 import NextAuth, { NextAuthOptions } from "next-auth"
-import { PrismaAdapter } from "@auth/prisma-adapter"
+import { PrismaAdapter } from "@next-auth/prisma-adapter"
 import { PrismaClient } from "@prisma/client"
 
 const prisma = new PrismaClient()
@@ -42,15 +42,16 @@ export const authOptions: NextAuthOptions = {
   ],
 }
 
+export default NextAuth(authOptions)
 ```
 
 Next, all that's left to do is call the HTTP endpoint from our cloud email provider and pass it the required metadata like the `to` address, the email `body`, and any other fields we may need to include.
 
 As mentioned earlier, we're going to be using SendGrid in this example, so the appropriate endpoint is `https://api.sendgrid.com/v3/mail/send` ([more info](https://docs.sendgrid.com/for-developers/sending-email/api-getting-started)). Therefore, we're going to pull out some of the important information from the `params` argument and use it in a `fetch()` call to the previously mentioned SendGrid API.
 
-```js title="auth.ts"
+```js title="pages/api/auth/[...nextauth].ts"
 import NextAuth, { NextAuthOptions } from "next-auth"
-import { PrismaAdapter } from "@auth/prisma-adapter"
+import { PrismaAdapter } from "@next-auth/prisma-adapter"
 import { PrismaClient } from "@prisma/client"
 
 const prisma = new PrismaClient()

docs/docs/guides/providers/email-provider.md

@@ -30,7 +30,7 @@ You can override any of the options to suit your own use case.
 ## Configuration
 
 1. Auth.js does not include `nodemailer` as a dependency, so you'll need to install it yourself if you want to use the Email Provider. Run `npm install nodemailer` or `yarn add nodemailer`.
-2. You will need an SMTP account; such as [the official Nodemailer recommended service](https://nodemailer.com/about/#example) of [Forward Email](https://forwardemail.net).
+2. You will need an SMTP account; ideally for one of the [services known to work with `nodemailer`](https://community.nodemailer.com/2-0-0-beta/setup-smtp/well-known-services/).
 3. There are two ways to configure the SMTP server connection.
 
 You can either use a connection string or a `nodemailer` configuration object.
@@ -40,13 +40,13 @@ You can either use a connection string or a `nodemailer` configuration object.
 Create an `.env` file to the root of your project and add the connection string and email address.
 
 ```js title=".env" {1}
-	EMAIL_SERVER=smtp://username:password@smtp.forwardemail.net:587
-	EMAIL_FROM=support@example.com
+	EMAIL_SERVER=smtp://username:password@smtp.example.com:587
+	EMAIL_FROM=noreply@example.com
 ```
 
 Now you can add the email provider like this:
 
-```js {3} title="auth.js"
+```js {3} title="pages/api/auth/[...nextauth].js"
 import EmailProvider from "next-auth/providers/email";
 ...
 providers: [
@@ -64,14 +64,14 @@ In your `.env` file in the root of your project simply add the configuration obj
 ```js title=".env"
 EMAIL_SERVER_USER=username
 EMAIL_SERVER_PASSWORD=password
-EMAIL_SERVER_HOST=smtp.forwardemail.net
+EMAIL_SERVER_HOST=smtp.example.com
 EMAIL_SERVER_PORT=587
 EMAIL_FROM=noreply@example.com
 ```
 
 Now you can add the provider settings to the NextAuth options object in the Email Provider.
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 import EmailProvider from "next-auth/providers/email";
 ...
 providers: [
@@ -101,7 +101,7 @@ You can fully customize the sign in email that is sent by passing a custom funct
 
 e.g.
 
-```js {3} title="auth.js"
+```js {3} title="pages/api/auth/[...nextauth].js"
 import EmailProvider from "next-auth/providers/email";
 ...
 providers: [
@@ -112,7 +112,6 @@ providers: [
       identifier: email,
       url,
       provider: { server, from },
-      request // for example can be used to get the user agent (`request.headers.get("user-agent")`) to parse and pass on to the user in the email so they can be more confident they originated the request
     }) {
       /* your function */
     },
@@ -206,7 +205,7 @@ If you want to generate great looking email client compatible HTML with React, c
 
 By default, we are generating a random verification token. You can define a `generateVerificationToken` method in your provider options if you want to override it:
 
-```js title="auth.js"
+```js title="pages/api/auth/[...nextauth].js"
 providers: [
   EmailProvider({
     async generateVerificationToken() {

docs/docs/guides/testing/testing-with-cypress.md

@@ -22,18 +22,11 @@ Next you will have to create some configuration files for Cypress.
 
 First, the primary cypress config:
 
-```ts title="cypress.config.ts"
-import { defineConfig } from 'cypress'
-
-export default defineConfig({
-  e2e: {
-    baseUrl: 'http://localhost:3000',
-    chromeWebSecurity: false,
-    setupNodeEvents(on, config) {
-      // implement node event listeners here
-    },
-  },
-})
+```js title="cypress.json"
+{
+  "baseUrl": "http://localhost:3000",
+  "chromeWebSecurity": false
+}
 ```
 
 This initial Cypress config will tell Cypress where to find your site on initial launch as well as allow it to open up URLs at domains that aren't your page, for example to be able to login to a social provider.
@@ -53,24 +46,14 @@ You must change the login credentials you want to use, but you can also redefine
 
 Third, if you're using the `cypress-social-login` plugin, you must add this to your `/cypress/plugins/index.js` file like so:
 
-```js title="cypress.config.ts" {3-4,10-14}
-import { defineConfig } from 'cypress'
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const { GoogleSocialLogin } = require('cypress-social-logins').plugins
-
-export default defineConfig({
-  e2e: {
-    baseUrl: 'http://localhost:3000',
-    chromeWebSecurity: false,
-    setupNodeEvents(on, config) {
-      on('task', {
-        GoogleSocialLogin,
-      })
-    },
-  },
-})
+```js title="cypress/plugins/index.js"
+const { GoogleSocialLogin } = require("cypress-social-logins").plugins
 
+module.exports = (on, config) => {
+  on("task", {
+    GoogleSocialLogin: GoogleSocialLogin,
+  })
+}
 ```
 
 Finally, you can also add the following npm scripts to your `package.json`:
@@ -127,6 +110,10 @@ describe("Login page", () => {
             secure: cookie.secure,
           })
 
+          Cypress.Cookies.defaults({
+            preserve: cookieName,
+          })
+
           // remove the two lines below if you need to stay logged in
           // for your remaining tests
           cy.visit("/api/auth/signout")

docs/docs/reference/adapters/index.md

@@ -8,10 +8,6 @@ Using an Auth.js / NextAuth.js adapter you can connect to any database service o
   <a href="/reference/adapter/dgraph" class="adapter-card">
     <img src="/img/adapters/dgraph.png" width="30" />
     <h4 class="adapter-card__title">Dgraph Adapter</h4>
-  </a>
-   <a href="/reference/adapter/drizzle" class="adapter-card">
-    <img src="/img/adapters/drizzle-orm.png" width="30" />
-    <h4 class="adapter-card__title">Drizzle Adapter</h4>
   </a>
   <a href="/reference/adapter/dynamodb" class="adapter-card">
     <img src="/img/adapters/dynamodb.png" width="30" />
@@ -25,10 +21,6 @@ Using an Auth.js / NextAuth.js adapter you can connect to any database service o
     <img src="/img/adapters/firebase.svg" width="40" />
     <h4 class="adapter-card__title">Firebase Adapter</h4>
   </a>
-  <a href="/reference/adapter/kysely" class="adapter-card">
-    <img src="/img/adapters/kysely.svg" width="40" />
-    <h4 class="adapter-card__title">Kysely Adapter</h4>
-  </a>
   <a href="/reference/adapter/mikro-orm" class="adapter-card">
     <img src="/img/adapters/mikro-orm.png" width="30" />
     <h4 class="adapter-card__title">Mikro ORM Adapter</h4>
@@ -75,8 +67,10 @@ Using an Auth.js / NextAuth.js adapter you can connect to any database service o
 If you don't find an adapter for the database or service you use, you can always create one yourself. Have a look at our guide on [how to create a database adapter](/guides/adapters/creating-a-database-adapter).
 :::
 
+
 ## Models
 
+
 Auth.js can be used with any database. Models tell you what structures Auth.js expects from your database. Models will vary slightly depending on which adapter you use, but in general, will look something like this:
 
 ```mermaid
@@ -102,13 +96,8 @@ erDiagram
       string type
       string provider
       string providerAccountId
-      string refresh_token
       string access_token
-      int expires_at
-      string token_type
-      string scope
       string id_token
-      string session_state
     }
     VerificationToken {
       string identifier
@@ -137,7 +126,7 @@ If a user first signs in with an OAuth provider, then their email address is aut
 This provides a way to contact users and for users to maintain access to their account and sign in using email in the event they are unable to sign in with the OAuth provider in the future (if the [Email Provider](/reference/core/providers_email) is configured).
 :::
 
-User creation in the database is automatic and happens when the user is logging in for the first time with a provider.
+User creation in the database is automatic and happens when the user is logging in for the first time with a provider. 
 If the first sign-in is via the [OAuth Provider](/reference/core/providers_oauth), the default data saved is `id`, `name`, `email` and `image`. You can add more profile data by returning extra fields in your [OAuth provider](/guides/providers/custom-provider)'s [`profile()`](/reference/core/providers#profile) callback.
 
 If the first sign-in is via the [Email Provider](/reference/core/providers_email), then the saved user will have `id`, `email`, `emailVerified`, where `emailVerified` is the timestamp of when the user was created.
@@ -148,7 +137,7 @@ The Account model is for information about OAuth accounts associated with a User
 
 A single User can have multiple Accounts, but each Account can only have one User.
 
-Account creation in the database is automatic and happens when the user is logging in for the first time with a provider, or the [`Adapter.linkAccount`](/reference/core/adapters#linkaccount) method is invoked. The default data saved is `access_token`, `expires_at`, `refresh_token`, `id_token`, `token_type`, `scope` and `session_state`. You can save other fields or remove the ones you don't need by returning them in the [OAuth provider](/guides/providers/custom-provider)'s [`account()`](/reference/core/providers#account) callback.
+Account creation in the database is automatic and happens when the user is logging in for the first time with a provider, or the [`Adapter.linkAccount`](/reference/core/adapters#linkaccount) method is invoked. The default data saved is `access_token`, `refresh_token`, `id_token` and `expires_at`. You can save other fields by returning them in the [OAuth provider](/guides/providers/custom-provider)'s [`account()`](/reference/core/providers#account) callback.
 
 Linking Accounts to Users happen automatically, only when they have the same e-mail address, and the user is currently signed in. Check the [FAQ](/concepts/faq#security) for more information on why this is a requirement.
 

docs/docs/reference/index.md

@@ -4,30 +4,29 @@ title: Overview
 
 This section of the documentation contains the API reference for all the official packages under the `@auth/*` and `@next-auth/*` scopes.
 
-## Roadmap
-
-Here are the _state_ of planned and released packages under the `@auth/*` scope. This is not an exhaustive list, but the set of packages that we would like to focus on, to begin with.
-
-|        Feature         |  Status  |
-| ---------------------- | -------- |
-| `@auth/*-adapter`      | Released (stable). Fully compatible with `next-auth` and all `@auth/*` libraries.   |
-| `@next-auth/*-adapter` | Maintenance has stopped. Update to `@auth/*-adapter`. See above.  |
-| `@auth/core`           | Released (experimental). |
-| `@auth/sveltekit`      | Released (experimental, [help needed](#help-needed)). |
-| `@auth/solid-start`    | Released (experimental, [help needed](#help-needed)). Community package: [`@solid-mediakit/auth`](https://www.npmjs.com/package/@solid-mediakit/auth) |
-| `@auth/express`        | [Planned](https://github.com/nextauthjs/next-auth/issues/8257). |
-| `@auth/remix`          | Planned, [help needed](#help-needed). |
-| `@auth/astro`          | Planned, [help needed](#help-needed). |
-| `@auth/nuxt`           | Planned, [help needed](#help-needed). Community packages: [`@sidebase/nuxt-auth`](https://github.com/sidebase/nuxt-auth), [`@hebilicious/authjs-nuxt`](https://authjs-nuxt.pages.dev/) |
-
-:::info
-`next-auth` is still the official package for Next.js. The documentation is at [next-auth.js.org](https://next-auth.js.org), while guides are being migrated over to the new documentation page. A major refactor of `next-auth` is on the way, you can [follow this PR](https://github.com/nextauthjs/next-auth/pull/7443) for updates.
+:::warning Warning
+The API reference is being migrated from the [old documentation page](https://next-auth.js.org), so there are going to be references to `next-auth` still. We are continuously working on updating the naming/references.
 :::
 
-### Help needed
+## Roadmap
 
-In case you are a maintainer of a package that uses `@auth/core`, feel free to [reach out to Balázs](https://twitter.com/balazsorban44), if you want to collaborate on making it an official package, maintained in our repository. If you are interested in bringing `@auth/core` support to your favorite framework, we would love to hear from you!
+Here are the _currently_ planned and released packages under the `@auth/*` scope. This is not an exhaustive list, but the set of packages that we would like to focus on to begin with.
 
-#### Community Packages
+|       Feature       |  Status  |
+| ------------------- | -------- |
+| `@auth/nextjs`      | Planned  |
+| `@auth/*-adapter`   | Planned  |
+| `@auth/core`        | Experimental |
+| `@auth/sveltekit`   | Experimental |
+| `@auth/solid-start` | Experimental |
 
-While we are migrating the documentation and working on stabilizing the core package, the community has been working on some packages that are already available. With collaboration, we hope to make these packages official in the future.
+### Community Packages
+
+While we are migrating the documentation and working on stabilizing the core package, the community has been working on some packages that are already available. With collaboration, we hope to make these packages official in the future.
+
+:::note
+If you are a maintainer of a package, [reach out](https://twitter.com/balazsorban44) if you want to collaborate on making it official or open a PR to add it to the list below, so others can discover it more easily.
+:::
+
+- ...
+- ...

docs/docusaurus.config.js

@@ -38,6 +38,22 @@ function typedocAdapter(name) {
   ]
 }
 
+function typedocFramework(id, entrypoints) {
+  return [
+    "docusaurus-plugin-typedoc",
+    {
+      ...typedocConfig,
+      id: id.replace("frameworks-", ""),
+      plugin: [require.resolve("./typedoc-mdn-links")],
+      watch: process.env.TYPEDOC_WATCH,
+      entryPoints: entrypoints.map((e) => `../packages/${id}/src/${e}`),
+      tsconfig: `../packages/${id}/tsconfig.json`,
+      out: `reference/${id.replace("frameworks-", "")}`,
+      sidebar: { indexLabel: "index" },
+    },
+  ]
+}
+
 /** @type {import("@docusaurus/types").Config} */
 const docusaurusConfig = {
   markdown: {
@@ -213,25 +229,7 @@ const docusaurusConfig = {
           breadcrumbs: false,
           routeBasePath: "/",
           sidebarPath: require.resolve("./sidebars.js"),
-          /**
-           *
-           * @param {{
-           *  version: string;
-           *  versionDocsDirPath: string;
-           *  docPath: string;
-           *  permalink: string;
-           *  locale: string;
-           *}} params
-           */
-          editUrl({ docPath }) {
-            // TODO: support other packages, fix directory links like "providers"
-            if (docPath.includes("reference/core")) {
-              const file = docPath.split("reference/core/")[1].replace(".md", ".ts").replace("_", "/")
-              const base = `https://github.com/nextauthjs/next-auth/edit/main/packages/core/src/${file}`
-              return base
-            }
-            return "https://github.com/nextauthjs/next-auth/edit/main/docs"
-          },
+          editUrl: "https://github.com/nextauthjs/next-auth/edit/main/docs",
           lastVersion: "current",
           showLastUpdateAuthor: true,
           showLastUpdateTime: true,
@@ -249,51 +247,34 @@ const docusaurusConfig = {
     ],
   ],
   plugins: [
-    [
-      "docusaurus-plugin-typedoc",
-      {
-        ...typedocConfig,
-        id: "core",
-        plugin: [require.resolve("./typedoc-mdn-links")],
-        watch: process.env.TYPEDOC_WATCH,
-        entryPoints: ["index.ts", "adapters.ts", "errors.ts", "jwt.ts", "types.ts"].map((e) => `${coreSrc}/${e}`).concat(providers),
-        tsconfig: "../packages/core/tsconfig.json",
-        out: "reference/core",
-        sidebar: {
-          indexLabel: "index",
-        },
-      },
-    ],
-    [
-      "docusaurus-plugin-typedoc",
-      {
-        ...typedocConfig,
-        id: "sveltekit",
-        plugin: [require.resolve("./typedoc-mdn-links")],
-        watch: process.env.TYPEDOC_WATCH,
-        entryPoints: ["index.ts", "client.ts"].map((e) => `../packages/frameworks-sveltekit/src/lib/${e}`),
-        tsconfig: "../packages/frameworks-sveltekit/tsconfig.json",
-        out: "reference/sveltekit",
-        sidebar: {
-          indexLabel: "index",
-        },
-      },
-    ],
+    typedocFramework("core", ["index.ts", "adapters.ts", "errors.ts", "jwt.ts", "types.ts"]),
+    typedocFramework("frameworks-sveltekit", ["lib/index.ts", "lib/client.ts"]),
+    typedocFramework("next-auth", ["index.ts", "react.tsx", "jwt.ts", "adapters.ts", "next.ts", "types.ts", "middleware.ts"]),
     ...(process.env.TYPEDOC_SKIP_ADAPTERS
       ? []
       : [
           typedocAdapter("Dgraph"),
-          typedocAdapter("Drizzle"),
           typedocAdapter("DynamoDB"),
           typedocAdapter("Fauna"),
           typedocAdapter("Firebase"),
-          typedocAdapter("Kysely"),
           typedocAdapter("Mikro ORM"),
           typedocAdapter("MongoDB"),
           typedocAdapter("Neo4j"),
           typedocAdapter("PouchDB"),
           typedocAdapter("Prisma"),
-          typedocAdapter("TypeORM"),
+          [
+            "docusaurus-plugin-typedoc",
+            {
+              ...typedocConfig,
+              id: "typeorm",
+              plugin: [require.resolve("./typedoc-mdn-links")],
+              watch: process.env.TYPEDOC_WATCH,
+              entryPoints: [`../packages/adapter-typeorm-legacy/src/index.ts`],
+              tsconfig: `../packages/adapter-typeorm-legacy/tsconfig.json`,
+              out: `reference/adapter/typeorm`,
+              sidebar: { indexLabel: "TypeORM" },
+            },
+          ],
           typedocAdapter("Sequelize"),
           typedocAdapter("Supabase"),
           typedocAdapter("Upstash Redis"),