fix: skip preset/customization UI when using remote config

Author: fullstackjam

internal/cli/root.go

@@ -10,7 +10,7 @@ import (
 )
 
 var (
-	version = "0.5.1"
+	version = "0.5.2"
 	cfg     = &config.Config{}
 )
 

internal/installer/installer.go

@@ -27,7 +27,7 @@ func Run(cfg *config.Config) error {
 
 func runInstall(cfg *config.Config) error {
 	fmt.Println()
-	ui.Header("OpenBoot Installer v0.5.1")
+	ui.Header("OpenBoot Installer v0.5.2")
 	fmt.Println()
 
 	if cfg.RemoteConfig != nil {
@@ -56,6 +56,14 @@ func runInstall(cfg *config.Config) error {
 		return err
 	}
 
+	if cfg.RemoteConfig != nil {
+		fmt.Println()
+		ui.Success("Package installation complete!")
+		ui.Muted("Dotfiles and shell setup will be handled by the install script.")
+		fmt.Println()
+		return nil
+	}
+
 	if err := stepDotfiles(cfg); err != nil {
 		ui.Error(fmt.Sprintf("Dotfiles setup failed: %v", err))
 	}
@@ -120,6 +128,10 @@ func stepGitConfig(cfg *config.Config) error {
 }
 
 func stepPresetSelection(cfg *config.Config) error {
+	if cfg.RemoteConfig != nil {
+		return nil
+	}
+
 	ui.Header("Step 2: Preset Selection")
 	fmt.Println()
 
@@ -149,19 +161,21 @@ func stepPresetSelection(cfg *config.Config) error {
 }
 
 func stepPackageCustomization(cfg *config.Config) error {
+	if cfg.RemoteConfig != nil {
+		cfg.SelectedPkgs = make(map[string]bool)
+		for _, pkg := range cfg.RemoteConfig.Packages {
+			cfg.SelectedPkgs[pkg] = true
+		}
+		ui.Info(fmt.Sprintf("Using %d packages from remote config", len(cfg.RemoteConfig.Packages)))
+		fmt.Println()
+		return nil
+	}
+
 	ui.Header("Step 3: Package Selection")
 	fmt.Println()
 
 	if cfg.Silent || (cfg.DryRun && !system.HasTTY()) {
 		cfg.SelectedPkgs = config.GetPackagesForPreset(cfg.Preset)
-
-		if cfg.RemoteConfig != nil && len(cfg.RemoteConfig.Packages) > 0 {
-			for _, pkg := range cfg.RemoteConfig.Packages {
-				cfg.SelectedPkgs[pkg] = true
-			}
-			ui.Info(fmt.Sprintf("Using preset + %d additional packages from remote config", len(cfg.RemoteConfig.Packages)))
-		}
-
 		total := len(cfg.SelectedPkgs)
 		ui.Info(fmt.Sprintf("Using preset packages: %d selected", total))
 		fmt.Println()
@@ -202,47 +216,26 @@ func stepPackageCustomization(cfg *config.Config) error {
 }
 
 func stepInstallPackages(cfg *config.Config) error {
-	ui.Header("Step 4: Installation")
+	ui.Header("Step 2: Installation")
 	fmt.Println()
 
 	var cliPkgs, caskPkgs []string
 
-	knownCasks := make(map[string]bool)
-	for _, cat := range config.Categories {
-		for _, pkg := range cat.Packages {
-			if pkg.IsCask {
-				knownCasks[pkg.Name] = true
-			}
-		}
-	}
-
-	for _, cat := range config.Categories {
-		for _, pkg := range cat.Packages {
-			if cfg.SelectedPkgs[pkg.Name] {
-				if pkg.IsCask {
-					caskPkgs = append(caskPkgs, pkg.Name)
-				} else {
-					cliPkgs = append(cliPkgs, pkg.Name)
-				}
-			}
-		}
-	}
-
 	if cfg.RemoteConfig != nil {
-		added := make(map[string]bool)
-		for _, p := range cliPkgs {
-			added[p] = true
-		}
-		for _, p := range caskPkgs {
-			added[p] = true
+		for pkg := range cfg.SelectedPkgs {
+			caskPkgs = append(caskPkgs, pkg)
 		}
-
-		for _, pkg := range cfg.RemoteConfig.Packages {
-			if added[pkg] {
-				continue
+	} else {
+		for _, cat := range config.Categories {
+			for _, pkg := range cat.Packages {
+				if cfg.SelectedPkgs[pkg.Name] {
+					if pkg.IsCask {
+						caskPkgs = append(caskPkgs, pkg.Name)
+					} else {
+						cliPkgs = append(cliPkgs, pkg.Name)
+					}
+				}
 			}
-			caskPkgs = append(caskPkgs, pkg)
-			added[pkg] = true
 		}
 	}
 

website/src/routes/api/auth/callback/+server.ts

@@ -29,19 +29,26 @@ export const GET: RequestHandler = async ({ url, platform, cookies }) => {
 		redirect(302, `${env.APP_URL}?error=token_failed`);
 	}
 
-	const userResponse = await fetch(GITHUB_USER_URL, {
-		headers: {
-			Authorization: `Bearer ${tokenData.access_token}`,
-			Accept: 'application/json',
-			'User-Agent': 'OpenBoot'
-		}
-	});
+	const headers = {
+		Authorization: `Bearer ${tokenData.access_token}`,
+		Accept: 'application/json',
+		'User-Agent': 'OpenBoot'
+	};
 
+	const userResponse = await fetch(GITHUB_USER_URL, { headers });
 	const githubUser = await userResponse.json();
 	if (!githubUser.id || !githubUser.login) {
 		redirect(302, `${env.APP_URL}?error=user_failed`);
 	}
 
+	let email = githubUser.email || '';
+	if (!email) {
+		const emailsResponse = await fetch('https://api.github.com/user/emails', { headers });
+		const emails = await emailsResponse.json();
+		const primary = emails.find((e: { primary: boolean; email: string }) => e.primary);
+		email = primary?.email || emails[0]?.email || '';
+	}
+
 	const userId = String(githubUser.id);
 
 	await env.DB.prepare(
@@ -55,7 +62,7 @@ export const GET: RequestHandler = async ({ url, platform, cookies }) => {
 			updated_at = datetime('now')
 	`
 	)
-		.bind(userId, githubUser.login, githubUser.email || '', githubUser.avatar_url || '')
+		.bind(userId, githubUser.login, email, githubUser.avatar_url || '')
 		.run();
 
 	const existingConfig = await env.DB.prepare('SELECT id FROM configs WHERE user_id = ? AND slug = ?').bind(userId, 'default').first();