diff --git a/server/routers/resource/createResource.ts b/server/routers/resource/createResource.ts index e687cc02..473b5708 100644 --- a/server/routers/resource/createResource.ts +++ b/server/routers/resource/createResource.ts @@ -133,15 +133,6 @@ export async function createResource( ) ); - if (existingResource.length > 0) { - return next( - createHttpError( - HttpCode.CONFLICT, - "Resource with that protocol and port already exists" - ) - ); - } - } else { if (proxyPort === 443 || proxyPort === 80) { return next( createHttpError( @@ -151,6 +142,15 @@ export async function createResource( ); } + if (existingResource.length > 0) { + return next( + createHttpError( + HttpCode.CONFLICT, + "Resource with that protocol and port already exists" + ) + ); + } + } else { // make sure the full domain is unique const existingResource = await db .select() diff --git a/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx b/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx index 3c2b54c6..cf13ea99 100644 --- a/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx +++ b/src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx @@ -132,7 +132,7 @@ export default function ReverseProxyTargets(props: { defaultValues: { ip: "", method: resource.http ? "http" : null, - port: resource.http ? 80 : resource.proxyPort || 1234 + port: "" // protocol: "TCP", } });