Skip to content

Refactor GitLab validity check to include custom domain support #569

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
merged 2 commits into from
Oct 4, 2024
Merged

Refactor GitLab validity check to include custom domain support #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf4a3b
Refactor GitLab validity check to include custom domain support
shivam-bit Oct 4, 2024
6c83ce5
Refactor GitLab validity check to include custom domain support
shivam-bit Oct 4, 2024
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
5 changes: 2 additions & 3 deletions web-server/src/content/Dashboards/ConfigureGitlabModalBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ export const ConfigureGitlabModalBody: FC<{

const checkDomainWithRegex = (domain: string) => {
const regex =
/^(https:\/\/)?[a-zA-Z0-9]+([-.][a-zA-Z0-9]+)*\.[a-zA-Z]{2,}(:[0-9]{1,5})?(\/.*)?$/;
/^(https?:\/\/)[a-zA-Z0-9]+([-.][a-zA-Z0-9]+)*\.[a-zA-Z]{2,}(:[0-9]{1,5})?(\/.*)?$/;
return regex.test(domain);
};

const handleTokenChange = (e: string) => {
token.set(e);
showScopeError.set('');
Expand Down Expand Up @@ -79,7 +78,7 @@ export const ConfigureGitlabModalBody: FC<{
}

depFn(isLoading.true);
await checkGitLabValidity(token.value)
await checkGitLabValidity(token.value, customDomain.value)
.then(async (res) => {
return res;
})
Expand Down
8 changes: 6 additions & 2 deletions web-server/src/utils/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,12 @@ export const getMissingPATScopes = async (pat: string) => {

// Gitlab functions

export const checkGitLabValidity = async (accessToken: string) => {
const url = 'https://gitlab.com/api/v4/personal_access_tokens/self';
export const checkGitLabValidity = async (
accessToken: string,
customDomain?: string
) => {
const baseUrl = customDomain || 'https://gitlab.com';
const url = `${baseUrl}/api/v4/personal_access_tokens/self`;
try {
const response = await axios.get(url, {
headers: {
Expand Down
Loading