fixup! Simplify the Bitbucket Server token generation logic

Author: vinokurig

wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java

@@ -74,22 +74,29 @@ public BitbucketServerPersonalAccessTokenFetcher(
   @Override
   public PersonalAccessToken refreshPersonalAccessToken(Subject cheUser, String scmServerUrl)
       throws ScmUnauthorizedException, ScmCommunicationException, UnknownScmProviderException {
-    // #fetchPersonalAccessToken does the same thing as #refreshPersonalAccessToken
-    return fetchPersonalAccessToken(cheUser, scmServerUrl);
+    return fetchOrRefreshPersonalAccessToken(cheUser, scmServerUrl, true);
   }
 
   @Override
   public PersonalAccessToken fetchPersonalAccessToken(Subject cheSubject, String scmServerUrl)
       throws ScmUnauthorizedException, ScmCommunicationException, UnknownScmProviderException {
-    OAuthToken oAuthToken;
+    return fetchOrRefreshPersonalAccessToken(cheSubject, scmServerUrl, false);
+  }
 
+  private PersonalAccessToken fetchOrRefreshPersonalAccessToken(
+      Subject cheSubject, String scmServerUrl, boolean forceRefreshToken)
+      throws ScmCommunicationException, ScmUnauthorizedException, UnknownScmProviderException {
+    OAuthToken oAuthToken;
     if (bitbucketServerApiClient == null || !bitbucketServerApiClient.isConnected(scmServerUrl)) {
       LOG.debug("not a  valid url {} for current fetcher ", scmServerUrl);
       return null;
     }
     try {
       BitbucketUser user = bitbucketServerApiClient.getUser();
-      oAuthToken = oAuthAPI.getOrRefreshToken(OAUTH_PROVIDER_NAME);
+      oAuthToken =
+          forceRefreshToken
+              ? oAuthAPI.refreshToken(OAUTH_PROVIDER_NAME)
+              : oAuthAPI.getOrRefreshToken(OAUTH_PROVIDER_NAME);
       String tokenName = NameGenerator.generate(OAUTH_2_PREFIX, 5);
       String tokenId = NameGenerator.generate("id-", 5);
       return new PersonalAccessToken(

wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java

@@ -156,6 +156,24 @@ public void shouldBeAbleToFetchPersonalAccessToken() throws Exception {
     assertEquals(result.getToken(), "token");
   }
 
+  @Test
+  public void shouldRefreshPersonalAccessToken() throws Exception {
+    // given
+    when(bitbucketServerApiClient.isConnected(eq(someBitbucketURL))).thenReturn(true);
+    when(bitbucketServerApiClient.getUser()).thenReturn(bitbucketUser);
+    when(oAuthToken.getToken()).thenReturn("token");
+    when(oAuthAPI.refreshToken(eq("bitbucket-server"))).thenReturn(oAuthToken);
+    // when
+    PersonalAccessToken result = fetcher.refreshPersonalAccessToken(subject, someBitbucketURL);
+    // then
+    assertNotNull(result);
+    assertEquals(result.getScmProviderUrl(), someBitbucketURL);
+    assertEquals(result.getCheUserId(), subject.getUserId());
+    assertNull(result.getScmOrganization(), bitbucketUser.getName());
+    assertTrue(result.getScmTokenId().startsWith("id-"));
+    assertEquals(result.getToken(), "token");
+  }
+
   @Test
   public void shouldSkipToValidateTokensWithUnknownUrls()
       throws ScmUnauthorizedException, ScmCommunicationException, ForbiddenException,

wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/HttpBitbucketServerApiClientTest.java

@@ -136,6 +136,27 @@ public void testGetUser()
     assertNotNull(user);
   }
 
+  @Test
+  public void shouldGetUserWithSpecialCharacters()
+      throws ScmItemNotFoundException, ScmUnauthorizedException, ScmCommunicationException {
+    stubFor(
+        get(urlEqualTo("/rest/api/1.0/application-properties"))
+            .willReturn(aResponse().withHeader("x-ausername", "user%40email.com")));
+    stubFor(
+        get(urlEqualTo("/rest/api/1.0/users?start=0&limit=25&filter=user@email.com"))
+            .withHeader(HttpHeaders.AUTHORIZATION, equalTo(AUTHORIZATION_TOKEN))
+            .withQueryParam("start", equalTo("0"))
+            .withQueryParam("limit", equalTo("25"))
+            .withQueryParam("filter", equalTo("user@email.com"))
+            .willReturn(
+                aResponse()
+                    .withHeader("Content-Type", "application/json; charset=utf-8")
+                    .withBodyFile("bitbucket/rest/api/1.0/users/email-user/response.json")));
+
+    BitbucketUser user = bitbucketServer.getUser();
+    assertNotNull(user);
+  }
+
   @Test
   public void testGetUsers()
       throws ScmCommunicationException, ScmBadRequestException, ScmUnauthorizedException {

wsmaster/che-core-api-factory-bitbucket-server/src/test/resources/__files/bitbucket/rest/api/1.0/users/email-user/response.json

@@ -0,0 +1,24 @@
+{
+  "size": 1,
+  "limit": 3,
+  "isLastPage": true,
+  "values": [
+    {
+      "name": "user@email.com",
+      "emailAddress": "user@email.com",
+      "id": 58,
+      "displayName": "user",
+      "active": true,
+      "slug": "user@email.com",
+      "type": "NORMAL",
+      "links": {
+        "self": [
+          {
+            "href": "https://bitbucket-bitbucket.apps.cluster-devtools-c9ac.devtools-c9ac.example.opentlc.com/users/user%40email.com"
+          }
+        ]
+      }
+    }
+  ],
+  "start": 9
+}