Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"license": "ISC",
"dependencies": {
"@babel/runtime": "^7.15.4",
"futoin-hkdf": "^1.4.2",
"@panva/hkdf": "^1.0.0",
"jose": "^4.1.2",
"oauth": "^0.9.15",
"openid-client": "^5.0.1",
Expand Down
39 changes: 9 additions & 30 deletions src/jwt/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import crypto from "crypto"
import { EncryptJWT, jwtDecrypt } from "jose"
import hkdf from '@panva/hkdf'
import { v4 as uuid } from "uuid"
import { NextApiRequest } from "next"
import type { JWT, JWTDecodeParams, JWTEncodeParams, JWTOptions } from "./types"
Expand All @@ -21,7 +21,7 @@ export async function encode({
.setProtectedHeader({ alg: "dir", enc: "A256GCM" })
.setIssuedAt()
.setExpirationTime(now() + maxAge)
.setJti(crypto.randomUUID ? crypto.randomUUID() : uuid())
.setJti(uuid())
.encrypt(encryptionSecret)
}

Expand Down Expand Up @@ -99,33 +99,12 @@ export async function getToken<R extends boolean = false>(
}
}

/** Do the better hkdf of Node.js one added in `v15.0.0` and Third Party one */
async function hkdf(secret, { byteLength, encryptionInfo, digest = "sha256" }) {
if (crypto.hkdf) {
return await new Promise((resolve, reject) => {
crypto.hkdf(
digest,
secret,
Buffer.alloc(0),
encryptionInfo,
byteLength,
(err, derivedKey) => {
if (err) reject(err)
else resolve(Buffer.from(derivedKey))
}
)
})
}
// eslint-disable-next-line @typescript-eslint/no-var-requires
return require("futoin-hkdf")(secret, byteLength, {
info: encryptionInfo,
hash: digest,
})
}

async function getDerivedEncryptionKey(secret) {
return await hkdf(secret, {
byteLength: 32,
encryptionInfo: "NextAuth.js Generated Encryption Key",
})
return await hkdf(
'sha256',
secret,
"",
"NextAuth.js Generated Encryption Key",
32
)
}