Skip to content

Commit 739279b

Browse files
authored
Change the name annotation prefix for Bitbucket oauth token secrets to oauth2- (#816)
Change the name annotation prefix for Bitbucket OAuth token secrets to oauth2- instead of bitbucket-. This is needed to distinguish OAuth token secrets from Personal Access Token secrets on the dashboard side.
1 parent d980060 commit 739279b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012-2024 Red Hat, Inc.
2+
* Copyright (c) 2012-2025 Red Hat, Inc.
33
* This program and the accompanying materials are made
44
* available under the terms of the Eclipse Public License 2.0
55
* which is available at https://www.eclipse.org/legal/epl-2.0/
@@ -107,7 +107,7 @@ private PersonalAccessToken fetchOrRefreshPersonalAccessToken(
107107
forceRefreshToken
108108
? oAuthAPI.refreshToken(OAUTH_PROVIDER_NAME)
109109
: oAuthAPI.getOrRefreshToken(OAUTH_PROVIDER_NAME);
110-
String tokenName = NameGenerator.generate(OAUTH_PROVIDER_NAME, 5);
110+
String tokenName = NameGenerator.generate(OAUTH_2_PREFIX, 5);
111111
String tokenId = NameGenerator.generate("id-", 5);
112112
Optional<Pair<Boolean, String>> valid =
113113
isValid(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ public void shouldReturnToken() throws Exception {
153153
bitbucketPersonalAccessTokenFetcher.fetchPersonalAccessToken(
154154
subject, BitbucketApiClient.BITBUCKET_SERVER);
155155
assertNotNull(token);
156+
assertTrue(token.getScmTokenName().startsWith(OAUTH_2_PREFIX));
156157
}
157158

158159
@Test

0 commit comments

Comments
 (0)