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

fixup! Rework the Bitbucket Server oauth token validation

pull/673/head
ivinokur 2024-03-28 14:18:26 +02:00
parent 1baf3aff63
commit 37494cd40f
2 changed files with 2 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

@ -100,7 +100,7 @@ public class BitbucketServerPersonalAccessTokenFetcher implements PersonalAccess
scmServerUrl,
OAUTH_PROVIDER_NAME,
EnvironmentContext.getCurrent().getSubject().getUserId(),
user.getName(),
null,
user.getSlug(),
token.getName(),
valueOf(token.getId()),

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

@ -156,7 +156,7 @@ public class BitbucketServerPersonalAccessTokenFetcherTest {
assertNotNull(result);
assertEquals(result.getScmProviderUrl(), someBitbucketURL);
assertEquals(result.getCheUserId(), subject.getUserId());
assertEquals(result.getScmOrganization(), bitbucketUser.getName());
assertNull(result.getScmOrganization(), bitbucketUser.getName());
assertEquals(result.getScmTokenId(), valueOf(bitbucketPersonalAccessToken.getId()));
assertEquals(result.getToken(), bitbucketPersonalAccessToken.getToken());
}