From 37494cd40f4dfd220eb6a349e2c29fdb8d39671f Mon Sep 17 00:00:00 2001 From: ivinokur Date: Thu, 28 Mar 2024 14:18:26 +0200 Subject: [PATCH] fixup! Rework the Bitbucket Server oauth token validation --- .../bitbucket/BitbucketServerPersonalAccessTokenFetcher.java | 2 +- .../BitbucketServerPersonalAccessTokenFetcherTest.java | 2 +- 2 files changed, 2 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 1e68f47d5a..d0d389f188 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 @@ -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()), 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 e1c4fc3e02..596ed6282d 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 @@ -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()); }