ekzyis/stacker.news
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove jwt migrations

Browse Source
This commit is contained in:
keyan 2023-10-13 19:58:16 -05:00
parent da3d5ffd5f
commit 94cbc902d6
3 changed files with 2 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package-lock.json generated
View File

@ -34,7 +34,6 @@
"graphql": "^16.8.0",
"graphql-tag": "^2.12.6",
"graphql-type-json": "^0.3.2",
"jose1": "npm:jose@^1.27.2",
"ln-service": "^56.11.0",
"mathjs": "^11.9.1",
"mdast-util-find-and-replace": "^3.0.0",
@ -3091,14 +3090,6 @@
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"node_modules/@panva/asn1.js": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz",
"integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw==",
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/@panva/hkdf": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@panva/hkdf/-/hkdf-1.1.1.tgz",
@ -9146,22 +9137,6 @@
"url": "https://github.com/sponsors/panva"
}
},
"node_modules/jose1": {
"name": "jose",
"version": "1.27.2",
"resolved": "https://registry.npmjs.org/jose/-/jose-1.27.2.tgz",
"integrity": "sha512-zLIwnMa8dh5A2jFo56KvhiXCaW0hFjdNvG0I5GScL8Wro+/r/SnyIYTbnX3fYztPNSfgQp56sDMHUuS9c3e6bw==",
"deprecated": "this version is no longer supported",
"dependencies": {
"@panva/asn1.js": "^1.0.0"
},
"engines": {
"node": ">=10.13.0"
},
"funding": {
"url": "https://github.com/sponsors/panva"
}
},
"node_modules/js-sha256": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",
@ -20422,11 +20397,6 @@
}
}
},
"@panva/asn1.js": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@panva/asn1.js/-/asn1.js-1.0.0.tgz",
"integrity": "sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw=="
},
"@panva/hkdf": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/@panva/hkdf/-/hkdf-1.1.1.tgz",
@ -24959,14 +24929,6 @@
"resolved": "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz",
"integrity": "sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g=="
},
"jose1": {
"version": "npm:jose@1.27.2",
"resolved": "https://registry.npmjs.org/jose/-/jose-1.27.2.tgz",
"integrity": "sha512-zLIwnMa8dh5A2jFo56KvhiXCaW0hFjdNvG0I5GScL8Wro+/r/SnyIYTbnX3fYztPNSfgQp56sDMHUuS9c3e6bw==",
"requires": {
"@panva/asn1.js": "^1.0.0"
}
},
"js-sha256": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz",

1
package.json
View File

@ -37,7 +37,6 @@
"graphql": "^16.8.0",
"graphql-tag": "^2.12.6",
"graphql-type-json": "^0.3.2",
"jose1": "npm:jose@^1.27.2",
"ln-service": "^56.11.0",
"mathjs": "^11.9.1",
"mdast-util-find-and-replace": "^3.0.0",

37
pages/api/auth/[...nextauth].js
View File

@ -7,9 +7,8 @@ import EmailProvider from 'next-auth/providers/email'
import prisma from '../../../api/models'
import nodemailer from 'nodemailer'
import { PrismaAdapter } from '@auth/prisma-adapter'
import { decode, getToken } from 'next-auth/jwt'
import { getToken } from 'next-auth/jwt'
import { NodeNextRequest } from 'next/dist/server/base-http/node'
import jose1 from 'jose1'
import { schnorr } from '@noble/curves/secp256k1'
import { sendUserNotification } from '../../../api/webPush'
@ -48,7 +47,7 @@ function getCallbacks (req) {
}
// sign them up for the newsletter
if (user?.email) {
if (user?.email && process.env.LIST_MONK_URL && process.env.LIST_MONK_AUTH) {
fetch(process.env.LIST_MONK_URL + '/api/subscribers', {
method: 'POST',
headers: {
@ -196,38 +195,6 @@ export const getAuthOptions = req => ({
session: {
strategy: 'jwt'
},
jwt: {
decode: async ({ token, secret }) => {
// attempt to decode using new jwt decode
try {
const _token = await decode({ token, secret })
if (_token) {
return _token
}
} catch (err) {
console.log('next-auth v4 jwt decode failed', err)
}
// attempt to decode using old jwt decode from next-auth v3
// https://github.com/nextauthjs/next-auth/blob/ab764e379377f9ffd68ff984b163c0edb5fc4bda/src/lib/jwt.js#L52
try {
const signingKey = jose1.JWK.asKey(JSON.parse(process.env.JWT_SIGNING_PRIVATE_KEY))
const verificationOptions = {
maxTokenAge: '2592000s',
algorithms: ['HS512']
}
const _token = jose1.JWT.verify(token, signingKey, verificationOptions)
if (_token) {
console.log('next-auth v3 jwt decode success')
return _token
}
} catch (err) {
console.log('next-auth v3 jwt decode failed', err)
}
return null
}
},
pages: {
signIn: '/login',
verifyRequest: '/email',