feat: authentication de-dupe and email capture

Author: goosewin

cmd/assistant.go

@@ -20,7 +20,10 @@ package cmd
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
+	"io"
+	"os"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -224,21 +227,70 @@ var updateAssistantCmd = &cobra.Command{
 	Short: "Update an existing assistant",
 	Long: `Update an assistant's configuration.
 
-Complex updates involving voice models, tools, or advanced settings 
-are best done through the Vapi dashboard at https://dashboard.vapi.ai`,
+You can provide raw JSON via --json or --file to quickly copy configs across orgs.
+Examples:
+  vapi assistant update <id> --file assistant.json
+  cat assistant.json | vapi assistant update <id> --json -
+  vapi assistant update <id> --json '{"name":"New Name"}'
+
+Complex updates can also be done via the Vapi dashboard at https://dashboard.vapi.ai`,
 	Args: cobra.ExactArgs(1),
 	RunE: analytics.TrackCommandWrapper("assistant", "update", func(cmd *cobra.Command, args []string) error {
 		assistantID := args[0]
 
-		fmt.Printf("📝 Update assistant: %s\n", assistantID)
-		fmt.Println()
-		fmt.Println("Assistant updates are best done through the Vapi dashboard where you can:")
-		fmt.Println("- Configure model settings (GPT-4, Claude, etc.)")
-		fmt.Println("- Select and customize voices")
-		fmt.Println("- Set up tools and functions")
-		fmt.Println("- Configure advanced behaviors")
-		fmt.Println()
-		fmt.Println("Visit: https://dashboard.vapi.ai/assistants")
+		// Flags
+		jsonStr, _ := cmd.Flags().GetString("json")
+		filePath, _ := cmd.Flags().GetString("file")
+
+		if jsonStr == "" && filePath == "" {
+			return fmt.Errorf("provide --json or --file for update payload")
+		}
+
+		var payloadBytes []byte
+
+		if filePath != "" {
+			b, err := os.ReadFile(filePath)
+			if err != nil {
+				return fmt.Errorf("failed to read --file: %w", err)
+			}
+			payloadBytes = b
+		} else {
+			// jsonStr provided
+			if jsonStr == "-" {
+				// read from stdin
+				b, err := io.ReadAll(os.Stdin)
+				if err != nil {
+					return fmt.Errorf("failed to read stdin: %w", err)
+				}
+				payloadBytes = b
+			} else {
+				payloadBytes = []byte(jsonStr)
+			}
+		}
+
+		// Basic validation
+		var tmp map[string]interface{}
+		if err := json.Unmarshal(payloadBytes, &tmp); err != nil {
+			return fmt.Errorf("invalid JSON: %w", err)
+		}
+
+		ctx := context.Background()
+
+		// Use low-level raw request helper
+		respBody, err := vapiClient.DoRawJSON(ctx, "PATCH", fmt.Sprintf("/assistants/%s", assistantID), payloadBytes)
+		if err != nil {
+			return fmt.Errorf("failed to update assistant: %w", err)
+		}
+
+		fmt.Println("✅ Assistant updated successfully")
+		if name, ok := respBody["name"].(string); ok && name != "" {
+			fmt.Printf("Name: %s\n", name)
+		}
+
+		// Print the updated assistant JSON
+		if err := output.PrintJSON(respBody); err != nil {
+			return fmt.Errorf("failed to display response: %w", err)
+		}
 
 		return nil
 	}),
@@ -291,4 +343,8 @@ func init() {
 	assistantCmd.AddCommand(getAssistantCmd)
 	assistantCmd.AddCommand(updateAssistantCmd)
 	assistantCmd.AddCommand(deleteAssistantCmd)
+
+	// Flags for update
+	updateAssistantCmd.Flags().String("json", "", "Raw JSON payload string or '-' to read from stdin")
+	updateAssistantCmd.Flags().String("file", "", "Path to JSON file with assistant payload")
 }

cmd/auth.go

@@ -54,12 +54,45 @@ This secure authentication flow:
 		fmt.Println("🔐 Authenticating with Vapi...")
 		fmt.Println()
 
+		// Read optional flags for labeling
+		labelFlag, _ := cmd.Flags().GetString("label")
+		emailFlag, _ := cmd.Flags().GetString("email") // alias, for backward-compat
+		orgFlag, _ := cmd.Flags().GetString("org")
+
 		// Start the browser-based authentication flow
 		// The Login() function handles saving the API key
 		if err := auth.Login(); err != nil {
 			return err
 		}
 
+		// Optionally override label/org with flags if provided
+		cfg, err := config.LoadConfig()
+		if err == nil && cfg.ActiveAccount != "" {
+			acc := cfg.Accounts[cfg.ActiveAccount]
+			changed := false
+
+			// Apply flags if provided
+			if labelFlag != "" {
+				acc.Label = labelFlag
+				changed = true
+			} else if emailFlag != "" { // backward-compat: set label from email flag
+				acc.Label = emailFlag
+				changed = true
+			}
+			if orgFlag != "" {
+				acc.Organization = orgFlag
+				changed = true
+			}
+
+			// No more interactive prompt - the dashboard now provides label/email
+
+			// Persist if any changes
+			if changed {
+				cfg.Accounts[cfg.ActiveAccount] = acc
+				_ = config.SaveConfig(cfg)
+			}
+		}
+
 		fmt.Println("\nYou can now use all Vapi CLI commands.")
 		fmt.Println("• List assistants: vapi assistant list")
 		fmt.Println("• View call history: vapi call list")
@@ -175,6 +208,12 @@ which account you're currently using.`,
 				if account.Organization != "" {
 					fmt.Printf(" - %s", account.Organization)
 				}
+				// Prefer Label; fallback to Email if present
+				if account.Label != "" {
+					fmt.Printf(" <%s>", account.Label)
+				} else if account.Email != "" {
+					fmt.Printf(" <%s>", account.Email)
+				}
 				if account.LoginTime != "" {
 					fmt.Printf(" (logged in: %s)", account.LoginTime[:10]) // Show just the date
 				}
@@ -272,6 +311,12 @@ This is useful when working with multiple organizations or environments.`,
 				if account.Organization != "" {
 					displayName = fmt.Sprintf("%s (%s)", accountName, account.Organization)
 				}
+				// Prefer Label; fallback to Email if present
+				if account.Label != "" {
+					displayName = fmt.Sprintf("%s <%s>", displayName, account.Label)
+				} else if account.Email != "" {
+					displayName = fmt.Sprintf("%s <%s>", displayName, account.Email)
+				}
 				if accountName == cfg.ActiveAccount {
 					displayName += " ✓ (currently active)"
 				}
@@ -314,6 +359,11 @@ This is useful when working with multiple organizations or environments.`,
 				if account.Organization != "" {
 					fmt.Printf(" - %s", account.Organization)
 				}
+				if account.Label != "" {
+					fmt.Printf(" <%s>", account.Label)
+				} else if account.Email != "" {
+					fmt.Printf(" <%s>", account.Email)
+				}
 				fmt.Println()
 			}
 			return fmt.Errorf("account '%s' not found", targetAccount)
@@ -332,6 +382,11 @@ This is useful when working with multiple organizations or environments.`,
 		if account.Organization != "" {
 			fmt.Printf(" (%s)", account.Organization)
 		}
+		if account.Label != "" {
+			fmt.Printf(" <%s>", account.Label)
+		} else if account.Email != "" {
+			fmt.Printf(" <%s>", account.Email)
+		}
 		fmt.Println()
 		return nil
 	}),
@@ -453,4 +508,9 @@ func init() {
 
 	// Add auth command to root
 	rootCmd.AddCommand(authCmd)
+
+	// Flags for login labeling
+	authLoginCmd.Flags().String("label", "", "Override the label for this account (default: your email from dashboard)")
+	authLoginCmd.Flags().String("email", "", "Alias for --label")
+	authLoginCmd.Flags().String("org", "", "Override the organization name for this account")
 }