Auto-commit 2026-04-27 19:13

cmd/auth.go

@@ -4,24 +4,49 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/99designs/keyring"
 	"github.com/frenocorp/pop/internal/auth"
+	"github.com/frenocorp/pop/internal/config"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
 )
 
 func loginCmd() *cobra.Command {
+	var email, password, totpCode string
+	var interactive bool
+
 	cmd := &cobra.Command{
 		Use:   "login",
 		Short: "Log in to ProtonMail",
 		Long:  `Authenticate with ProtonMail API and store session credentials.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			manager := auth.NewSessionManager()
-			return manager.Login()
+			cfgMgr := config.NewConfigManager()
+			config, err := cfgMgr.Load()
+			if err != nil {
+				return fmt.Errorf("failed to load config: %w", err)
+			}
+
+			manager, err := auth.NewSessionManager()
+			if err != nil {
+				return fmt.Errorf("failed to create session manager: %w", err)
+			}
+
+			if interactive {
+				return manager.LoginInteractive(config.APIBaseURL)
+			}
+
+			if email == "" || password == "" {
+				return fmt.Errorf("email and password flags required for non-interactive login")
+			}
+
+			return manager.LoginWithCredentials(config.APIBaseURL, email, password)
 		},
 	}
 
-	cmd.Flags().StringP("email", "e", "", "ProtonMail email address")
-	cmd.Flags().StringP("password", "p", "", "ProtonMail password")
-	cmd.Flags().BoolP("interactive", "i", true, "Interactive prompt for credentials")
+	cmd.Flags().StringVarP(&email, "email", "e", "", "ProtonMail email address")
+	cmd.Flags().StringVarP(&password, "password", "p", "", "ProtonMail password")
+	cmd.Flags().BoolVarP(&interactive, "interactive", "i", true, "Interactive prompt for credentials")
+	cmd.Flags().StringVar(&totpCode, "totp", "", "TOTP code for 2FA authentication")
 
 	return cmd
 }

cmd/contacts.go

@@ -123,11 +123,20 @@ func contactEditCmd() *cobra.Command {
 			address, _ := cmd.Flags().GetString("address")
 			notes, _ := cmd.Flags().GetString("notes")
 			
-			req := contact.UpdateContactRequest{
-				Name:   &name,
-				Phone:  &phone,
-				Address: &address,
-				Notes:  &notes,
+			req := contact.UpdateContactRequest{}
+			
+			// Only set pointer fields when the flag was explicitly changed
+			if cmd.Flags().Changed("name") {
+				req.Name = &name
+			}
+			if cmd.Flags().Changed("phone") {
+				req.Phone = &phone
+			}
+			if cmd.Flags().Changed("address") {
+				req.Address = &address
+			}
+			if cmd.Flags().Changed("notes") {
+				req.Notes = &notes
 			}
 			
 			updated, err := manager.Update(id, req)