diff --git a/backend/core/src/main/java/org/sonarsource/sonarlint/core/connection/ServerConnection.java b/backend/core/src/main/java/org/sonarsource/sonarlint/core/connection/ServerConnection.java index 269fc341e4..b101590107 100644 --- a/backend/core/src/main/java/org/sonarsource/sonarlint/core/connection/ServerConnection.java +++ b/backend/core/src/main/java/org/sonarsource/sonarlint/core/connection/ServerConnection.java @@ -27,7 +27,7 @@ import org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcClient; import org.sonarsource.sonarlint.core.rpc.protocol.client.sync.InvalidTokenParams; import org.sonarsource.sonarlint.core.serverapi.ServerApi; -import org.sonarsource.sonarlint.core.serverapi.exception.ForbiddenException; +import org.sonarsource.sonarlint.core.serverapi.exception.UnauthorizedException; public class ServerConnection { @@ -59,7 +59,7 @@ public T withClientApiAndReturn(Function serverApiConsumer) { state = ConnectionState.ACTIVE; lastNotificationTime = null; return result; - } catch (ForbiddenException e) { + } catch (UnauthorizedException e) { state = ConnectionState.INVALID_CREDENTIALS; notifyClientAboutWrongTokenIfNeeded(); } @@ -71,7 +71,7 @@ public void withClientApi(Consumer serverApiConsumer) { serverApiConsumer.accept(serverApi); state = ConnectionState.ACTIVE; lastNotificationTime = null; - } catch (ForbiddenException e) { + } catch (UnauthorizedException e) { state = ConnectionState.INVALID_CREDENTIALS; notifyClientAboutWrongTokenIfNeeded(); } diff --git a/backend/core/src/test/java/org/sonarsource/sonarlint/core/ConnectionManagerTests.java b/backend/core/src/test/java/org/sonarsource/sonarlint/core/ConnectionManagerTests.java index 6fb9315331..11e4d39bfe 100644 --- a/backend/core/src/test/java/org/sonarsource/sonarlint/core/ConnectionManagerTests.java +++ b/backend/core/src/test/java/org/sonarsource/sonarlint/core/ConnectionManagerTests.java @@ -34,7 +34,7 @@ import org.sonarsource.sonarlint.core.rpc.protocol.SonarLintRpcClient; import org.sonarsource.sonarlint.core.serverapi.EndpointParams; import org.sonarsource.sonarlint.core.serverapi.ServerApi; -import org.sonarsource.sonarlint.core.serverapi.exception.ForbiddenException; +import org.sonarsource.sonarlint.core.serverapi.exception.UnauthorizedException; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.doReturn; @@ -152,7 +152,7 @@ void should_log_invalid_connection() { // switch connection to invalid state spy.withValidConnection(connectionId, api -> { - throw new ForbiddenException("401"); + throw new UnauthorizedException("401"); }); // attempt to get connection spy.withValidConnection(connectionId, api -> {}); diff --git a/medium-tests/src/test/java/mediumtest/synchronization/ConnectionSyncMediumTests.java b/medium-tests/src/test/java/mediumtest/synchronization/ConnectionSyncMediumTests.java index c9ae816ffc..266c71313d 100644 --- a/medium-tests/src/test/java/mediumtest/synchronization/ConnectionSyncMediumTests.java +++ b/medium-tests/src/test/java/mediumtest/synchronization/ConnectionSyncMediumTests.java @@ -133,7 +133,7 @@ void it_should_sync_when_credentials_are_updated(SonarLintTestHarness harness) { @SonarLintTest void it_should_notify_client_if_invalid_token() { - var status = 403; + var status = 401; var client = newFakeClient() .withCredentials(CONNECTION_ID, "user", "pw") .build();