Updated gitlab integration to include port
Updated integration module to allow for the use of a custom port, which
is often the case in self hosted gitlab instances
Removed host.includes(':') check in config.ts to allow for users to
include the port in the host
Changed url.hostname to url.host in core.ts to include the port in the
api call (otherwise it'll result in an error when trying to import a new
component)
Signed-off-by: Edgar Silva <edgar.silva@cross-join.com>
This commit is contained in:
@@ -82,11 +82,7 @@ export function readGitLabIntegrationConfig(
|
||||
baseUrl = `https://${host}`;
|
||||
}
|
||||
|
||||
if (host.includes(':')) {
|
||||
throw new Error(
|
||||
`Invalid GitLab integration config, host '${host}' should just be the host name (e.g. "github.com"), not a URL`,
|
||||
);
|
||||
} else if (!isValidHost(host)) {
|
||||
if (!isValidHost(host)) {
|
||||
throw new Error(
|
||||
`Invalid GitLab integration config, '${host}' is not a valid host`,
|
||||
);
|
||||
|
||||
@@ -138,7 +138,7 @@ export async function getProjectId(
|
||||
// Convert
|
||||
// to: https://gitlab.com/api/v4/projects/groupA%2Fteams%2FsubgroupA%2FteamA%2Frepo
|
||||
const repoIDLookup = new URL(
|
||||
`${url.protocol + url.hostname}/api/v4/projects/${encodeURIComponent(
|
||||
`${url.protocol + url.host}/api/v4/projects/${encodeURIComponent(
|
||||
repo.replace(/^\//, ''),
|
||||
)}`,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user