Skip to content

Fix bug 1839026: error of cancelling device code login. #5228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andxu merged 1 commit into from
May 19, 2021
Merged

Fix bug 1839026: error of cancelling device code login. #5228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Utils/azuretools-core/src/com/microsoft/azuretools/authmanage/AuthMethodManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,11 @@
import static com.microsoft.azuretools.telemetry.TelemetryConstants.RESIGNIN;
import static com.microsoft.azuretools.telemetry.TelemetryConstants.SIGNIN_METHOD;

import lombok.Lombok;
import reactor.core.publisher.Hooks;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import rx.exceptions.Exceptions;

public class AuthMethodManager {
private static final org.apache.log4j.Logger LOGGER =
Expand All @@ -66,7 +68,8 @@ public class AuthMethodManager {
static {
// fix the class load problem for intellij plugin
ClassLoader current = Thread.currentThread().getContextClassLoader();
Logger.getLogger(com.microsoft.aad.adal4j.AuthenticationContext.class).setLevel(Level.OFF);
Logger.getLogger("com.microsoft.aad.msal4j.PublicClientApplication").setLevel(Level.OFF);

try {
Thread.currentThread().setContextClassLoader(AuthMethodManager.class.getClassLoader());
HttpClientProviders.createInstance();
Expand All @@ -75,6 +78,14 @@ public class AuthMethodManager {
com.microsoft.azure.toolkit.lib.Azure.az(AzureCloud.class)
.set(AzureEnvironmentUtils.stringToAzureEnvironment(CommonSettings.getEnvironment().getName()));
}
Hooks.onErrorDropped(ex -> {
if (Exceptions.getFinalCause(ex) instanceof InterruptedException) {
LOGGER.info(ex.getMessage());
}
throw Lombok.sneakyThrow(ex);
});


} finally {
Thread.currentThread().setContextClassLoader(current);
}
Expand Down