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

Remove unnecessary wrapping with NodeNext(Request|Response) (#1956)

Browse Source
This commit is contained in:
ekzyis 2025-03-09 10:53:14 -05:00 committed by GitHub
parent 5b7ff24955
commit 7b725746b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ import EmailProvider from 'next-auth/providers/email'
import prisma from '@/api/models' import prisma from '@/api/models'
import nodemailer from 'nodemailer' import nodemailer from 'nodemailer'
import { PrismaAdapter } from '@auth/prisma-adapter' import { PrismaAdapter } from '@auth/prisma-adapter'
import { NodeNextRequest, NodeNextResponse } from 'next/dist/server/base-http/node'
import { getToken, encode as encodeJWT } from 'next-auth/jwt' import { getToken, encode as encodeJWT } from 'next-auth/jwt'
import { datePivot } from '@/lib/time' import { datePivot } from '@/lib/time'
import { schnorr } from '@noble/curves/secp256k1' import { schnorr } from '@noble/curves/secp256k1'
@ -130,7 +129,7 @@ function getCallbacks (req, res) {
const secret = process.env.NEXTAUTH_SECRET const secret = process.env.NEXTAUTH_SECRET
const jwt = await encodeJWT({ token, secret }) const jwt = await encodeJWT({ token, secret })
const me = await prisma.user.findUnique({ where: { id: token.id } }) const me = await prisma.user.findUnique({ where: { id: token.id } })
setMultiAuthCookies(new NodeNextRequest(req), new NodeNextResponse(res), { ...me, jwt }) setMultiAuthCookies(req, res, { ...me, jwt })
} }
return token return token
@ -180,8 +179,7 @@ async function pubkeyAuth (credentials, req, res, pubkeyColumnName) {
const { k1, pubkey } = credentials const { k1, pubkey } = credentials
// are we trying to add a new account for switching between? // are we trying to add a new account for switching between?
const { body } = req.body const multiAuth = typeof req.body.multiAuth === 'string' ? req.body.multiAuth === 'true' : !!req.body.multiAuth
const multiAuth = typeof body.multiAuth === 'string' ? body.multiAuth === 'true' : !!body.multiAuth
try { try {
// does the given challenge (k1) exist in our db? // does the given challenge (k1) exist in our db?
@ -262,7 +260,7 @@ const getProviders = res => [
k1: { label: 'k1', type: 'text' } k1: { label: 'k1', type: 'text' }
}, },
authorize: async (credentials, req) => { authorize: async (credentials, req) => {
return await pubkeyAuth(credentials, new NodeNextRequest(req), new NodeNextResponse(res), 'pubkey') return await pubkeyAuth(credentials, req, res, 'pubkey')
} }
}), }),
CredentialsProvider({ CredentialsProvider({
@ -273,7 +271,7 @@ const getProviders = res => [
}, },
authorize: async ({ event }, req) => { authorize: async ({ event }, req) => {
const credentials = await nostrEventAuth(event) const credentials = await nostrEventAuth(event)
return await pubkeyAuth(credentials, new NodeNextRequest(req), new NodeNextResponse(res), 'nostrAuthPubkey') return await pubkeyAuth(credentials, req, res, 'nostrAuthPubkey')
} }
}), }),
GitHubProvider({ GitHubProvider({

7
pages/api/graphql.js
View File

@ -11,6 +11,7 @@ import {
ApolloServerPluginLandingPageLocalDefault, ApolloServerPluginLandingPageLocalDefault,
ApolloServerPluginLandingPageProductionDefault ApolloServerPluginLandingPageProductionDefault
} from '@apollo/server/plugin/landingPage/default' } from '@apollo/server/plugin/landingPage/default'
import { NodeNextRequest } from 'next/dist/server/base-http/node'
const apolloServer = new ApolloServer({ const apolloServer = new ApolloServer({
typeDefs, typeDefs,
@ -85,6 +86,12 @@ export default startServerAndCreateNextHandler(apolloServer, {
export function multiAuthMiddleware (request) { export function multiAuthMiddleware (request) {
// switch next-auth session cookie with multi_auth cookie if cookie pointer present // switch next-auth session cookie with multi_auth cookie if cookie pointer present
if (!request.cookies) {
// required to properly access parsed cookies via request.cookies
// and not unparsed via request.headers.cookie
request = new NodeNextRequest(request)
}
// is there a cookie pointer? // is there a cookie pointer?
const cookiePointerName = 'multi_auth.user-id' const cookiePointerName = 'multi_auth.user-id'
const hasCookiePointer = !!request.cookies[cookiePointerName] const hasCookiePointer = !!request.cookies[cookiePointerName]