|
28 | 28 | import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager; |
29 | 29 | import org.eclipse.che.api.factory.server.scm.exception.ScmCommunicationException; |
30 | 30 | import org.eclipse.che.api.factory.server.scm.exception.ScmConfigurationPersistenceException; |
| 31 | +import org.eclipse.che.api.factory.server.scm.exception.ScmUnauthorizedException; |
| 32 | +import org.eclipse.che.api.factory.server.scm.exception.UnknownScmProviderException; |
| 33 | +import org.eclipse.che.api.factory.server.scm.exception.UnsatisfiedScmPreconditionException; |
31 | 34 | import org.eclipse.che.api.factory.server.urlfactory.DevfileFilenamesProvider; |
32 | | -import org.eclipse.che.commons.env.EnvironmentContext; |
33 | 35 |
|
34 | 36 | /** |
35 | 37 | * Parser of String Azure DevOps URLs and provide {@link AzureDevOpsUrl} objects. |
@@ -94,13 +96,13 @@ private boolean isUserTokenPresent(String repositoryUrl) { |
94 | 96 | if (serverUrlOptional.isPresent()) { |
95 | 97 | String serverUrl = serverUrlOptional.get(); |
96 | 98 | try { |
97 | | - Optional<PersonalAccessToken> token = |
98 | | - tokenManager.get(EnvironmentContext.getCurrent().getSubject(), serverUrl); |
99 | | - if (token.isPresent()) { |
100 | | - PersonalAccessToken accessToken = token.get(); |
101 | | - return accessToken.getScmTokenName().equals(PROVIDER_NAME); |
102 | | - } |
103 | | - } catch (ScmConfigurationPersistenceException | ScmCommunicationException exception) { |
| 99 | + PersonalAccessToken accessToken = tokenManager.get(serverUrl); |
| 100 | + return accessToken.getScmTokenName().equals(PROVIDER_NAME); |
| 101 | + } catch (ScmConfigurationPersistenceException |
| 102 | + | ScmCommunicationException |
| 103 | + | ScmUnauthorizedException |
| 104 | + | UnknownScmProviderException |
| 105 | + | UnsatisfiedScmPreconditionException exception) { |
104 | 106 | return false; |
105 | 107 | } |
106 | 108 | } |
|
0 commit comments