From 9dcacbb49c71f7d6ba52eb9753a4a2611720511b Mon Sep 17 00:00:00 2001 From: ivinokur Date: Wed, 30 Oct 2024 12:55:02 +0200 Subject: [PATCH] Set SAAS Gitlab url if endpint is not defined --- .../server/gitlab/AbstractGitlabUserDataFetcher.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wsmaster/che-core-api-factory-gitlab-common/src/main/java/org/eclipse/che/api/factory/server/gitlab/AbstractGitlabUserDataFetcher.java b/wsmaster/che-core-api-factory-gitlab-common/src/main/java/org/eclipse/che/api/factory/server/gitlab/AbstractGitlabUserDataFetcher.java index 2ed3a454b8..18dff4f6af 100644 --- a/wsmaster/che-core-api-factory-gitlab-common/src/main/java/org/eclipse/che/api/factory/server/gitlab/AbstractGitlabUserDataFetcher.java +++ b/wsmaster/che-core-api-factory-gitlab-common/src/main/java/org/eclipse/che/api/factory/server/gitlab/AbstractGitlabUserDataFetcher.java @@ -11,6 +11,8 @@ */ package org.eclipse.che.api.factory.server.gitlab; +import static com.google.common.base.Strings.isNullOrEmpty; + import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -19,6 +21,7 @@ import org.eclipse.che.api.factory.server.scm.exception.ScmCommunicationException; import org.eclipse.che.api.factory.server.scm.exception.ScmItemNotFoundException; import org.eclipse.che.api.factory.server.scm.exception.ScmUnauthorizedException; +import org.eclipse.che.commons.annotation.Nullable; /** Gitlab OAuth token retriever. */ public class AbstractGitlabUserDataFetcher extends AbstractGitUserDataFetcher { @@ -29,14 +32,15 @@ public class AbstractGitlabUserDataFetcher extends AbstractGitUserDataFetcher { public static final Set DEFAULT_TOKEN_SCOPES = ImmutableSet.of("api", "write_repository", "openid"); + private static final String GITLAB_SAAS_ENDPOINT = "https://gitlab.com"; public AbstractGitlabUserDataFetcher( - String serverUrl, + @Nullable String serverUrl, String apiEndpoint, PersonalAccessTokenManager personalAccessTokenManager, String providerName) { super(providerName, serverUrl, personalAccessTokenManager); - this.serverUrl = serverUrl; + this.serverUrl = isNullOrEmpty(serverUrl) ? GITLAB_SAAS_ENDPOINT : serverUrl; this.apiEndpoint = apiEndpoint; this.providerName = providerName; }