Update Identity Flows for IntelliJ and Authorization Code credentials (Azure#37044)

Author: g2vinay

sdk/identity/azure-identity/src/main/java/com/azure/identity/AuthorizationCodeCredential.java

@@ -7,10 +7,12 @@
 import com.azure.core.credential.AccessToken;
 import com.azure.core.credential.TokenCredential;
 import com.azure.core.credential.TokenRequestContext;
+import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
 import com.azure.identity.implementation.IdentityClient;
 import com.azure.identity.implementation.IdentityClientBuilder;
 import com.azure.identity.implementation.IdentityClientOptions;
+import com.azure.identity.implementation.MsalToken;
 import com.azure.identity.implementation.MsalAuthenticationAccount;
 import com.azure.identity.implementation.util.LoggingUtil;
 import reactor.core.publisher.Mono;
@@ -60,6 +62,7 @@ public class AuthorizationCodeCredential implements TokenCredential {
     private boolean isCaeEnabledRequestCached;
     private boolean isCaeDisabledRequestCached;
     private boolean isCachePopulated;
+    private final boolean useConfidentialClient;
 
     /**
      * Creates an AuthorizationCodeCredential with the given identity client options.
@@ -82,15 +85,21 @@ public class AuthorizationCodeCredential implements TokenCredential {
         this.cachedToken = new AtomicReference<>();
         this.authCode = authCode;
         this.redirectUri = redirectUri;
+        this.useConfidentialClient = !CoreUtils.isNullOrEmpty(clientSecret);
     }
 
     @Override
     public Mono<AccessToken> getToken(TokenRequestContext request) {
         return Mono.defer(() -> {
             isCachePopulated = isCachePopulated(request);
             if (isCachePopulated) {
-                return identityClient.authenticateWithPublicClientCache(request, cachedToken.get())
-                    .onErrorResume(t -> Mono.empty());
+                if (useConfidentialClient) {
+                    return identityClient.authenticateWithConfidentialClientCache(request, cachedToken.get())
+                        .map(accessToken -> (MsalToken) accessToken);
+                } else {
+                    return identityClient.authenticateWithPublicClientCache(request, cachedToken.get())
+                        .onErrorResume(t -> Mono.empty());
+                }
             } else {
                 return Mono.empty();
             }

sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClient.java

@@ -667,17 +667,33 @@ private SynchronizedAccessor<PublicClientApplication> getPublicClientInstance(To
      */
     @SuppressWarnings("deprecation")
     public Mono<AccessToken> authenticateWithConfidentialClientCache(TokenRequestContext request) {
+        return authenticateWithConfidentialClientCache(request, null);
+    }
+
+    /**
+     * Asynchronously acquire a token from the currently logged in client.
+     *
+     * @param request the details of the token request
+     * @param account the account used to log in to acquire the last token
+     *
+     * @return a Publisher that emits an AccessToken
+     */
+    @SuppressWarnings("deprecation")
+    public Mono<AccessToken> authenticateWithConfidentialClientCache(TokenRequestContext request, IAccount account) {
         return getConfidentialClientInstance(request).getValue()
             .flatMap(confidentialClient -> Mono.fromFuture(() -> {
                 SilentParameters.SilentParametersBuilder parametersBuilder = SilentParameters.builder(
                         new HashSet<>(request.getScopes()))
                     .tenant(IdentityUtil.resolveTenantId(tenantId, request, options));
+                if (account != null) {
+                    parametersBuilder.account(account);
+                }
                 try {
                     return confidentialClient.acquireTokenSilently(parametersBuilder.build());
                 } catch (MalformedURLException e) {
                     return getFailedCompletableFuture(LOGGER.logExceptionAsError(new RuntimeException(e)));
                 }
-            }).map(ar -> (AccessToken) new MsalToken(ar))
+            }).map(ar -> new MsalToken(ar))
                 .filter(t -> OffsetDateTime.now().isBefore(t.getExpiresAt().minus(REFRESH_OFFSET))));
     }
 

sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IntelliJCacheAccessor.java

@@ -308,7 +308,12 @@ public IntelliJAuthMethodDetails getAuthDetailsIfAvailable() throws IOException
             return null;
         }
 
-        IntelliJAuthMethodDetails authMethodDetails = parseAuthMethodDetails(authFile);
+        IntelliJAuthMethodDetails authMethodDetails;
+        try {
+            authMethodDetails = parseAuthMethodDetails(authFile);
+        } catch (IOException exception) {
+            throw new CredentialUnavailableException("Error Parsing Authentication Method details.", exception);
+        }
 
         String authType = authMethodDetails.getAuthMethod();
         if (CoreUtils.isNullOrEmpty(authType)) {