refactor: GetObjectId() after review comments

Azure · Nov 15, 2024 · b7ae1bb · b7ae1bb
1 parent 5556316
commit b7ae1bb
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/internal/clients/account.go b/internal/clients/account.go
@@ -95,18 +95,19 @@ func (account *ResourceManagerAccount) GetObjectId() string {
 		log.Printf("[DEBUG] Error getting requesting token from credentials: %s", err)
 	}
 
-	cl, err := parseTokenClaims(tok.Token)
-	if err != nil {
-		log.Printf("[DEBUG] Error getting object id from token: %s", err)
-	}
-	if cl != nil && cl.ObjectId != "" {
-		account.objectId = &cl.ObjectId
-		return cl.ObjectId
-	}
-
-	err = account.loadSignedInUserFromAzCmd()
-	if err != nil {
-		log.Printf("[DEBUG] Error getting user object ID from az cli: %s", err)
+	if tok.Token == "" {
+		err = account.loadSignedInUserFromAzCmd()
+		if err != nil {
+			log.Printf("[DEBUG] Error getting user object ID from az cli: %s", err)
+		}
+	} else {
+		cl, err := parseTokenClaims(tok.Token)
+		if err != nil {
+			log.Printf("[DEBUG] Error getting object id from token: %s", err)
+		}
+		if cl != nil && cl.ObjectId != "" {
+			account.objectId = &cl.ObjectId
+		}
 	}
 
 	if account.objectId == nil {