Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix/swagger token
This commit is contained in:
Mauricio Siu
2024-09-28 02:31:39 -06:00
committed by GitHub
parent e5d7a0cb10 bbfe095045
commit cb03b153ac
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dokploy/package.json
View File

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

12
apps/dokploy/server/auth/token.ts
View File

@@ -1,6 +1,8 @@
import type { IncomingMessage } from "node:http"; import type { IncomingMessage } from "node:http";
import { TimeSpan } from "lucia"; import { TimeSpan } from "lucia";
import { Lucia } from "lucia/dist/core.js"; 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"; import { type ReturnValidateToken, adapter } from "./auth";
export const luciaToken = new Lucia(adapter, { export const luciaToken = new Lucia(adapter, {
@@ -31,6 +33,16 @@ export const validateBearerToken = async (
}; };
} }
const result = await luciaToken.validateSession(sessionId); 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 { return {
session: result.session, session: result.session,
...((result.user && { ...((result.user && {