Compare commits

..

11 Commits

Author SHA1 Message Date
GitHub Actions
65f4b9c942 chore(release): bump package version(s) [skip ci] 2023-06-13 15:02:46 +00:00
Balázs Orbán
1d29b0d220 feat: introduce @auth/mikro-orm-adapter (#7794)
Database adapters are not dependent on Next.js features, so it makes sense to republish them under the `@auth/*` scope.

This PR is part of a series to convert adapters, using `@auth/core` for types.

BREAKING CHANGE:
If you are coming from the previous adapter, change your `package.json`:

```diff
-  "@next-auth/mikro-orm-adapter": "0.0.0",
+  "@auth/mikro-orm-adapter": "0.0.0",
```

And run `npm install`, `yarn install` or `pnpm install` respectively.

**Note:** This packages is published as ESM-only

This package assumes that `globalThis.crypto` is available.

In older Node.js versions, you can polyfill by adding:

`globalThis.crypto ??= require("node:crypto").webcrypto`
2023-06-13 15:39:43 +01:00
Balázs Orbán
cd92aa0c82 feat: introduce @auth/dynamodb-adapter (#7793)
Database adapters are not dependent on Next.js features, so it makes sense to republish them under the `@auth/*` scope.

This PR is part of a series to convert adapters, using `@auth/core` for types.

BREAKING CHANGE:
If you are coming from the previous adapter, change your `package.json`:

```diff
-  "@next-auth/dynamodb-adapter": "0.0.0",
+  "@auth/dynamodb-adapter": "0.0.0",
```

And run `npm install`, `yarn install` or `pnpm install` respectively.

**Note:** This packages is published as ESM-only

This package assumes that `globalThis.crypto` is available.

In older Node.js versions, you can polyfill by adding:

`globalThis.crypto ??= require("node:crypto").webcrypto`
2023-06-13 15:28:33 +01:00
Balázs Orbán
d414e01181 feat: introduce @auth/dgraph-adapter (#7792)
Database adapters are not dependent on Next.js features, so it makes sense to republish them under the `@auth/*` scope.

This PR is part of a series to convert adapters, using `@auth/core` for types.
    
BREAKING CHANGE:
If you are coming from the previous adapter, change your `package.json`:

```diff
-  "@next-auth/dgraph-adapter": "0.0.0",
+  "@auth/dgraph-adapter": "0.0.0",
```

And run `npm install`, `yarn install` or `pnpm install` respectively.

**Note:** This packages is published as ESM-only

`fetch` is not polyfilled anymore.

In older Node.js versions, you can use the  `--experimental-fetch` flag, or install `undici` and add the following line:

`globalThis.fetch ??= require("undici").fetch`
2023-06-13 14:31:04 +01:00
GitHub Actions
43deda5bfb chore(release): bump package version(s) [skip ci] 2023-06-13 12:49:24 +00:00
Balázs Orbán
7e79d8c509 feat: introduce @auth/upstash-redis-adapter (#7791)
Database adapters are not dependent on Next.js features, so it makes sense to republish them under the `@auth/*` scope.

This PR is part of a series to convert adapters, using `@auth/core` for types.

BREAKING CHANGE:
If you are coming from the previous adapter, change your `package.json`:

```diff
-  "@next-auth/upstash-redis-adapter": "0.0.0",
+  "@auth/upstash-redis-adapter": "0.0.0",
```

And run `npm install`, `yarn install` or `pnpm install` respectively.

**Note:** This packages is published as ESM-only

This package assumes that `globalThis.crypto` is available.

In older Node.js versions, you can polyfill by adding:

`globalThis.crypto ??= require("node:crypto").webcrypto`
2023-06-13 14:36:38 +02:00
Balázs Orbán
ab051162a7 chore: reset @auth/mongodb-adapter version 2023-06-13 13:02:19 +01:00
Balázs Orbán
87298a0150 feat: introduce @auth/mongodb-adapter (#7790)
Database adapters are not dependent on Next.js features, so it makes sense to republish them under the `@auth/*` scope.

This PR is part of a series to convert adapters, using `@auth/core` for types.

BREAKING CHANGE:
If you are coming from the previous adapter, change your `package.json`:

```diff
-  "@next-auth/mongodb-adapter": "0.0.0",
+  "@auth/mongodb-adapter": "0.0.0",
```

And run `npm install`, `yarn install` or `pnpm install` respectively.

**Note:** This packages is published as ESM-only
2023-06-13 13:41:12 +02:00
GitHub Actions
d6abccd9a0 chore(release): bump package version(s) [skip ci] 2023-06-13 11:37:54 +00:00
Josua Frank
2f35daae37 fix(client): respect { redirect: true } in signIn() (#7775)
* Fix `signIn()` not respecting `{ redirect: true }`

* Apply suggestions from code review

---------

Co-authored-by: Balázs Orbán <info@balazsorban.com>
2023-06-13 12:14:49 +01:00
Koen Bolhuis
a0f3b04c43 docs: Fix typo in email tutorial (#7769) 2023-06-13 12:11:04 +01:00
39 changed files with 326 additions and 234 deletions

View File

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

View File

@@ -1,10 +1,10 @@
# https://github.com/github/issue-labeler#basic-examples # https://github.com/github/issue-labeler#basic-examples
dgraph: dgraph:
- "@next-auth/dgraph-adapter" - "@auth/dgraph-adapter"
dynamodb: dynamodb:
- "@next-auth/dynamodb-adapter" - "@auth/dynamodb-adapter"
fauna: fauna:
- "@next-auth/fauna-adapter" - "@next-auth/fauna-adapter"
@@ -13,10 +13,10 @@ firebase:
- "@next-auth/firebase-adapter" - "@next-auth/firebase-adapter"
mikro-orm: mikro-orm:
- "@next-auth/mikro-orm-adapter" - "@auth/mikro-orm-adapter"
mongodb: mongodb:
- "@next-auth/mongodb-adapter" - "@auth/mongodb-adapter"
neo4j: neo4j:
- "@next-auth/neo4j-adapter" - "@next-auth/neo4j-adapter"
@@ -37,7 +37,7 @@ typeorm:
- "@auth/typeorm-adapter" - "@auth/typeorm-adapter"
upstash-redis: upstash-redis:
- "@next-auth/upstash-redis-adapter" - "@auth/upstash-redis-adapter"
xata: xata:
- "@next-auth/xata-adapter" - "@next-auth/xata-adapter"

1
.gitignore vendored
View File

@@ -38,6 +38,7 @@ packages/next-auth/next
packages/*/*.js packages/*/*.js
packages/*/*.d.ts packages/*/*.d.ts
packages/*/*.d.ts.map packages/*/*.d.ts.map
packages/*/lib
# Development app # Development app
apps/dev/src/css apps/dev/src/css

View File

@@ -91,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... 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, other any of the other adapters will work just fine. For this tutorial, we're going to use the **MongoDB** adapter, but any of the other adapters will work just fine.
First, let's start by installing the adapter package: First, let's start by installing the adapter package:
```bash npm2yarn2pnpm ```bash npm2yarn2pnpm
npm install -D @next-auth/mongodb-adapter mongodb npm install -D @auth/mongodb-adapter mongodb
``` ```
and create a simple MongoDB client: and create a simple MongoDB client:
@@ -142,7 +142,7 @@ And now let's reference this new adapter from our Auth.js configuration file:
```diff title="pages/api/auth/[...nextauth].ts" ```diff title="pages/api/auth/[...nextauth].ts"
import NextAuth from "next-auth" import NextAuth from "next-auth"
import EmailProvider from "next-auth/providers/email" import EmailProvider from "next-auth/providers/email"
+ import { MongoDBAdapter } from "@next-auth/mongodb-adapter" + import { MongoDBAdapter } from "@auth/mongodb-adapter"
+ import clientPromise from "../../../lib/mongodb/client" + import clientPromise from "../../../lib/mongodb/client"
export default NextAuth({ export default NextAuth({

View File

@@ -8,14 +8,14 @@
</a> </a>
<h3 align="center"><b>Dgraph Adapter</b> - NextAuth.js / Auth.js</a></h3> <h3 align="center"><b>Dgraph Adapter</b> - NextAuth.js / Auth.js</a></h3>
<p align="center" style="align: center;"> <p align="center" style="align: center;">
<a href="https://npm.im/@next-auth/dgraph-adapter"> <a href="https://npm.im/@auth/dgraph-adapter">
<img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" /> <img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" />
</a> </a>
<a href="https://npm.im/@next-auth/dgraph-adapter"> <a href="https://npm.im/@auth/dgraph-adapter">
<img alt="npm" src="https://img.shields.io/npm/v/@next-auth/dgraph-adapter?color=green&label=@next-auth/dgraph-adapter&style=flat-square"> <img alt="npm" src="https://img.shields.io/npm/v/@auth/dgraph-adapter?color=green&label=@auth/dgraph-adapter&style=flat-square">
</a> </a>
<a href="https://www.npmtrends.com/@next-auth/dgraph-adapter"> <a href="https://www.npmtrends.com/@auth/dgraph-adapter">
<img src="https://img.shields.io/npm/dm/@next-auth/dgraph-adapter?label=%20downloads&style=flat-square" alt="Downloads" /> <img src="https://img.shields.io/npm/dm/@auth/dgraph-adapter?label=%20downloads&style=flat-square" alt="Downloads" />
</a> </a>
<a href="https://github.com/nextauthjs/next-auth/stargazers"> <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" /> <img src="https://img.shields.io/github/stars/nextauthjs/next-auth?style=flat-square" alt="Github Stars" />

View File

@@ -1,19 +1,30 @@
{ {
"name": "@next-auth/dgraph-adapter", "name": "@auth/dgraph-adapter",
"version": "1.0.6", "version": "1.0.0",
"description": "Dgraph adapter for next-auth.", "description": "Dgraph adapter for Auth.js",
"homepage": "https://authjs.dev", "homepage": "https://authjs.dev",
"repository": "https://github.com/nextauthjs/next-auth", "repository": "https://github.com/nextauthjs/next-auth",
"bugs": { "bugs": {
"url": "https://github.com/nextauthjs/next-auth/issues" "url": "https://github.com/nextauthjs/next-auth/issues"
}, },
"author": "Arnaud Derbey <arnaud@derbey.dev>", "author": "Arnaud Derbey <arnaud@derbey.dev>",
"contributors": [], "contributors": [
"main": "dist/index.js", "Balázs Orbán <info@balazsorban.com>"
"files": [
"dist",
"index.d.ts"
], ],
"type": "module",
"types": "./index.d.ts",
"files": [
"*.js",
"*.d.ts*",
"lib",
"src"
],
"exports": {
".": {
"types": "./index.d.ts",
"import": "./index.js"
}
},
"license": "ISC", "license": "ISC",
"keywords": [ "keywords": [
"next-auth", "next-auth",
@@ -29,10 +40,6 @@
"build": "tsc", "build": "tsc",
"test": "./tests/test.sh" "test": "./tests/test.sh"
}, },
"peerDependencies": {
"jsonwebtoken": "^8.5.1",
"next-auth": "^4"
},
"devDependencies": { "devDependencies": {
"@next-auth/adapter-test": "workspace:*", "@next-auth/adapter-test": "workspace:*",
"@next-auth/tsconfig": "workspace:*", "@next-auth/tsconfig": "workspace:*",
@@ -40,12 +47,12 @@
"@types/jsonwebtoken": "^8.5.5", "@types/jsonwebtoken": "^8.5.5",
"@types/node-fetch": "^2.5.11", "@types/node-fetch": "^2.5.11",
"jest": "^27.4.3", "jest": "^27.4.3",
"next-auth": "workspace:*", "ts-jest": "^27.0.3",
"ts-jest": "^27.0.3" "undici": "5.22.1"
}, },
"dependencies": { "dependencies": {
"jsonwebtoken": "^8.5.1", "@auth/core": "workspace:*",
"node-fetch": "^2.6.1" "jsonwebtoken": "^8.5.1"
}, },
"jest": { "jest": {
"preset": "@next-auth/adapter-test/jest" "preset": "@next-auth/adapter-test/jest"

View File

@@ -9,18 +9,18 @@
* ## Installation * ## Installation
* *
* ```bash npm2yarn2pnpm * ```bash npm2yarn2pnpm
* npm install next-auth @next-auth/dgraph-adapter * npm install next-auth @auth/dgraph-adapter
* ``` * ```
* *
* @module @next-auth/dgraph-adapter * @module @auth/dgraph-adapter
*/ */
import { client as dgraphClient } from "./client" import { client as dgraphClient } from "./lib/client"
import { format } from "./utils" import { format } from "./lib/utils"
import type { Adapter } from "next-auth/adapters" import type { Adapter } from "@auth/core/adapters"
import type { DgraphClientParams } from "./client" import type { DgraphClientParams } from "./lib/client"
import * as defaultFragments from "./graphql/fragments" import * as defaultFragments from "./lib/graphql/fragments"
export type { DgraphClientParams, DgraphClientError } from "./client" export type { DgraphClientParams, DgraphClientError } from "./lib/client"
/** This is the interface of the Dgraph adapter options. */ /** This is the interface of the Dgraph adapter options. */
export interface DgraphAdapterOptions { export interface DgraphAdapterOptions {
@@ -28,7 +28,7 @@ export interface DgraphAdapterOptions {
* The GraphQL {@link https://dgraph.io/docs/query-language/fragments/ Fragments} you can supply to the adapter * The GraphQL {@link https://dgraph.io/docs/query-language/fragments/ Fragments} you can supply to the adapter
* to define how the shapes of the `user`, `account`, `session`, `verificationToken` entities look. * to define how the shapes of the `user`, `account`, `session`, `verificationToken` entities look.
* *
* By default the adapter will uses the [default defined fragments](https://github.com/nextauthjs/next-auth/blob/main/packages/adapter-dgraph/src/graphql/fragments.ts) * By default the adapter will uses the [default defined fragments](https://github.com/nextauthjs/next-auth/blob/main/packages/adapter-dgraph/src/lib/graphql/fragments.ts)
* , this config option allows to extend them. * , this config option allows to extend them.
*/ */
fragments?: { fragments?: {
@@ -48,7 +48,7 @@ export { format }
* *
* ```ts title="pages/api/auth/[...nextauth].js" * ```ts title="pages/api/auth/[...nextauth].js"
* import NextAuth from "next-auth" * import NextAuth from "next-auth"
* import { DgraphAdapter } from "@next-auth/dgraph-adapter" * import { DgraphAdapter } from "@auth/dgraph-adapter"
* *
* export default NextAuth({ * export default NextAuth({
* providers: [], * providers: [],

View File

@@ -1,7 +1,4 @@
import * as jwt from "jsonwebtoken" import * as jwt from "jsonwebtoken"
import fetch from "node-fetch"
import type { HeadersInit } from "node-fetch"
export interface DgraphClientParams { export interface DgraphClientParams {
endpoint: string endpoint: string

View File

@@ -1,12 +1,14 @@
import { DgraphAdapter, format } from "../src" import { DgraphAdapter, format } from "../src"
import { client as dgraphClient } from "../src/client" import { client as dgraphClient } from "../src/lib/client"
import * as fragments from "../src/graphql/fragments" import * as fragments from "../src/lib/graphql/fragments"
import { runBasicTests } from "@next-auth/adapter-test" import { runBasicTests } from "@next-auth/adapter-test"
import fs from "fs" import fs from "fs"
import path from "path" import path from "path"
import type { DgraphClientParams } from "../src" import type { DgraphClientParams } from "../src"
globalThis.fetch ??= require("undici").fetch
const params: DgraphClientParams = { const params: DgraphClientParams = {
endpoint: "http://localhost:8080/graphql", endpoint: "http://localhost:8080/graphql",
authToken: "test", authToken: "test",

View File

@@ -21,7 +21,7 @@ dgraph/standalone
echo "Waiting 15 sec for db to start..." && sleep 15 echo "Waiting 15 sec for db to start..." && sleep 15
head -n -1 src/graphql/schema.gql > tests/test.schema.gql head -n -1 src/lib/graphql/schema.gql > tests/test.schema.gql
PUBLIC_KEY=$(sed 's/$/\\n/' tests/public.key | tr -d '\n') PUBLIC_KEY=$(sed 's/$/\\n/' tests/public.key | tr -d '\n')
echo "# Dgraph.Authorization {\"VerificationKey\":\"$PUBLIC_KEY\",\"Namespace\":\"https://dgraph.io/jwt/claims\",\"Header\":\"Authorization\",\"Algo\":\"RS256\"}" >> tests/test.schema.gql echo "# Dgraph.Authorization {\"VerificationKey\":\"$PUBLIC_KEY\",\"Namespace\":\"https://dgraph.io/jwt/claims\",\"Header\":\"Authorization\",\"Algo\":\"RS256\"}" >> tests/test.schema.gql

View File

@@ -1,8 +1,25 @@
{ {
"extends": "@next-auth/tsconfig/tsconfig.adapters.json", "extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"allowJs": true,
"baseUrl": ".",
"isolatedModules": true,
"target": "ES2020",
"module": "ESNext",
"moduleResolution": "node",
"outDir": ".",
"rootDir": "src", "rootDir": "src",
"outDir": "dist" "skipDefaultLibCheck": true,
"strictNullChecks": true,
"stripInternal": true,
"declarationMap": true,
"declaration": true
}, },
"exclude": ["tests", "dist", "jest.config.js"] "include": [
} "src/**/*"
],
"exclude": [
"*.js",
"*.d.ts",
]
}

View File

@@ -8,14 +8,14 @@
</a> </a>
<h3 align="center"><b>DynamoDB Adapter</b> - NextAuth.js / Auth.js</a></h3> <h3 align="center"><b>DynamoDB Adapter</b> - NextAuth.js / Auth.js</a></h3>
<p align="center" style="align: center;"> <p align="center" style="align: center;">
<a href="https://npm.im/@next-auth/dynamodb-adapter"> <a href="https://npm.im/@auth/dynamodb-adapter">
<img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" /> <img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" />
</a> </a>
<a href="https://npm.im/@next-auth/dynamodb-adapter"> <a href="https://npm.im/@auth/dynamodb-adapter">
<img alt="npm" src="https://img.shields.io/npm/v/@next-auth/dynamodb-adapter?color=green&label=@next-auth/dynamodb-adapter&style=flat-square"> <img alt="npm" src="https://img.shields.io/npm/v/@auth/dynamodb-adapter?color=green&label=@auth/dynamodb-adapter&style=flat-square">
</a> </a>
<a href="https://www.npmtrends.com/@next-auth/dynamodb-adapter"> <a href="https://www.npmtrends.com/@auth/dynamodb-adapter">
<img src="https://img.shields.io/npm/dm/@next-auth/dynamodb-adapter?label=%20downloads&style=flat-square" alt="Downloads" /> <img src="https://img.shields.io/npm/dm/@auth/dynamodb-adapter?label=%20downloads&style=flat-square" alt="Downloads" />
</a> </a>
<a href="https://github.com/nextauthjs/next-auth/stargazers"> <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" /> <img src="https://img.shields.io/github/stars/nextauthjs/next-auth?style=flat-square" alt="Github Stars" />

View File

@@ -1,7 +1,7 @@
{ {
"name": "@next-auth/dynamodb-adapter", "name": "@auth/dynamodb-adapter",
"repository": "https://github.com/nextauthjs/next-auth", "repository": "https://github.com/nextauthjs/next-auth",
"version": "3.0.2", "version": "1.0.0",
"description": "AWS DynamoDB adapter for next-auth.", "description": "AWS DynamoDB adapter for next-auth.",
"keywords": [ "keywords": [
"next-auth", "next-auth",
@@ -9,18 +9,10 @@
"oauth", "oauth",
"dynamodb" "dynamodb"
], ],
"type": "module",
"types": "./index.d.ts",
"homepage": "https://authjs.dev", "homepage": "https://authjs.dev",
"bugs": { "bugs": {
"url": "https://github.com/nextauthjs/next-auth/issues" "url": "https://github.com/nextauthjs/next-auth/issues"
}, },
"exports": {
".": {
"types": "./index.d.ts",
"import": "./index.js"
}
},
"private": false, "private": false,
"publishConfig": { "publishConfig": {
"access": "public" "access": "public"
@@ -32,19 +24,27 @@
"clean": "rm -rf index.*", "clean": "rm -rf index.*",
"build": "pnpm clean && tsc" "build": "pnpm clean && tsc"
}, },
"author": "Pol Marnette",
"contributors": [
"Balázs Orbán <info@balazsorban.com>"
],
"license": "ISC",
"type": "module",
"types": "./index.d.ts",
"files": [ "files": [
"README.md", "*.js",
"index.js", "*.d.ts*",
"index.d.ts",
"index.d.ts.map",
"src" "src"
], ],
"author": "Pol Marnette", "exports": {
"license": "ISC", ".": {
"types": "./index.d.ts",
"import": "./index.js"
}
},
"peerDependencies": { "peerDependencies": {
"@aws-sdk/client-dynamodb": "^3.36.1", "@aws-sdk/client-dynamodb": "^3.36.1",
"@aws-sdk/lib-dynamodb": "^3.36.1", "@aws-sdk/lib-dynamodb": "^3.36.1"
"next-auth": "^4"
}, },
"devDependencies": { "devDependencies": {
"@aws-sdk/client-dynamodb": "^3.36.1", "@aws-sdk/client-dynamodb": "^3.36.1",
@@ -52,11 +52,9 @@
"@next-auth/adapter-test": "workspace:*", "@next-auth/adapter-test": "workspace:*",
"@next-auth/tsconfig": "workspace:*", "@next-auth/tsconfig": "workspace:*",
"@shelf/jest-dynamodb": "^2.1.0", "@shelf/jest-dynamodb": "^2.1.0",
"@types/uuid": "^9.0.0", "jest": "^27.4.3"
"jest": "^27.4.3",
"next-auth": "workspace:*"
}, },
"dependencies": { "dependencies": {
"uuid": "^9.0.0" "@auth/core": "workspace:*"
} }
} }

View File

@@ -9,12 +9,11 @@
* ## Installation * ## Installation
* *
* ```bash npm2yarn2pnpm * ```bash npm2yarn2pnpm
* npm install next-auth @next-auth/dynamodb-adapter * npm install next-auth @auth/dynamodb-adapter
* ``` * ```
* *
* @module @next-auth/dynamodb-adapter * @module @auth/dynamodb-adapter
*/ */
import { v4 as uuid } from "uuid"
import type { import type {
BatchWriteCommandInput, BatchWriteCommandInput,
@@ -26,7 +25,7 @@ import type {
AdapterAccount, AdapterAccount,
AdapterUser, AdapterUser,
VerificationToken, VerificationToken,
} from "next-auth/adapters" } from "@auth/core/adapters"
export interface DynamoDBAdapterOptions { export interface DynamoDBAdapterOptions {
tableName?: string tableName?: string
@@ -53,7 +52,7 @@ export interface DynamoDBAdapterOptions {
* import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb" * import { DynamoDBDocument } from "@aws-sdk/lib-dynamodb"
* import NextAuth from "next-auth"; * import NextAuth from "next-auth";
* import Providers from "next-auth/providers"; * import Providers from "next-auth/providers";
* import { DynamoDBAdapter } from "@next-auth/dynamodb-adapter" * import { DynamoDBAdapter } from "@auth/dynamodb-adapter"
* *
* const config: DynamoDBClientConfig = { * const config: DynamoDBClientConfig = {
* credentials: { * credentials: {
@@ -187,7 +186,7 @@ export function DynamoDBAdapter(
async createUser(data) { async createUser(data) {
const user: AdapterUser = { const user: AdapterUser = {
...(data as any), ...(data as any),
id: uuid(), id: crypto.randomUUID(),
} }
await client.put({ await client.put({
@@ -312,7 +311,7 @@ export function DynamoDBAdapter(
async linkAccount(data) { async linkAccount(data) {
const item = { const item = {
...data, ...data,
id: uuid(), id: crypto.randomUUID(),
[pk]: `USER#${data.userId}`, [pk]: `USER#${data.userId}`,
[sk]: `ACCOUNT#${data.provider}#${data.providerAccountId}`, [sk]: `ACCOUNT#${data.provider}#${data.providerAccountId}`,
[GSI1PK]: `ACCOUNT#${data.provider}`, [GSI1PK]: `ACCOUNT#${data.provider}`,
@@ -376,7 +375,7 @@ export function DynamoDBAdapter(
}, },
async createSession(data) { async createSession(data) {
const session = { const session = {
id: uuid(), id: crypto.randomUUID(),
...data, ...data,
} }
await client.put({ await client.put({

View File

@@ -1,16 +1,25 @@
{ {
"extends": "@next-auth/tsconfig/tsconfig.adapters.json", "extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"rootDir": "src", "allowJs": true,
"outDir": ".", "baseUrl": ".",
"isolatedModules": true,
"target": "ES2020", "target": "ES2020",
"module": "ESNext", "module": "ESNext",
"moduleResolution": "node", "moduleResolution": "node",
"outDir": ".",
"rootDir": "src",
"skipDefaultLibCheck": true, "skipDefaultLibCheck": true,
"strictNullChecks": true, "strictNullChecks": true,
"stripInternal": true, "stripInternal": true,
"declarationMap": true, "declarationMap": true,
"declaration": true "declaration": true
}, },
"exclude": ["tests", "dist", "jest.config.js", "jest-dynamodb-config.js"] "include": [
} "src/**/*"
],
"exclude": [
"*.js",
"*.d.ts",
]
}

View File

@@ -0,0 +1 @@
//registry.npmjs.org/:_authToken=${NPM_TOKEN}

View File

@@ -8,14 +8,14 @@
</a> </a>
<h3 align="center"><b>MikroORM Adapter</b> - NextAuth.js / Auth.js</a></h3> <h3 align="center"><b>MikroORM Adapter</b> - NextAuth.js / Auth.js</a></h3>
<p align="center" style="align: center;"> <p align="center" style="align: center;">
<a href="https://npm.im/@next-auth/mikro-orm-adapter"> <a href="https://npm.im/@auth/mikro-orm-adapter">
<img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" /> <img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" />
</a> </a>
<a href="https://npm.im/@next-auth/mikro-orm-adapter"> <a href="https://npm.im/@auth/mikro-orm-adapter">
<img alt="npm" src="https://img.shields.io/npm/v/@next-auth/mikro-orm-adapter?color=green&label=@next-auth/mikro-orm-adapter&style=flat-square"> <img alt="npm" src="https://img.shields.io/npm/v/@auth/mikro-orm-adapter?color=green&label=@auth/mikro-orm-adapter&style=flat-square">
</a> </a>
<a href="https://www.npmtrends.com/@next-auth/mikro-orm-adapter"> <a href="https://www.npmtrends.com/@auth/mikro-orm-adapter">
<img src="https://img.shields.io/npm/dm/@next-auth/mikro-orm-adapter?label=%20downloads&style=flat-square" alt="Downloads" /> <img src="https://img.shields.io/npm/dm/@auth/mikro-orm-adapter?label=%20downloads&style=flat-square" alt="Downloads" />
</a> </a>
<a href="https://github.com/nextauthjs/next-auth/stargazers"> <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" /> <img src="https://img.shields.io/github/stars/nextauthjs/next-auth?style=flat-square" alt="Github Stars" />

View File

@@ -1,7 +1,7 @@
{ {
"name": "@next-auth/mikro-orm-adapter", "name": "@auth/mikro-orm-adapter",
"version": "3.0.1", "version": "1.0.0",
"description": "MikroORM adapter for next-auth.", "description": "MikroORM adapter for Auth.js",
"homepage": "https://authjs.dev", "homepage": "https://authjs.dev",
"repository": "https://github.com/nextauthjs/next-auth", "repository": "https://github.com/nextauthjs/next-auth",
"bugs": { "bugs": {
@@ -11,7 +11,20 @@
"contributors": [ "contributors": [
"Balázs Orbán <info@balazsorban.com>" "Balázs Orbán <info@balazsorban.com>"
], ],
"main": "dist/index.js", "type": "module",
"types": "./index.d.ts",
"files": [
"*.js",
"*.d.ts*",
"lib",
"src"
],
"exports": {
".": {
"types": "./index.d.ts",
"import": "./index.js"
}
},
"license": "ISC", "license": "ISC",
"keywords": [ "keywords": [
"next-auth", "next-auth",
@@ -27,27 +40,20 @@
"test": "jest --runInBand", "test": "jest --runInBand",
"build": "tsc" "build": "tsc"
}, },
"files": [
"README.md",
"dist"
],
"peerDependencies": { "peerDependencies": {
"@mikro-orm/core": "^5", "@mikro-orm/core": "^5"
"next-auth": "^4"
}, },
"devDependencies": { "devDependencies": {
"@mikro-orm/core": "^5", "@mikro-orm/core": "^5",
"@mikro-orm/sqlite": "^5", "@mikro-orm/sqlite": "^5",
"@next-auth/adapter-test": "workspace:*", "@next-auth/adapter-test": "workspace:*",
"@next-auth/tsconfig": "workspace:*", "@next-auth/tsconfig": "workspace:*",
"@types/uuid": ">=8", "jest": "^29"
"jest": "^29",
"next-auth": "workspace:*"
}, },
"dependencies": { "dependencies": {
"uuid": "^9" "@auth/core": "workspace:*"
}, },
"jest": { "jest": {
"preset": "@next-auth/adapter-test/jest" "preset": "@next-auth/adapter-test/jest"
} }
} }

View File

@@ -9,10 +9,10 @@
* ## Installation * ## Installation
* *
* ```bash npm2yarn2pnpm * ```bash npm2yarn2pnpm
* npm install next-auth @next-auth/dynamodb-adapter @aws-sdk/client-dynamodb @aws-sdk/lib-dynamodb * npm install @mikro-orm/core @auth/mikro-orm-adapter
* ``` * ```
* *
* @module @next-auth/dynamodb-adapter * @module @auth/mikro-orm-adapter
*/ */
import type { import type {
Connection, Connection,
@@ -20,11 +20,11 @@ import type {
Options as ORMOptions, Options as ORMOptions,
} from "@mikro-orm/core" } from "@mikro-orm/core"
import type { Adapter } from "next-auth/adapters" import type { Adapter } from "@auth/core/adapters"
import { MikroORM, wrap } from "@mikro-orm/core" import { MikroORM, wrap } from "@mikro-orm/core"
import * as defaultEntities from "./entities" import * as defaultEntities from "./lib/entities"
export { defaultEntities } export { defaultEntities }
@@ -35,7 +35,7 @@ export { defaultEntities }
* *
* ```typescript title="pages/api/auth/[...nextauth].ts" * ```typescript title="pages/api/auth/[...nextauth].ts"
* import NextAuth from "next-auth" * import NextAuth from "next-auth"
* import { MikroOrmAdapter } from "@next-auth/mikro-orm-adapter" * import { MikroOrmAdapter } from "@auth/mikro-orm-adapter"
* *
* export default NextAuth({ * export default NextAuth({
* adapter: MikroOrmAdapter({ * adapter: MikroOrmAdapter({
@@ -67,7 +67,7 @@ export { defaultEntities }
* Property, * Property,
* Unique, * Unique,
* } from "@mikro-orm/core" * } from "@mikro-orm/core"
* import { defaultEntities } from "@next-auth/mikro-orm-adapter" * import { defaultEntities } from "@auth/mikro-orm-adapter"
* *
* const { Account, Session } = defaultEntities * const { Account, Session } = defaultEntities
* *
@@ -124,7 +124,7 @@ export { defaultEntities }
* *
* ```typescript title="config/mikro-orm.ts" * ```typescript title="config/mikro-orm.ts"
* import { Options } from "@mikro-orm/core"; * import { Options } from "@mikro-orm/core";
* import { defaultEntities } from "@next-auth/mikro-orm-adapter" * import { defaultEntities } from "@auth/mikro-orm-adapter"
* *
* const config: Options = { * const config: Options = {
* ... * ...
@@ -186,7 +186,6 @@ export function MikroOrmAdapter<
* Method used in testing. You won't need to call this in your app. * Method used in testing. You won't need to call this in your app.
* @internal * @internal
*/ */
// @ts-expect-error
async __disconnect() { async __disconnect() {
const em = await getEM() const em = await getEM()
await em.getConnection().close() await em.getConnection().close()
@@ -240,6 +239,7 @@ export function MikroOrmAdapter<
return wrap(user).toObject() return wrap(user).toObject()
}, },
// @ts-expect-error
async linkAccount(data) { async linkAccount(data) {
const em = await getEM() const em = await getEM()
const user = await em.findOne(UserModel, { id: data.userId }) const user = await em.findOne(UserModel, { id: data.userId })
@@ -251,6 +251,7 @@ export function MikroOrmAdapter<
return wrap(account).toObject() return wrap(account).toObject()
}, },
// @ts-expect-error
async unlinkAccount(provider_providerAccountId) { async unlinkAccount(provider_providerAccountId) {
const em = await getEM() const em = await getEM()
const account = await em.findOne(AccountModel, { const account = await em.findOne(AccountModel, {

View File

@@ -1,5 +1,3 @@
import { v4 as randomUUID } from "uuid"
import { import {
Property, Property,
Unique, Unique,
@@ -16,8 +14,7 @@ import type {
AdapterAccount, AdapterAccount,
AdapterSession, AdapterSession,
VerificationToken as AdapterVerificationToken, VerificationToken as AdapterVerificationToken,
} from "next-auth/adapters" } from "@auth/core/adapters"
import type { ProviderType } from "next-auth/providers"
type RemoveIndex<T> = { type RemoveIndex<T> = {
// eslint-disable-next-line @typescript-eslint/ban-types // eslint-disable-next-line @typescript-eslint/ban-types
@@ -27,7 +24,7 @@ type RemoveIndex<T> = {
@Entity() @Entity()
export class User implements RemoveIndex<AdapterUser> { export class User implements RemoveIndex<AdapterUser> {
@PrimaryKey() @PrimaryKey()
id: string = randomUUID() id: string = crypto.randomUUID()
@Property({ type: types.string, nullable: true }) @Property({ type: types.string, nullable: true })
name?: string name?: string
@@ -63,7 +60,7 @@ export class User implements RemoveIndex<AdapterUser> {
export class Session implements AdapterSession { export class Session implements AdapterSession {
@PrimaryKey() @PrimaryKey()
@Property({ type: types.string }) @Property({ type: types.string })
id: string = randomUUID() id: string = crypto.randomUUID()
@ManyToOne({ @ManyToOne({
entity: "User", entity: "User",
@@ -88,7 +85,7 @@ export class Session implements AdapterSession {
export class Account implements RemoveIndex<AdapterAccount> { export class Account implements RemoveIndex<AdapterAccount> {
@PrimaryKey() @PrimaryKey()
@Property({ type: types.string }) @Property({ type: types.string })
id: string = randomUUID() id: string = crypto.randomUUID()
@ManyToOne({ @ManyToOne({
entity: "User", entity: "User",
@@ -101,7 +98,7 @@ export class Account implements RemoveIndex<AdapterAccount> {
userId!: string userId!: string
@Property({ type: types.string }) @Property({ type: types.string })
type!: ProviderType type!: AdapterAccount["type"]
@Property({ type: types.string }) @Property({ type: types.string })
provider!: string provider!: string

View File

@@ -13,13 +13,15 @@ import {
Options, Options,
types, types,
} from "@mikro-orm/core" } from "@mikro-orm/core"
import { randomUUID, runBasicTests } from "@next-auth/adapter-test" import { runBasicTests } from "@next-auth/adapter-test"
globalThis.crypto ??= require("node:crypto").webcrypto
@Entity() @Entity()
export class User implements defaultEntities.User { export class User implements defaultEntities.User {
@PrimaryKey() @PrimaryKey()
@Property({ type: types.string }) @Property({ type: types.string })
id: string = randomUUID() id: string = crypto.randomUUID()
@Property({ type: types.string, nullable: true }) @Property({ type: types.string, nullable: true })
name?: string name?: string
@@ -60,7 +62,7 @@ export class User implements defaultEntities.User {
export class VeryImportantEntity { export class VeryImportantEntity {
@PrimaryKey() @PrimaryKey()
@Property({ type: types.string }) @Property({ type: types.string })
id: string = randomUUID() id: string = crypto.randomUUID()
@Property({ type: types.boolean }) @Property({ type: types.boolean })
important = true important = true

View File

@@ -1,13 +1,27 @@
{ {
"extends": "@next-auth/tsconfig/tsconfig.adapters.json", "extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"experimentalDecorators": true, "allowJs": true,
"emitDecoratorMetadata": true, "baseUrl": ".",
"esModuleInterop": true, "isolatedModules": true,
"target": "ES2020",
"module": "ESNext",
"moduleResolution": "node",
"outDir": ".",
"rootDir": "src", "rootDir": "src",
"outDir": "dist", "skipDefaultLibCheck": true,
"stripInternal": true "strictNullChecks": true,
"stripInternal": true,
"declarationMap": true,
"declaration": true,
"experimentalDecorators": true,
"emitDecoratorMetadata": true
}, },
"include": ["src"], "include": [
"exclude": ["dist", "test", "node_modules"] "src/**/*",
} ],
"exclude": [
"*.js",
"*.d.ts",
]
}

View File

@@ -8,14 +8,14 @@
</a> </a>
<h3 align="center"><b>MongoDB Adapter</b> - NextAuth.js / Auth.js</a></h3> <h3 align="center"><b>MongoDB Adapter</b> - NextAuth.js / Auth.js</a></h3>
<p align="center" style="align: center;"> <p align="center" style="align: center;">
<a href="https://npm.im/@next-auth/mongodb-adapter"> <a href="https://npm.im/@auth/mongodb-adapter">
<img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" /> <img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" />
</a> </a>
<a href="https://npm.im/@next-auth/mongodb-adapter"> <a href="https://npm.im/@auth/mongodb-adapter">
<img alt="npm" src="https://img.shields.io/npm/v/@next-auth/mongodb-adapter?color=green&label=@next-auth/mongodb-adapter&style=flat-square"> <img alt="npm" src="https://img.shields.io/npm/v/@auth/mongodb-adapter?color=green&label=@auth/mongodb-adapter&style=flat-square">
</a> </a>
<a href="https://www.npmtrends.com/@next-auth/mongodb-adapter"> <a href="https://www.npmtrends.com/@auth/mongodb-adapter">
<img src="https://img.shields.io/npm/dm/@next-auth/mongodb-adapter?label=%20downloads&style=flat-square" alt="Downloads" /> <img src="https://img.shields.io/npm/dm/@auth/mongodb-adapter?label=%20downloads&style=flat-square" alt="Downloads" />
</a> </a>
<a href="https://github.com/nextauthjs/next-auth/stargazers"> <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" /> <img src="https://img.shields.io/github/stars/nextauthjs/next-auth?style=flat-square" alt="Github Stars" />

View File

@@ -1,14 +1,26 @@
{ {
"name": "@next-auth/mongodb-adapter", "name": "@auth/mongodb-adapter",
"version": "1.1.3", "version": "1.0.0",
"description": "mongoDB adapter for next-auth.", "description": "MongoDB adapter for Auth.js",
"homepage": "https://authjs.dev", "homepage": "https://authjs.dev",
"repository": "https://github.com/nextauthjs/next-auth", "repository": "https://github.com/nextauthjs/next-auth",
"bugs": { "bugs": {
"url": "https://github.com/nextauthjs/next-auth/issues" "url": "https://github.com/nextauthjs/next-auth/issues"
}, },
"author": "Balázs Orbán <info@balazsorban.com>", "author": "Balázs Orbán <info@balazsorban.com>",
"main": "dist/index.js", "type": "module",
"types": "./index.d.ts",
"files": [
"*.js",
"*.d.ts*",
"src"
],
"exports": {
".": {
"types": "./index.d.ts",
"import": "./index.js"
}
},
"license": "ISC", "license": "ISC",
"keywords": [ "keywords": [
"next-auth", "next-auth",
@@ -26,20 +38,17 @@
"test:watch": "./tests/test.sh -w", "test:watch": "./tests/test.sh -w",
"build": "tsc" "build": "tsc"
}, },
"files": [ "dependencies": {
"README.md", "@auth/core": "workspace:*"
"dist" },
],
"peerDependencies": { "peerDependencies": {
"mongodb": "^5 || ^4", "mongodb": "^5 || ^4"
"next-auth": "^4"
}, },
"devDependencies": { "devDependencies": {
"@next-auth/adapter-test": "workspace:*", "@next-auth/adapter-test": "workspace:*",
"@next-auth/tsconfig": "workspace:*", "@next-auth/tsconfig": "workspace:*",
"jest": "^27.4.3", "jest": "^27.4.3",
"mongodb": "^5.1.0", "mongodb": "^5.1.0"
"next-auth": "workspace:*"
}, },
"jest": { "jest": {
"preset": "@next-auth/adapter-test/jest" "preset": "@next-auth/adapter-test/jest"

View File

@@ -9,10 +9,10 @@
* ## Installation * ## Installation
* *
* ```bash npm2yarn2pnpm * ```bash npm2yarn2pnpm
* npm install next-auth @next-auth/mongodb-adapter mongodb * npm install @auth/mongodb-adapter mongodb
* ``` * ```
* *
* @module @next-auth/mongodb-adapter * @module @auth/mongodb-adapter
*/ */
import { ObjectId } from "mongodb" import { ObjectId } from "mongodb"
@@ -22,7 +22,7 @@ import type {
AdapterAccount, AdapterAccount,
AdapterSession, AdapterSession,
VerificationToken, VerificationToken,
} from "next-auth/adapters" } from "@auth/core/adapters"
import type { MongoClient } from "mongodb" import type { MongoClient } from "mongodb"
/** This is the interface of the MongoDB adapter options. */ /** This is the interface of the MongoDB adapter options. */
@@ -132,7 +132,7 @@ export function _id(hex?: string) {
* *
* ```js * ```js
* import NextAuth from "next-auth" * import NextAuth from "next-auth"
* import { MongoDBAdapter } from "@next-auth/mongodb-adapter" * import { MongoDBAdapter } from "@auth/mongodb-adapter"
* import clientPromise from "../../../lib/mongodb" * import clientPromise from "../../../lib/mongodb"
* *
* // For more information on each option (and a full list of options) go to * // For more information on each option (and a full list of options) go to

View File

@@ -1,8 +1,25 @@
{ {
"extends": "@next-auth/tsconfig/tsconfig.adapters.json", "extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"allowJs": true,
"baseUrl": ".",
"isolatedModules": true,
"target": "ES2020",
"module": "ESNext",
"moduleResolution": "node",
"outDir": ".",
"rootDir": "src", "rootDir": "src",
"outDir": "dist" "skipDefaultLibCheck": true,
"strictNullChecks": true,
"stripInternal": true,
"declarationMap": true,
"declaration": true
}, },
"exclude": ["tests", "dist", "jest.config.js"] "include": [
} "src/**/*"
],
"exclude": [
"*.js",
"*.d.ts",
]
}

View File

@@ -0,0 +1 @@
//registry.npmjs.org/:_authToken=${NPM_TOKEN}

View File

@@ -8,14 +8,14 @@
</a> </a>
<h3 align="center"><b>Upstash Redis Adapter</b> - NextAuth.js / Auth.js</a></h3> <h3 align="center"><b>Upstash Redis Adapter</b> - NextAuth.js / Auth.js</a></h3>
<p align="center" style="align: center;"> <p align="center" style="align: center;">
<a href="https://npm.im/@next-auth/upstash-redis-adapter"> <a href="https://npm.im/@auth/upstash-redis-adapter">
<img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" /> <img src="https://img.shields.io/badge/TypeScript-blue?style=flat-square" alt="TypeScript" />
</a> </a>
<a href="https://npm.im/@next-auth/upstash-redis-adapter"> <a href="https://npm.im/@auth/upstash-redis-adapter">
<img alt="npm" src="https://img.shields.io/npm/v/@next-auth/upstash-redis-adapter?color=green&label=@next-auth/upstash-redis-adapter&style=flat-square"> <img alt="npm" src="https://img.shields.io/npm/v/@auth/upstash-redis-adapter?color=green&label=@auth/upstash-redis-adapter&style=flat-square">
</a> </a>
<a href="https://www.npmtrends.com/@next-auth/upstash-redis-adapter"> <a href="https://www.npmtrends.com/@auth/upstash-redis-adapter">
<img src="https://img.shields.io/npm/dm/@next-auth/upstash-redis-adapter?label=%20downloads&style=flat-square" alt="Downloads" /> <img src="https://img.shields.io/npm/dm/@auth/upstash-redis-adapter?label=%20downloads&style=flat-square" alt="Downloads" />
</a> </a>
<a href="https://github.com/nextauthjs/next-auth/stargazers"> <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" /> <img src="https://img.shields.io/github/stars/nextauthjs/next-auth?style=flat-square" alt="Github Stars" />

View File

@@ -1,14 +1,26 @@
{ {
"name": "@next-auth/upstash-redis-adapter", "name": "@auth/upstash-redis-adapter",
"version": "3.0.4", "version": "1.0.0",
"description": "Upstash adapter for next-auth. It uses Upstash's connectionless (HTTP based) Redis client.", "description": "Upstash adapter for Auth.js.",
"homepage": "https://authjs.dev", "homepage": "https://authjs.dev",
"repository": "https://github.com/nextauthjs/next-auth", "repository": "https://github.com/nextauthjs/next-auth",
"bugs": { "bugs": {
"url": "https://github.com/nextauthjs/next-auth/issues" "url": "https://github.com/nextauthjs/next-auth/issues"
}, },
"author": "github.com/kay-is", "author": "github.com/kay-is",
"main": "dist/index.js", "type": "module",
"types": "./index.d.ts",
"files": [
"*.js",
"*.d.ts*",
"src"
],
"exports": {
".": {
"types": "./index.d.ts",
"import": "./index.js"
}
},
"license": "ISC", "license": "ISC",
"keywords": [ "keywords": [
"next-auth", "next-auth",
@@ -25,13 +37,11 @@
"test": "jest", "test": "jest",
"build": "tsc" "build": "tsc"
}, },
"files": [ "dependencies": {
"README.md", "@auth/core": "workspace:*"
"dist" },
],
"peerDependencies": { "peerDependencies": {
"@upstash/redis": "^1.0.1", "@upstash/redis": "^1.0.1"
"next-auth": "^4"
}, },
"devDependencies": { "devDependencies": {
"@next-auth/adapter-test": "workspace:*", "@next-auth/adapter-test": "workspace:*",
@@ -43,9 +53,6 @@
"jest": "^27.4.3", "jest": "^27.4.3",
"next-auth": "workspace:*" "next-auth": "workspace:*"
}, },
"dependencies": {
"uuid": "^8.3.2"
},
"jest": { "jest": {
"preset": "@next-auth/adapter-test/jest" "preset": "@next-auth/adapter-test/jest"
} }

View File

@@ -9,10 +9,10 @@
* ## Installation * ## Installation
* *
* ```bash npm2yarn2pnpm * ```bash npm2yarn2pnpm
* npm install @upstash/redis @next-auth/upstash-redis-adapter * npm install @upstash/redis @auth/upstash-redis-adapter
* ``` * ```
* *
* @module @next-auth/upstash-redis-adapter * @module @auth/upstash-redis-adapter
*/ */
import type { import type {
Adapter, Adapter,
@@ -20,11 +20,9 @@ import type {
AdapterAccount, AdapterAccount,
AdapterSession, AdapterSession,
VerificationToken, VerificationToken,
} from "next-auth/adapters" } from "@auth/core/adapters"
import type { Redis } from "@upstash/redis" import type { Redis } from "@upstash/redis"
import { v4 as uuid } from "uuid"
/** This is the interface of the Upstash Redis adapter options. */ /** This is the interface of the Upstash Redis adapter options. */
export interface UpstashRedisAdapterOptions { export interface UpstashRedisAdapterOptions {
/** /**
@@ -93,7 +91,7 @@ export function hydrateDates(json: object) {
* ```javascript title="pages/api/auth/[...nextauth].js" * ```javascript title="pages/api/auth/[...nextauth].js"
* import NextAuth from "next-auth" * import NextAuth from "next-auth"
* import GoogleProvider from "next-auth/providers/google" * import GoogleProvider from "next-auth/providers/google"
* import { UpstashRedisAdapter } from "@next-auth/upstash-redis-adapter" * import { UpstashRedisAdapter } from "@auth/upstash-redis-adapter"
* import upstashRedisClient from "@upstash/redis" * import upstashRedisClient from "@upstash/redis"
* *
* const redis = upstashRedisClient( * const redis = upstashRedisClient(
@@ -217,7 +215,7 @@ export function UpstashRedisAdapter(
return { return {
async createUser(user) { async createUser(user) {
const id = uuid() const id = crypto.randomUUID()
// TypeScript thinks the emailVerified field is missing // TypeScript thinks the emailVerified field is missing
// but all fields are copied directly from user, so it's there // but all fields are copied directly from user, so it's there
return await setUser(id, { ...user, id }) return await setUser(id, { ...user, id })

View File

@@ -4,6 +4,8 @@ import { runBasicTests } from "@next-auth/adapter-test"
import { hydrateDates, UpstashRedisAdapter } from "../src" import { hydrateDates, UpstashRedisAdapter } from "../src"
import "dotenv/config" import "dotenv/config"
globalThis.crypto ??= require("node:crypto").webcrypto
if (!process.env.UPSTASH_REDIS_URL || !process.env.UPSTASH_REDIS_KEY) { if (!process.env.UPSTASH_REDIS_URL || !process.env.UPSTASH_REDIS_KEY) {
test("Skipping UpstashRedisAdapter tests, since required environment variables aren't available", () => { test("Skipping UpstashRedisAdapter tests, since required environment variables aren't available", () => {
expect(true).toBe(true) expect(true).toBe(true)
@@ -27,6 +29,7 @@ const client = new Redis({
runBasicTests({ runBasicTests({
adapter: UpstashRedisAdapter(client, { baseKeyPrefix: "testApp:" }), adapter: UpstashRedisAdapter(client, { baseKeyPrefix: "testApp:" }),
db: { db: {
disconnect: client.flushdb,
async user(id: string) { async user(id: string) {
const data = await client.get<object>(`testApp:user:${id}`) const data = await client.get<object>(`testApp:user:${id}`)
if (!data) return null if (!data) return null
@@ -48,7 +51,7 @@ runBasicTests({
}, },
async verificationToken(where) { async verificationToken(where) {
const data = await client.get<object>( const data = await client.get<object>(
`testApp:user:token:${where.identifier}` `testApp:user:token:${where.identifier}:${where.token}`
) )
if (!data) return null if (!data) return null
return hydrateDates(data) return hydrateDates(data)

View File

@@ -1,8 +1,25 @@
{ {
"extends": "@next-auth/tsconfig/tsconfig.adapters.json", "extends": "@next-auth/tsconfig/tsconfig.base.json",
"compilerOptions": { "compilerOptions": {
"allowJs": true,
"baseUrl": ".",
"isolatedModules": true,
"target": "ES2020",
"module": "ESNext",
"moduleResolution": "node",
"outDir": ".",
"rootDir": "src", "rootDir": "src",
"outDir": "dist" "skipDefaultLibCheck": true,
"strictNullChecks": true,
"stripInternal": true,
"declarationMap": true,
"declaration": true
}, },
"exclude": ["tests", "dist", "jest.config.js"] "include": [
} "src/**/*"
],
"exclude": [
"*.js",
"*.d.ts",
]
}

View File

@@ -1,6 +1,6 @@
{ {
"name": "@auth/sveltekit", "name": "@auth/sveltekit",
"version": "0.3.1", "version": "0.3.2",
"description": "Authentication for SvelteKit.", "description": "Authentication for SvelteKit.",
"keywords": [ "keywords": [
"authentication", "authentication",

View File

@@ -63,7 +63,7 @@ export async function signIn<
const data = await res.clone().json() const data = await res.clone().json()
const error = new URL(data.url).searchParams.get("error") const error = new URL(data.url).searchParams.get("error")
if (redirect || !isSupportingReturn || !error) { if (redirect || !isSupportingReturn) {
// TODO: Do not redirect for Credentials and Email providers by default in next major // TODO: Do not redirect for Credentials and Email providers by default in next major
window.location.href = data.url ?? callbackUrl window.location.href = data.url ?? callbackUrl
// If url contains a hash, the browser does not reload the page. We reload manually // If url contains a hash, the browser does not reload the page. We reload manually

37
pnpm-lock.yaml generated
View File

@@ -251,6 +251,7 @@ importers:
packages/adapter-dgraph: packages/adapter-dgraph:
specifiers: specifiers:
'@auth/core': workspace:*
'@next-auth/adapter-test': workspace:* '@next-auth/adapter-test': workspace:*
'@next-auth/tsconfig': workspace:* '@next-auth/tsconfig': workspace:*
'@types/jest': ^26.0.24 '@types/jest': ^26.0.24
@@ -258,12 +259,11 @@ importers:
'@types/node-fetch': ^2.5.11 '@types/node-fetch': ^2.5.11
jest: ^27.4.3 jest: ^27.4.3
jsonwebtoken: ^8.5.1 jsonwebtoken: ^8.5.1
next-auth: workspace:*
node-fetch: ^2.6.1
ts-jest: ^27.0.3 ts-jest: ^27.0.3
undici: 5.22.1
dependencies: dependencies:
'@auth/core': link:../core
jsonwebtoken: 8.5.1 jsonwebtoken: 8.5.1
node-fetch: 2.6.7
devDependencies: devDependencies:
'@next-auth/adapter-test': link:../adapter-test '@next-auth/adapter-test': link:../adapter-test
'@next-auth/tsconfig': link:../tsconfig '@next-auth/tsconfig': link:../tsconfig
@@ -271,31 +271,27 @@ importers:
'@types/jsonwebtoken': 8.5.8 '@types/jsonwebtoken': 8.5.8
'@types/node-fetch': 2.6.2 '@types/node-fetch': 2.6.2
jest: 27.5.1 jest: 27.5.1
next-auth: link:../next-auth
ts-jest: 27.1.5_lvqy56smyn5gszh3zmisfmhukm ts-jest: 27.1.5_lvqy56smyn5gszh3zmisfmhukm
undici: 5.22.1
packages/adapter-dynamodb: packages/adapter-dynamodb:
specifiers: specifiers:
'@auth/core': workspace:*
'@aws-sdk/client-dynamodb': ^3.36.1 '@aws-sdk/client-dynamodb': ^3.36.1
'@aws-sdk/lib-dynamodb': ^3.36.1 '@aws-sdk/lib-dynamodb': ^3.36.1
'@next-auth/adapter-test': workspace:* '@next-auth/adapter-test': workspace:*
'@next-auth/tsconfig': workspace:* '@next-auth/tsconfig': workspace:*
'@shelf/jest-dynamodb': ^2.1.0 '@shelf/jest-dynamodb': ^2.1.0
'@types/uuid': ^9.0.0
jest: ^27.4.3 jest: ^27.4.3
next-auth: workspace:*
uuid: ^9.0.0
dependencies: dependencies:
uuid: 9.0.0 '@auth/core': link:../core
devDependencies: devDependencies:
'@aws-sdk/client-dynamodb': 3.113.0 '@aws-sdk/client-dynamodb': 3.113.0
'@aws-sdk/lib-dynamodb': 3.113.0_eb2z3hhrjl3qvyc6ecmpo2nhva '@aws-sdk/lib-dynamodb': 3.113.0_eb2z3hhrjl3qvyc6ecmpo2nhva
'@next-auth/adapter-test': link:../adapter-test '@next-auth/adapter-test': link:../adapter-test
'@next-auth/tsconfig': link:../tsconfig '@next-auth/tsconfig': link:../tsconfig
'@shelf/jest-dynamodb': 2.2.4_qsruu6yolbxs4rh6ixjhkibvwu '@shelf/jest-dynamodb': 2.2.4_qsruu6yolbxs4rh6ixjhkibvwu
'@types/uuid': 9.0.0
jest: 27.5.1 jest: 27.5.1
next-auth: link:../next-auth
packages/adapter-fauna: packages/adapter-fauna:
specifiers: specifiers:
@@ -331,38 +327,35 @@ importers:
packages/adapter-mikro-orm: packages/adapter-mikro-orm:
specifiers: specifiers:
'@auth/core': workspace:*
'@mikro-orm/core': ^5 '@mikro-orm/core': ^5
'@mikro-orm/sqlite': ^5 '@mikro-orm/sqlite': ^5
'@next-auth/adapter-test': workspace:* '@next-auth/adapter-test': workspace:*
'@next-auth/tsconfig': workspace:* '@next-auth/tsconfig': workspace:*
'@types/uuid': '>=8'
jest: ^29 jest: ^29
next-auth: workspace:*
uuid: ^9
dependencies: dependencies:
uuid: 9.0.0 '@auth/core': link:../core
devDependencies: devDependencies:
'@mikro-orm/core': 5.2.1_@mikro-orm+sqlite@5.2.1 '@mikro-orm/core': 5.2.1_@mikro-orm+sqlite@5.2.1
'@mikro-orm/sqlite': 5.2.1_@mikro-orm+core@5.2.1 '@mikro-orm/sqlite': 5.2.1_@mikro-orm+core@5.2.1
'@next-auth/adapter-test': link:../adapter-test '@next-auth/adapter-test': link:../adapter-test
'@next-auth/tsconfig': link:../tsconfig '@next-auth/tsconfig': link:../tsconfig
'@types/uuid': 8.3.4
jest: 29.3.0 jest: 29.3.0
next-auth: link:../next-auth
packages/adapter-mongodb: packages/adapter-mongodb:
specifiers: specifiers:
'@auth/core': workspace:*
'@next-auth/adapter-test': workspace:* '@next-auth/adapter-test': workspace:*
'@next-auth/tsconfig': workspace:* '@next-auth/tsconfig': workspace:*
jest: ^27.4.3 jest: ^27.4.3
mongodb: ^5.1.0 mongodb: ^5.1.0
next-auth: workspace:* dependencies:
'@auth/core': link:../core
devDependencies: devDependencies:
'@next-auth/adapter-test': link:../adapter-test '@next-auth/adapter-test': link:../adapter-test
'@next-auth/tsconfig': link:../tsconfig '@next-auth/tsconfig': link:../tsconfig
jest: 27.5.1 jest: 27.5.1
mongodb: 5.1.0 mongodb: 5.1.0
next-auth: link:../next-auth
packages/adapter-neo4j: packages/adapter-neo4j:
specifiers: specifiers:
@@ -504,6 +497,7 @@ importers:
packages/adapter-upstash-redis: packages/adapter-upstash-redis:
specifiers: specifiers:
'@auth/core': workspace:*
'@next-auth/adapter-test': workspace:* '@next-auth/adapter-test': workspace:*
'@next-auth/tsconfig': workspace:* '@next-auth/tsconfig': workspace:*
'@types/uuid': ^8.3.3 '@types/uuid': ^8.3.3
@@ -512,9 +506,8 @@ importers:
isomorphic-fetch: 3.0.0 isomorphic-fetch: 3.0.0
jest: ^27.4.3 jest: ^27.4.3
next-auth: workspace:* next-auth: workspace:*
uuid: ^8.3.2
dependencies: dependencies:
uuid: 8.3.2 '@auth/core': link:../core
devDependencies: devDependencies:
'@next-auth/adapter-test': link:../adapter-test '@next-auth/adapter-test': link:../adapter-test
'@next-auth/tsconfig': link:../tsconfig '@next-auth/tsconfig': link:../tsconfig
@@ -11445,10 +11438,6 @@ packages:
resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==} resolution: {integrity: sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==}
dev: true dev: true
/@types/uuid/9.0.0:
resolution: {integrity: sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q==}
dev: true
/@types/validator/13.7.3: /@types/validator/13.7.3:
resolution: {integrity: sha512-DNviAE5OUcZ5s+XEQHRhERLg8fOp8gSgvyJ4aaFASx5wwaObm+PBwTIMXiOFm1QrSee5oYwEAYb7LMzX2O88gA==} resolution: {integrity: sha512-DNviAE5OUcZ5s+XEQHRhERLg8fOp8gSgvyJ4aaFASx5wwaObm+PBwTIMXiOFm1QrSee5oYwEAYb7LMzX2O88gA==}
dev: true dev: true

View File

@@ -47,7 +47,7 @@
"e2e": { "e2e": {
"outputs": ["playwright-report/**"] "outputs": ["playwright-report/**"]
}, },
"@next-auth/upstash-redis-adapter#test": { "@auth/upstash-redis-adapter#test": {
"env": ["UPSTASH_REDIS_KEY", "UPSTASH_REDIS_URL"] "env": ["UPSTASH_REDIS_KEY", "UPSTASH_REDIS_URL"]
}, },
"docs#dev": { "docs#dev": {
@@ -55,18 +55,18 @@
"@auth/core#build", "@auth/core#build",
"@auth/prisma-adapter#build", "@auth/prisma-adapter#build",
"@auth/sveltekit#build", "@auth/sveltekit#build",
"@next-auth/dgraph-adapter#build", "@auth/dgraph-adapter#build",
"@next-auth/dynamodb-adapter#build", "@auth/dynamodb-adapter#build",
"@next-auth/fauna-adapter#build", "@next-auth/fauna-adapter#build",
"@next-auth/firebase-adapter#build", "@next-auth/firebase-adapter#build",
"@next-auth/mikro-orm-adapter#build", "@auth/mikro-orm-adapter#build",
"@next-auth/mongodb-adapter#build", "@auth/mongodb-adapter#build",
"@next-auth/neo4j-adapter#build", "@next-auth/neo4j-adapter#build",
"@next-auth/pouchdb-adapter#build", "@next-auth/pouchdb-adapter#build",
"@next-auth/sequelize-adapter#build", "@next-auth/sequelize-adapter#build",
"@next-auth/supabase-adapter#build", "@next-auth/supabase-adapter#build",
"@auth/typeorm-adapter#build", "@auth/typeorm-adapter#build",
"@next-auth/upstash-redis-adapter#build", "@auth/upstash-redis-adapter#build",
"@next-auth/xata-adapter#build", "@next-auth/xata-adapter#build",
"^build", "^build",
"next-auth#build" "next-auth#build"
@@ -78,18 +78,18 @@
"@auth/core#build", "@auth/core#build",
"@auth/prisma-adapter#build", "@auth/prisma-adapter#build",
"@auth/sveltekit#build", "@auth/sveltekit#build",
"@next-auth/dgraph-adapter#build", "@auth/dgraph-adapter#build",
"@next-auth/dynamodb-adapter#build", "@auth/dynamodb-adapter#build",
"@next-auth/fauna-adapter#build", "@next-auth/fauna-adapter#build",
"@next-auth/firebase-adapter#build", "@next-auth/firebase-adapter#build",
"@next-auth/mikro-orm-adapter#build", "@auth/mikro-orm-adapter#build",
"@next-auth/mongodb-adapter#build", "@auth/mongodb-adapter#build",
"@next-auth/neo4j-adapter#build", "@next-auth/neo4j-adapter#build",
"@next-auth/pouchdb-adapter#build", "@next-auth/pouchdb-adapter#build",
"@next-auth/sequelize-adapter#build", "@next-auth/sequelize-adapter#build",
"@next-auth/supabase-adapter#build", "@next-auth/supabase-adapter#build",
"@auth/typeorm-adapter#build", "@auth/typeorm-adapter#build",
"@next-auth/upstash-redis-adapter#build", "@auth/upstash-redis-adapter#build",
"@next-auth/xata-adapter#build", "@next-auth/xata-adapter#build",
"^build", "^build",
"next-auth#build" "next-auth#build"