diff --git a/apps/server/src/issue/IssueService.test.ts b/apps/server/src/issue/IssueService.test.ts index 1251729b5bbac..ed7d6a97921dd 100644 --- a/apps/server/src/issue/IssueService.test.ts +++ b/apps/server/src/issue/IssueService.test.ts @@ -273,6 +273,22 @@ describe("IssueService", () => { projectId: "plain", host: "gitea.test", }); + expect( + yield* ported.resolveUrl("https://gitea.test:9443/acme/web/issues/3").pipe(Effect.result), + ).toMatchObject({ + _tag: "Failure", + failure: { _tag: "IssueUnavailableError", reason: "tracker-unsupported" }, + }); + // GitLab bindings drop the remote's port, so a ported link still finds its hostname's project. + const gitlab = yield* makeService({ + projects: [ + project({ id: "gl", repository: "acme/web", provider: "gitlab", host: "gitlab.corp" }), + ], + trackers: [fakeTracker({ kind: IssueTrackerKind.make("gitlab") })], + }); + expect( + yield* gitlab.resolveUrl("https://gitlab.corp:8443/acme/web/-/issues/3"), + ).toMatchObject({ projectId: "gl", host: "gitlab.corp", key: "3", writable: true }); // A GitHub Enterprise Server's hostname need not say "github"; its project vouches for it. const enterprise = yield* makeService({ diff --git a/apps/server/src/issue/IssueService.ts b/apps/server/src/issue/IssueService.ts index 56712954a49cb..0108961713010 100644 --- a/apps/server/src/issue/IssueService.ts +++ b/apps/server/src/issue/IssueService.ts @@ -716,11 +716,15 @@ const make = Effect.gen(function* () { } const { tracker, link } = parsed; // A link names its server's port; a binding does only when its remote or web URL did. - const authority = new URL(url).host.toLowerCase(); + const parsedUrl = new URL(url); + const authority = parsedUrl.host.toLowerCase(); const { supported } = yield* listProjects({ host: link.host, authority }); const onHost = supported.filter((project) => project.tracker === tracker); const onAuthority = onHost.filter((project) => project.host === authority); - const onTracker = onAuthority.length > 0 ? onAuthority : onHost; + // Only a host with its own `changeRequestHost` keeps ports, so only its ported links are exact. + const portIsExact = + parsedUrl.port !== "" && gitHost?.definition.changeRequestHost !== undefined; + const onTracker = onAuthority.length > 0 || portIsExact ? onAuthority : onHost; const preferFirst = (projects: ReadonlyArray) => projects.find((project) => project.project.id === preferredProjectId) ?? projects[0]; const scope = link.scope.toLowerCase();