Merge pull request #6 from mart337i/staging

Fix enterprise error and add dump command

Author: mart337i

cmd/docker/create.go

@@ -139,20 +139,31 @@ func runCreate(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to create docker directory: %w", err)
 	}
 
+	// Handle enterprise authentication if needed
+	var enterpriseToken string
+	if flagEnterprise {
+		var err error
+		enterpriseToken, err = promptEnterpriseAuth()
+		if err != nil {
+			return fmt.Errorf("enterprise authentication failed: %w", err)
+		}
+	}
+
 	// Build state
 	state := &config.State{
-		ProjectName: ctx.Name,
-		OdooVersion: ctx.OdooVersion,
-		Branch:      ctx.Branch,
-		IsGitRepo:   ctx.IsGitRepo,
-		ProjectRoot: ctx.Root,
-		Modules:     modules,
-		Enterprise:  flagEnterprise,
-		WithoutDemo: flagWithoutDemo,
-		PipPackages: pipPkgs,
-		AddonsPaths: addonsPaths,
-		Ports:       config.CalculatePorts(ctx.OdooVersion),
-		CreatedAt:   time.Now(),
+		ProjectName:           ctx.Name,
+		OdooVersion:           ctx.OdooVersion,
+		Branch:                ctx.Branch,
+		IsGitRepo:             ctx.IsGitRepo,
+		ProjectRoot:           ctx.Root,
+		Modules:               modules,
+		Enterprise:            flagEnterprise,
+		EnterpriseGitHubToken: enterpriseToken,
+		WithoutDemo:           flagWithoutDemo,
+		PipPackages:           pipPkgs,
+		AddonsPaths:           addonsPaths,
+		Ports:                 config.CalculatePorts(ctx.OdooVersion),
+		CreatedAt:             time.Now(),
 	}
 
 	// Render templates
@@ -171,6 +182,92 @@ func runCreate(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+func promptEnterpriseAuth() (string, error) {
+	green := color.New(color.FgGreen).SprintFunc()
+	cyan := color.New(color.FgCyan).SprintFunc()
+	yellow := color.New(color.FgYellow).SprintFunc()
+
+	fmt.Println()
+	fmt.Printf("%s Enterprise access requires authentication\n\n", green("🔐"))
+
+	// Check for SSH keys
+	home, err := os.UserHomeDir()
+	if err != nil {
+		home = ""
+	}
+
+	hasSSH := false
+	if home != "" {
+		sshPaths := []string{
+			filepath.Join(home, ".ssh", "id_rsa"),
+			filepath.Join(home, ".ssh", "id_ed25519"),
+		}
+		for _, path := range sshPaths {
+			if _, err := os.Stat(path); err == nil {
+				hasSSH = true
+				break
+			}
+		}
+	}
+
+	// Present authentication options
+	fmt.Println("Choose authentication method:")
+	if hasSSH {
+		fmt.Printf("  [1] SSH Keys %s\n", cyan("(detected)"))
+	}
+	fmt.Printf("  [2] Personal Access Token %s\n", cyan("(recommended)"))
+	fmt.Println()
+
+	// Default to token (option 2)
+	useSSH := false
+	if hasSSH {
+		choice, err := prompt.InputString("Select option [1-2]:", "2")
+		if err != nil {
+			return "", err
+		}
+		useSSH = choice == "1"
+	}
+
+	if useSSH {
+		fmt.Printf("\n%s Using SSH keys for enterprise repository access\n", green("✓"))
+		fmt.Printf("%s Make sure your SSH key is added to GitHub: https://github.com/settings/keys\n\n", yellow("ℹ"))
+		return "", nil // Empty token means use SSH
+	}
+
+	// Prompt for token
+	fmt.Println()
+	fmt.Printf("%s To create a Personal Access Token:\n", cyan("ℹ"))
+	fmt.Printf("  1. Visit: %s\n", cyan("https://github.com/settings/tokens/new"))
+	fmt.Printf("  2. Set description: %s\n", cyan("Odoo Enterprise Access"))
+	fmt.Printf("  3. Select scope: %s\n", cyan("repo (Full control of private repositories)"))
+	fmt.Printf("  4. Click %s and copy the token\n\n", cyan("'Generate token'"))
+
+	token, err := prompt.InputPassword("Enter GitHub Personal Access Token:")
+	if err != nil {
+		return "", err
+	}
+
+	token = strings.TrimSpace(token)
+	if token == "" {
+		return "", fmt.Errorf("token cannot be empty")
+	}
+
+	// Basic validation - modern GitHub tokens start with specific prefixes
+	if !strings.HasPrefix(token, "ghp_") && !strings.HasPrefix(token, "github_pat_") {
+		fmt.Printf("\n%s Token doesn't match expected format (should start with 'ghp_' or 'github_pat_')\n", yellow("⚠"))
+		confirm, err := prompt.Confirm("Continue anyway?", false)
+		if err != nil {
+			return "", err
+		}
+		if !confirm {
+			return "", fmt.Errorf("authentication cancelled")
+		}
+	}
+
+	fmt.Printf("\n%s Token saved securely in environment configuration\n", green("✓"))
+	return token, nil
+}
+
 func printCreateSummary(state *config.State) {
 	green := color.New(color.FgGreen).SprintFunc()
 	cyan := color.New(color.FgCyan).SprintFunc()
@@ -186,12 +283,20 @@ func printCreateSummary(state *config.State) {
 	dir, _ := config.EnvironmentDir(state.ProjectName, state.Branch)
 	fmt.Printf("  Files:       %s\n", cyan(dir))
 
+	if state.Enterprise {
+		authMethod := "SSH Keys"
+		if state.EnterpriseGitHubToken != "" {
+			authMethod = "GitHub Token"
+		}
+		fmt.Printf("  Enterprise:  %s (%s)\n", green("✓"), authMethod)
+	}
+
 	if len(state.AddonsPaths) > 0 {
 		fmt.Printf("  Addons:      %d custom path(s)\n", len(state.AddonsPaths))
 	}
 
 	fmt.Println()
 	fmt.Println("Next steps:")
-	fmt.Printf("  1. %s  # Initialize database and start containers\n", cyan("odooctl docker run"))
+	fmt.Printf("  1. %s  # Build image and initialize database\n", cyan("odooctl docker run -i"))
 	fmt.Printf("  2. %s   # View container status\n", cyan("odooctl docker status"))
 }

cmd/docker/docker.go

@@ -24,4 +24,5 @@ func init() {
 	Cmd.AddCommand(dbCmd)
 	Cmd.AddCommand(odooBinCmd)
 	Cmd.AddCommand(shellCmd)
+	Cmd.AddCommand(dumpCmd)
 }