Switched to new authjs adapter

This commit is contained in:
Atridad Lahiji 2023-06-12 18:53:55 -06:00
parent 387696611d
commit 8aada483e7
No known key found for this signature in database
3 changed files with 50 additions and 15 deletions

View file

@ -14,7 +14,7 @@
}, },
"dependencies": { "dependencies": {
"@ably-labs/react-hooks": "^2.1.1", "@ably-labs/react-hooks": "^2.1.1",
"@next-auth/prisma-adapter": "^1.0.7", "@auth/prisma-adapter": "^1.0.0",
"@prisma/client": "4.15.0", "@prisma/client": "4.15.0",
"@tanstack/react-query": "^4.29.12", "@tanstack/react-query": "^4.29.12",
"@trpc/client": "10.30.0", "@trpc/client": "10.30.0",

60
pnpm-lock.yaml generated
View file

@ -8,9 +8,9 @@ dependencies:
'@ably-labs/react-hooks': '@ably-labs/react-hooks':
specifier: ^2.1.1 specifier: ^2.1.1
version: 2.1.1(react-dom@18.2.0)(react@18.2.0) version: 2.1.1(react-dom@18.2.0)(react@18.2.0)
'@next-auth/prisma-adapter': '@auth/prisma-adapter':
specifier: ^1.0.7 specifier: ^1.0.0
version: 1.0.7(@prisma/client@4.15.0)(next-auth@4.22.1) version: 1.0.0(@prisma/client@4.15.0)
'@prisma/client': '@prisma/client':
specifier: 4.15.0 specifier: 4.15.0
version: 4.15.0(prisma@4.15.0) version: 4.15.0(prisma@4.15.0)
@ -168,6 +168,33 @@ packages:
leven: 3.1.0 leven: 3.1.0
dev: true dev: true
/@auth/core@0.8.1:
resolution: {integrity: sha512-WudBmZudZ/cvykxHV5hIwrYsd7AlETQ535O7w3sSiiumT28+U9GvBb8oSRtfzxpW9rym3lAdfeTJqGA8U4FecQ==}
peerDependencies:
nodemailer: ^6.8.0
peerDependenciesMeta:
nodemailer:
optional: true
dependencies:
'@panva/hkdf': 1.1.1
cookie: 0.5.0
jose: 4.14.4
oauth4webapi: 2.3.0
preact: 10.11.3
preact-render-to-string: 5.2.3(preact@10.11.3)
dev: false
/@auth/prisma-adapter@1.0.0(@prisma/client@4.15.0):
resolution: {integrity: sha512-+x+s5dgpNmqrcQC2ZRAXZIM6yhkWP/EXjIUgqUyMepLiX1OHi2AXIUAAbXsW4oG9OpYr/rvPIzPBpuGt6sPFwQ==}
peerDependencies:
'@prisma/client': '>=2.26.0 || >=3 || >=4'
dependencies:
'@auth/core': 0.8.1
'@prisma/client': 4.15.0(prisma@4.15.0)
transitivePeerDependencies:
- nodemailer
dev: false
/@babel/code-frame@7.22.5: /@babel/code-frame@7.22.5:
resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==}
engines: {node: '>=6.9.0'} engines: {node: '>=6.9.0'}
@ -1448,16 +1475,6 @@ packages:
'@jridgewell/resolve-uri': 3.1.0 '@jridgewell/resolve-uri': 3.1.0
'@jridgewell/sourcemap-codec': 1.4.14 '@jridgewell/sourcemap-codec': 1.4.14
/@next-auth/prisma-adapter@1.0.7(@prisma/client@4.15.0)(next-auth@4.22.1):
resolution: {integrity: sha512-Cdko4KfcmKjsyHFrWwZ//lfLUbcLqlyFqjd/nYE2m3aZ7tjMNUjpks47iw7NTCnXf+5UWz5Ypyt1dSs1EP5QJw==}
peerDependencies:
'@prisma/client': '>=2.26.0 || >=3'
next-auth: ^4
dependencies:
'@prisma/client': 4.15.0(prisma@4.15.0)
next-auth: 4.22.1(next@13.4.5)(react-dom@18.2.0)(react@18.2.0)
dev: false
/@next/env@13.4.5: /@next/env@13.4.5:
resolution: {integrity: sha512-SG/gKH6eij4vwQy87b/3mbpQ1X3x2vUdnpwq6/qL2IQWjtq58EY/UuNAp9CoEZoC9sI4L9AD1r+73Z9r4d3uug==} resolution: {integrity: sha512-SG/gKH6eij4vwQy87b/3mbpQ1X3x2vUdnpwq6/qL2IQWjtq58EY/UuNAp9CoEZoC9sI4L9AD1r+73Z9r4d3uug==}
@ -4687,6 +4704,10 @@ packages:
path-key: 4.0.0 path-key: 4.0.0
dev: true dev: true
/oauth4webapi@2.3.0:
resolution: {integrity: sha512-JGkb5doGrwzVDuHwgrR4nHJayzN4h59VCed6EW8Tql6iHDfZIabCJvg6wtbn5q6pyB2hZruI3b77Nudvq7NmvA==}
dev: false
/oauth@0.9.15: /oauth@0.9.15:
resolution: {integrity: sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==} resolution: {integrity: sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==}
dev: false dev: false
@ -5026,6 +5047,15 @@ packages:
picocolors: 1.0.0 picocolors: 1.0.0
source-map-js: 1.0.2 source-map-js: 1.0.2
/preact-render-to-string@5.2.3(preact@10.11.3):
resolution: {integrity: sha512-aPDxUn5o3GhWdtJtW0svRC2SS/l8D9MAgo2+AWml+BhDImb27ALf04Q2d+AHqUUOc6RdSXFIBVa2gxzgMKgtZA==}
peerDependencies:
preact: '>=10'
dependencies:
preact: 10.11.3
pretty-format: 3.8.0
dev: false
/preact-render-to-string@5.2.6(preact@10.15.1): /preact-render-to-string@5.2.6(preact@10.15.1):
resolution: {integrity: sha512-JyhErpYOvBV1hEPwIxc/fHWXPfnEGdRKxc8gFdAZ7XV4tlzyzG847XAyEZqoDnynP88akM4eaHcSOzNcLWFguw==} resolution: {integrity: sha512-JyhErpYOvBV1hEPwIxc/fHWXPfnEGdRKxc8gFdAZ7XV4tlzyzG847XAyEZqoDnynP88akM4eaHcSOzNcLWFguw==}
peerDependencies: peerDependencies:
@ -5035,6 +5065,10 @@ packages:
pretty-format: 3.8.0 pretty-format: 3.8.0
dev: false dev: false
/preact@10.11.3:
resolution: {integrity: sha512-eY93IVpod/zG3uMF22Unl8h9KkrcKIRs2EGar8hwLZZDU1lkjph303V9HZBwufh2s736U6VXuhD109LYqPoffg==}
dev: false
/preact@10.15.1: /preact@10.15.1:
resolution: {integrity: sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g==} resolution: {integrity: sha512-qs2ansoQEwzNiV5eAcRT1p1EC/dmEzaATVDJNiB3g2sRDWdA7b7MurXdJjB2+/WQktGWZwxvDrnuRFbWuIr64g==}
dev: false dev: false

View file

@ -6,7 +6,7 @@ import {
} from "next-auth"; } from "next-auth";
import GithubProvider from "next-auth/providers/github"; import GithubProvider from "next-auth/providers/github";
import GoogleProvider from "next-auth/providers/google"; import GoogleProvider from "next-auth/providers/google";
import { PrismaAdapter } from "@next-auth/prisma-adapter"; import { PrismaAdapter } from "@auth/prisma-adapter";
import { env } from "~/env.mjs"; import { env } from "~/env.mjs";
import { prisma } from "~/server/db"; import { prisma } from "~/server/db";
import type { Role } from "~/utils/types"; import type { Role } from "~/utils/types";
@ -73,6 +73,7 @@ export const authOptions: NextAuthOptions = {
await deleteFromCache(client, env.APP_ENV, `kv_userlist_admin`); await deleteFromCache(client, env.APP_ENV, `kv_userlist_admin`);
}, },
}, },
// @ts-ignore This adapter should work...
adapter: PrismaAdapter(prisma), adapter: PrismaAdapter(prisma),
providers: [ providers: [
GithubProvider({ GithubProvider({