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

fix update resource without subdomain

Browse Source
This commit is contained in:
Milo Schwartz
2025-02-05 21:32:49 -05:00
parent c51f1cb6a2
commit 3fa7132534
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
server/routers/resource/updateResource.ts
View File

@@ -175,10 +175,10 @@ export async function updateResource(
);
}
let fullDomain = "";
let fullDomain: string | undefined;
if (updateData.isBaseDomain) {
fullDomain = org.domain;
} else {
} else if (updateData.subdomain) {
fullDomain = `${updateData.subdomain}.${org.domain}`;
}
@@ -187,18 +187,24 @@ export async function updateResource(
...(fullDomain && { fullDomain })
};
const [existingDomain] = await db
.select()
.from(resources)
.where(eq(resources.fullDomain, fullDomain));
if (
fullDomain &&
(updatePayload.subdomain !== undefined ||
updatePayload.isBaseDomain !== undefined)
) {
const [existingDomain] = await db
.select()
.from(resources)
.where(eq(resources.fullDomain, fullDomain));
if (existingDomain && existingDomain.resourceId !== resourceId) {
return next(
createHttpError(
HttpCode.CONFLICT,
"Resource with that domain already exists"
)
);
if (existingDomain && existingDomain.resourceId !== resourceId) {
return next(
createHttpError(
HttpCode.CONFLICT,
"Resource with that domain already exists"
)
);
}
}
const updatedResource = await db