fix client id inside AzureCliSubscription (#639)

* fix client id inside AzureCliSubscription * AzureCliSubscription: fix checkstyle
Azure · Oct 15, 2019 · d5b30ff · d5b30ff
1 parent 3db99ed
commit d5b30ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ent-authentication/src/main/java/com/microsoft/azure/credentials/AzureCliCredentials.java b/...ent-authentication/src/main/java/com/microsoft/azure/credentials/AzureCliCredentials.java
@@ -100,8 +100,7 @@ public static AzureCliCredentials create(File azureProfile, File accessTokens) t
      * @return the active directory application client id
      */
     public String clientId() {
-        AzureCliSubscription subscription = this.subscriptions.get(defaultSubscriptionId());
-        return subscription.isServicePrincipal() ? subscription.servicePrincipal().clientId() : subscription.clientId();
+        return subscriptions.get(defaultSubscriptionId()).clientId();
     }
 
     /**

diff --git a/...nt-authentication/src/main/java/com/microsoft/azure/credentials/AzureCliSubscription.java b/...nt-authentication/src/main/java/com/microsoft/azure/credentials/AzureCliSubscription.java
@@ -44,6 +44,9 @@ boolean isDefault() {
     }
 
     String clientId() {
+        if (isServicePrincipal()) {
+            return servicePrincipalToken.clientId();
+        }
         return clientId;
     }