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 

Signed-off-by: Anatolii Bazko <abazko@redhat.com>
pull/456/head
Anatolii Bazko 2023-03-02 10:53:41 +02:00
parent b0514ce37c
commit bd4c1812fb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wsmaster/che-core-api-factory-azure-devops/src/main/java/org/eclipse/che/api/factory/server/azure/devops/AzureDevOpsPersonalAccessTokenFetcher.java
View File

@ -49,7 +49,7 @@ public class AzureDevOpsPersonalAccessTokenFetcher implements PersonalAccessToke
private static final Logger LOG = private static final Logger LOG =
LoggerFactory.getLogger(AzureDevOpsPersonalAccessTokenFetcher.class); LoggerFactory.getLogger(AzureDevOpsPersonalAccessTokenFetcher.class);
private final String cheApiEndpoint; private final String cheApiEndpoint;
private final String azureDevOpsApiEndpoint; private final String azureDevOpsScmApiEndpoint;
private final OAuthAPI oAuthAPI; private final OAuthAPI oAuthAPI;
private final String[] scopes; private final String[] scopes;
@ -58,12 +58,12 @@ public class AzureDevOpsPersonalAccessTokenFetcher implements PersonalAccessToke
@Inject @Inject
public AzureDevOpsPersonalAccessTokenFetcher( public AzureDevOpsPersonalAccessTokenFetcher(
@Named("che.api") String cheApiEndpoint, @Named("che.api") String cheApiEndpoint,
@Named("che.integration.azure.devops.api_endpoint") String azureDevOpsApiEndpoint, @Named("che.integration.azure.devops.scm.api_endpoint") String azureDevOpsScmApiEndpoint,
@Named("che.integration.azure.devops.application_scopes") String[] scopes, @Named("che.integration.azure.devops.application_scopes") String[] scopes,
AzureDevOpsApiClient azureDevOpsApiClient, AzureDevOpsApiClient azureDevOpsApiClient,
OAuthAPI oAuthAPI) { OAuthAPI oAuthAPI) {
this.cheApiEndpoint = cheApiEndpoint; this.cheApiEndpoint = cheApiEndpoint;
this.azureDevOpsApiEndpoint = trimEnd(azureDevOpsApiEndpoint, '/'); this.azureDevOpsScmApiEndpoint = trimEnd(azureDevOpsScmApiEndpoint, '/');
this.oAuthAPI = oAuthAPI; this.oAuthAPI = oAuthAPI;
this.scopes = scopes; this.scopes = scopes;
this.azureDevOpsApiClient = azureDevOpsApiClient; this.azureDevOpsApiClient = azureDevOpsApiClient;
@ -96,7 +96,7 @@ public class AzureDevOpsPersonalAccessTokenFetcher implements PersonalAccessToke
if (valid.isEmpty()) { if (valid.isEmpty()) {
throw new ScmCommunicationException( throw new ScmCommunicationException(
"Unable to verify if current token is a valid Azure DevOps token. Token's scm-url needs to be '" "Unable to verify if current token is a valid Azure DevOps token. Token's scm-url needs to be '"
+ azureDevOpsApiEndpoint + azureDevOpsScmApiEndpoint
+ "' and was '" + "' and was '"
+ token.getScmProviderUrl() + token.getScmProviderUrl()
+ "'"); + "'");
@ -160,6 +160,6 @@ public class AzureDevOpsPersonalAccessTokenFetcher implements PersonalAccessToke
} }
private Boolean isValidScmServerUrl(String scmServerUrl) { private Boolean isValidScmServerUrl(String scmServerUrl) {
return azureDevOpsApiEndpoint.equals(trimEnd(scmServerUrl, '/')); return azureDevOpsScmApiEndpoint.equals(trimEnd(scmServerUrl, '/'));
} }
} }