seg_yinzy
/
che-server
mirror of https://github.com/eclipse-che/che-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pass user slug instead of user id when creating a PAT for bitbucket-server 

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>
pull/512/head
Igor Vinokur 2023-05-11 14:14:15 +03:00
parent 1fb16e5b63
commit e2a8ce8eee
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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());

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

@ -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