Skip to content

fix(forgejo): support fallback for all forgejo-* host types #39968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
viceice merged 3 commits into from
Dec 16, 2025
+22 −0
Merged

fix(forgejo): support fallback for all forgejo-* host types #39968

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24a22f8
fix: support fallback for forgejo-* host types
2franix Dec 13, 2025
9bcd440
Sort imports
2franix Dec 13, 2025
61278d7
Reorganize code to lexicographical order
2franix Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/util/http/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { isNonEmptyString, isString } from '@sindresorhus/is';
import type { Options } from 'got';
import {
FORGEJO_API_USING_HOST_TYPES,
GITEA_API_USING_HOST_TYPES,
GITHUB_API_USING_HOST_TYPES,
GITLAB_API_USING_HOST_TYPES,
Expand Down Expand Up @@ -43,6 +44,11 @@ export function applyAuthorization<GotOptions extends AuthGotOptions>(
// Gitea v1.8.0 and later support `Bearer` as alternate to `token`
// https://github.com/go-gitea/gitea/pull/5378
options.headers.authorization = `Bearer ${options.token}`;
} else if (
options.hostType &&
FORGEJO_API_USING_HOST_TYPES.includes(options.hostType)
) {
options.headers.authorization = `Bearer ${options.token}`;
} else if (
options.hostType &&
GITHUB_API_USING_HOST_TYPES.includes(options.hostType)
Expand Down
16 changes: 16 additions & 0 deletions lib/util/http/host-rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { GlobalConfig } from '../../config/global';
import {
BITBUCKET_API_USING_HOST_TYPES,
BITBUCKET_SERVER_API_USING_HOST_TYPES,
FORGEJO_API_USING_HOST_TYPES,
GITEA_API_USING_HOST_TYPES,
GITHUB_API_USING_HOST_TYPES,
GITLAB_API_USING_HOST_TYPES,
Expand Down Expand Up @@ -140,6 +141,21 @@ export function findMatchingRule<GotOptions extends HostRulesGotOptions>(
};
}

// Fallback to `forgejo` hostType
if (
hostType &&
FORGEJO_API_USING_HOST_TYPES.includes(hostType) &&
hostType !== 'forgejo'
) {
res = {
...hostRules.find({
hostType: 'forgejo',
url,
}),
...res,
};
}

return res;
}

Expand Down