From e2a8ce8eeebb41bae76e432d418a55fca35724ba Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Thu, 11 May 2023 14:14:15 +0300 Subject: [PATCH] Pass user slug instead of user id when creating a PAT for bitbucket-server Signed-off-by: Igor Vinokur --- .../BitbucketServerPersonalAccessTokenFetcher.java | 2 +- ...BitbucketServerPersonalAccessTokenFetcherTest.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java index 157387e30e..50ae813f7b 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/main/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcher.java @@ -97,7 +97,7 @@ public class BitbucketServerPersonalAccessTokenFetcher implements PersonalAccess scmServerUrl, EnvironmentContext.getCurrent().getSubject().getUserId(), user.getName(), - valueOf(user.getId()), + user.getSlug(), token.getName(), valueOf(token.getId()), token.getToken()); diff --git a/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java b/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java index 058f40be47..ad2843634d 100644 --- a/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java +++ b/wsmaster/che-core-api-factory-bitbucket-server/src/test/java/org/eclipse/che/api/factory/server/bitbucket/BitbucketServerPersonalAccessTokenFetcherTest.java @@ -11,11 +11,13 @@ */ package org.eclipse.che.api.factory.server.bitbucket; +import static java.lang.String.valueOf; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; @@ -72,7 +74,8 @@ public class BitbucketServerPersonalAccessTokenFetcherTest { URL apiEndpoint = new URL("https://che.server.com"); subject = new SubjectImpl("another_user", "user987", "token111", false); bitbucketUser = - new BitbucketUser("User", "user", 32423523, "NORMAL", true, "user", "user@users.com"); + new BitbucketUser( + "User User", "user-name", 32423523, "NORMAL", true, "user-slug", "user@users.com"); bitbucketPersonalAccessToken = new BitbucketPersonalAccessToken( 234234, @@ -153,6 +156,12 @@ public class BitbucketServerPersonalAccessTokenFetcherTest { PersonalAccessToken result = fetcher.fetchPersonalAccessToken(subject, someBitbucketURL); // then assertNotNull(result); + assertEquals(result.getScmProviderUrl(), someBitbucketURL); + assertEquals(result.getCheUserId(), subject.getUserId()); + assertEquals(result.getScmOrganization(), bitbucketUser.getName()); + assertEquals(result.getScmUserName(), bitbucketUser.getSlug()); + assertEquals(result.getScmTokenId(), valueOf(bitbucketPersonalAccessToken.getId())); + assertEquals(result.getToken(), bitbucketPersonalAccessToken.getToken()); } @Test