Merge pull request #494 from Dokploy/fix/swagger-token

Fix/swagger token
This commit is contained in:
Mauricio Siu 2024-09-28 02:31:39 -06:00 committed by GitHub
commit cb03b153ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions

View File

@ -1,6 +1,6 @@
{
"name": "dokploy",
"version": "v0.9.0",
"version": "v0.9.1",
"private": true,
"license": "Apache-2.0",
"type": "module",

View File

@ -1,6 +1,8 @@
import type { IncomingMessage } from "node:http";
import { TimeSpan } from "lucia";
import { Lucia } from "lucia/dist/core.js";
import { findAdminByAuthId } from "../api/services/admin";
import { findUserByAuthId } from "../api/services/user";
import { type ReturnValidateToken, adapter } from "./auth";
export const luciaToken = new Lucia(adapter, {
@ -31,6 +33,16 @@ export const validateBearerToken = async (
};
}
const result = await luciaToken.validateSession(sessionId);
if (result.user) {
if (result.user?.rol === "admin") {
const admin = await findAdminByAuthId(result.user.id);
result.user.adminId = admin.adminId;
} else if (result.user?.rol === "user") {
const userResult = await findUserByAuthId(result.user.id);
result.user.adminId = userResult.adminId;
}
}
return {
session: result.session,
...((result.user && {