pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-02 00:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include in hybrid

Browse Source
This commit is contained in:
Owen
2025-10-06 10:31:31 -07:00
parent 23f05d7f4e
commit 2c46a37a53
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/routers/private/hybrid.ts
View File

@@ -33,7 +33,9 @@ import {
targets, targets,
loginPage, loginPage,
loginPageOrg, loginPageOrg,
LoginPage LoginPage,
resourceHeaderAuth,
ResourceHeaderAuth
} from "@server/db"; } from "@server/db";
import { import {
resources, resources,
@@ -200,6 +202,7 @@ export type ResourceWithAuth = {
resource: Resource | null; resource: Resource | null;
pincode: ResourcePincode | null; pincode: ResourcePincode | null;
password: ResourcePassword | null; password: ResourcePassword | null;
headerAuth: ResourceHeaderAuth | null;
}; };
export type UserSessionWithUser = { export type UserSessionWithUser = {
@@ -478,6 +481,10 @@ hybridRouter.get(
resourcePassword, resourcePassword,
eq(resourcePassword.resourceId, resources.resourceId) eq(resourcePassword.resourceId, resources.resourceId)
) )
.leftJoin(
resourceHeaderAuth,
eq(resourceHeaderAuth.resourceId, resources.resourceId)
)
.where(eq(resources.fullDomain, domain)) .where(eq(resources.fullDomain, domain))
.limit(1); .limit(1);
@@ -509,7 +516,8 @@ hybridRouter.get(
const resourceWithAuth: ResourceWithAuth = { const resourceWithAuth: ResourceWithAuth = {
resource: result.resources, resource: result.resources,
pincode: result.resourcePincode, pincode: result.resourcePincode,
password: result.resourcePassword password: result.resourcePassword,
headerAuth: result.resourceHeaderAuth
}; };
return response<ResourceWithAuth>(res, { return response<ResourceWithAuth>(res, {