Skip to content

fix: Enhance GitLab OAuth handling for repository onboarding and webh… #39

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
rostilos merged 1 commit into from
Jan 5, 2026
Merged

fix: Enhance GitLab OAuth handling for repository onboarding and webh… #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions .../main/java/org/rostilos/codecrow/webserver/integration/service/VcsIntegrationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,17 @@ public RepoOnboardResponse onboardRepository(Long workspaceId, EVcsProvider prov
externalWorkspaceId = "";
}
}
//TODO: remove hardcode check
// For GitLab OAuth (APP) connections, users can access repos from multiple namespaces
// If the repoId is numeric (GitLab project ID) or contains a slash (full path),
// use it directly without prepending the connection's externalWorkspaceId
if (provider == EVcsProvider.GITLAB && connection.getConnectionType() == EVcsConnectionType.APP) {
// Check if it's a numeric ID or contains a slash (full path like "namespace/repo")
if (externalRepoId.matches("\\d+") || externalRepoId.contains("/")) {
log.debug("GitLab OAuth: Using repoId directly (numeric or full path): {}", externalRepoId);
externalWorkspaceId = "";
}
}

log.debug("Onboarding repo: externalRepoId={}, externalWorkspaceId={}, connectionId={}, connectionType={}",
effectiveRepoId, externalWorkspaceId, connection.getId(), connection.getConnectionType());
Expand Down Expand Up @@ -948,9 +959,12 @@ public RepoOnboardResponse onboardRepository(Long workspaceId, EVcsProvider prov
boolean webhooksConfigured = false;
if (request.isSetupWebhooks()) {
try {
// For REPOSITORY_TOKEN connections, use the full repo path for webhook setup
String webhookWorkspaceId = externalWorkspaceId;
// Use the actual repo namespace for webhook setup, not the connection's externalWorkspaceId
// This is important for GitLab OAuth where user can access repos from multiple namespaces
String webhookWorkspaceId = repo.namespace();
String webhookRepoSlug = repo.slug();

// For REPOSITORY_TOKEN connections, use the full repo path for webhook setup
if (connection.getConnectionType() == EVcsConnectionType.REPOSITORY_TOKEN
&& connection.getRepositoryPath() != null
&& !connection.getRepositoryPath().isBlank()) {
Expand All @@ -963,6 +977,8 @@ public RepoOnboardResponse onboardRepository(Long workspaceId, EVcsProvider prov
log.debug("REPOSITORY_TOKEN webhook setup - using repositoryPath: {}, namespace: {}, slug: {}",
repositoryPath, webhookWorkspaceId, webhookRepoSlug);
}

log.debug("Setting up webhooks for repo: namespace={}, slug={}", webhookWorkspaceId, webhookRepoSlug);
webhooksConfigured = setupWebhooks(client, webhookWorkspaceId, webhookRepoSlug, binding, project);
} catch (Exception e) {
log.warn("Failed to setup webhooks for {}: {}", repo.fullName(), e.getMessage());
Expand Down