Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-24 04:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: remove jose as Bun now supports JWT 🍞 (#1167)

Browse source 
* chore: remove jose as Bun now supports JWT

* chore: npm audit
This commit is contained in:
Danny Avila 2023-11-12 00:44:46 -05:00 • committed by GitHub
parent 9ca84edb9a
commit 5d95433c83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 46 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

17
api/server/controllers/AuthController.js
View file

@ -1,15 +1,13 @@
const crypto = require('crypto');
const cookies = require('cookie');
const jwt = require('jsonwebtoken');
const { Session, User } = require('../../models');
const {
registerUser,
requestPasswordReset,
resetPassword,
setAuthTokens,
} = require('../services/AuthService');
const jose = require('jose');
const jwt = require('jsonwebtoken');
const Session = require('../../models/Session');
const User = require('../../models/User');
const crypto = require('crypto');
const cookies = require('cookie');
const registrationController = async (req, res) => {
try {
@ -78,12 +76,7 @@ const refreshController = async (req, res) => {
try {
let payload;
if (typeof Bun !== 'undefined') {
const secret = new TextEncoder().encode(process.env.JWT_REFRESH_SECRET);
({ payload } = await jose.jwtVerify(refreshToken, secret));
} else {
payload = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
}
payload = jwt.verify(refreshToken, process.env.JWT_REFRESH_SECRET);
const userId = payload.id;
const user = await User.findOne({ _id: userId });
if (!user) {

8
api/server/index.js
View file

@ -12,7 +12,7 @@ const { PORT, HOST, ALLOW_SOCIAL_LOGIN } = process.env ?? {};
const port = Number(PORT) || 3080;
const host = HOST || 'localhost';
const projectPath = path.join(__dirname, '..', '..', 'client');
const { jwtLogin, joseLogin, passportLogin } = require('../strategies');
const { jwtLogin, passportLogin } = require('../strategies');
const startServer = async () => {
await connectDb();
@ -39,11 +39,7 @@ const startServer = async () => {
// OAUTH
app.use(passport.initialize());
if (typeof Bun !== 'undefined') {
passport.use('jwt', await joseLogin());
} else {
passport.use(await jwtLogin());
}
passport.use(await jwtLogin());
passport.use(passportLogin());
if (ALLOW_SOCIAL_LOGIN?.toLowerCase() === 'true') {

10
api/server/services/signPayload.js
View file

@ -1,4 +1,3 @@
const jose = require('jose');
const jwt = require('jsonwebtoken');
/**
@ -21,15 +20,6 @@ const jwt = require('jsonwebtoken');
* });
*/
async function signPayload({ payload, secret, expirationTime }) {
if (typeof Bun !== 'undefined') {
// this code will only run when the file is run with Bun
const encodedSecret = new TextEncoder().encode(secret);
return await new jose.SignJWT(payload)
.setProtectedHeader({ alg: 'HS256' })
.setExpirationTime(expirationTime + 's')
.sign(encodedSecret);
}
return jwt.sign(payload, secret, { expiresIn: expirationTime });
}