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

refactor(auth): set null when the findAdmin is null

Browse Source
This commit is contained in:
Mauricio Siu
2024-10-04 01:01:30 -06:00
parent 172d55311e
commit ab4677ac0e
5 changed files with 55 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/builders/src/auth/auth.ts
View File

@@ -69,14 +69,20 @@ export async function validateRequest(
lucia.createBlankSessionCookie().serialize(),
);
}
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;
try {
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;
}
} catch (error) {
return {
user: null,
session: null,
};
}
}

17
packages/builders/src/services/auth.ts
View File

@@ -38,15 +38,16 @@ export const createAdmin = async (input: typeof apiCreateAdmin._type) => {
});
}
if (!IS_CLOUD) {
await tx
.insert(admins)
.values({
authId: newAuth.id,
await tx
.insert(admins)
.values({
authId: newAuth.id,
...(!IS_CLOUD && {
serverIp: await getPublicIpWithFallback(),
})
.returning();
}
}),
serverIp: await getPublicIpWithFallback(),
})
.returning();
return newAuth;
});