fixup! chore: Add an ability to manually configure bitbucket oAuth token

eclipse-che · Jun 27, 2022 · 28b2220 · 28b2220
1 parent 19cfabf
commit 28b2220
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/...-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth1/NoopOAuthAuthenticator.java b/...-auth-bitbucket/src/main/java/org/eclipse/che/security/oauth1/NoopOAuthAuthenticator.java
@@ -15,7 +15,8 @@
 
 /**
  * Dummy implementation of @{@link OAuthAuthenticator} used in the case if no Bitbucket Server
- * integration is configured.
+ * integration is configured, e.g. when a manually added token secret is present in the user
+ * namespace.
  */
 public class NoopOAuthAuthenticator extends OAuthAuthenticator {
   public NoopOAuthAuthenticator() {

diff --git a/...server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketURLParser.java b/...server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketURLParser.java
@@ -64,7 +64,7 @@ public BitbucketURLParser(
     }
   }
 
-  private boolean isUserTokenExists(String repositoryUrl) {
+  private boolean isUserTokenPresent(String repositoryUrl) {
     String serverUrl = getServerUrl(repositoryUrl);
     if (Pattern.compile(format(bitbucketUrlPatternTemplate, serverUrl))
         .matcher(repositoryUrl)
@@ -88,7 +88,7 @@ public boolean isValid(@NotNull String url) {
     } else {
       // If Bitbucket server URL is not configured try to find it in a manually added user namespace
       // token.
-      return isUserTokenExists(url);
+      return isUserTokenPresent(url);
     }
   }
 

diff --git a/...ctory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrlParser.java b/...ctory-gitlab/src/main/java/org/eclipse/che/api/factory/server/gitlab/GitlabUrlParser.java
@@ -68,7 +68,7 @@ public GitlabUrlParser(
     }
   }
 
-  private boolean isUserTokenExists(String repositoryUrl) {
+  private boolean isUserTokenPresent(String repositoryUrl) {
     Optional<String> serverUrlOptional = getServerUrl(repositoryUrl);
     if (serverUrlOptional.isPresent()) {
       String serverUrl = serverUrlOptional.get();
@@ -94,7 +94,7 @@ public boolean isValid(@NotNull String url) {
     } else {
       // If Gitlab URL is not configured, try to find it in a manually added user namespace
       // token.
-      return isUserTokenExists(url);
+      return isUserTokenPresent(url);
     }
   }