Merge pull request #6278 from microsoft/andy-bugfix11

Fix bug of cannot sign-in in Mac M1 machine

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/intellij/actions/AzureSignInAction.java

@@ -292,7 +292,7 @@ private static Single<DeviceCodeAccount> loginDeviceCodeSingle() {
             final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
             indicator.setIndeterminate(true);
             final AzureAccount az = Azure.az(AzureAccount.class);
-            return (DeviceCodeAccount) checkCanceled(indicator, az.loginAsync(AuthType.DEVICE_CODE, true), () -> {
+            return (DeviceCodeAccount) checkCanceled(indicator, az.loginAsync(AuthType.DEVICE_CODE, IdentityAzureManager.shallEnablePersistence()), () -> {
                 throw Lombok.sneakyThrow(new InterruptedException("user cancel"));
             });
         });

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/AzureModule.java

@@ -91,6 +91,7 @@ public AzureModule(@Nullable Object project) {
             SignInOutListener signInOutListener = new SignInOutListener();
             AuthMethodManager.getInstance().addSignInEventListener(signInOutListener);
             AuthMethodManager.getInstance().addSignOutEventListener(signInOutListener);
+            signInOutListener.run();
         } catch (Exception ex) {
             DefaultLoader.getUIHelper().logError(ex.getMessage(), ex);
         }

Utils/azuretools-core/src/com/microsoft/azuretools/sdkmanage/IdentityAzureManager.java

@@ -5,6 +5,7 @@
 
 package com.microsoft.azuretools.sdkmanage;
 
+import com.microsoft.aad.msal4jextensions.persistence.mac.ISecurityLibrary;
 import com.microsoft.azure.credentials.AzureTokenCredentials;
 import com.microsoft.azure.management.resources.Tenant;
 import com.microsoft.azure.toolkit.ide.common.store.AzureStoreManager;
@@ -26,6 +27,7 @@
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemUtils;
 import reactor.core.publisher.Mono;
 
 import java.io.IOException;
@@ -124,7 +126,18 @@ public Mono<AuthMethodDetails> signInAzureCli() {
 
     public Mono<AuthMethodDetails> signInOAuth() {
         AzureAccount az = com.microsoft.azure.toolkit.lib.Azure.az(AzureAccount.class);
-        return az.loginAsync(AuthType.OAUTH2, true).flatMap(Account::continueLogin).map(account -> fromAccountEntity(account.getEntity()));
+        return az.loginAsync(AuthType.OAUTH2, shallEnablePersistence()).flatMap(Account::continueLogin).map(account -> fromAccountEntity(account.getEntity()));
+    }
+
+    public static boolean shallEnablePersistence() {
+        if (SystemUtils.IS_OS_MAC) {
+            try {
+                ISecurityLibrary.library.CFRelease(null);
+            } catch (Throwable ex) {
+                return false;
+            }
+        }
+        return true;
     }
 
     public Mono<AuthMethodDetails> restoreSignIn(AuthMethodDetails authMethodDetails) {