fix(app): allow bootstrapping of templates without authenticating (#562)

* fix(app): allow bootstrapping of templates without authenticating

* chore(cmd): bump version

* refactor(pkg): factor out subdomain extraction fn

Author: rektdeckard

cmd/lk/app.go

@@ -31,6 +31,10 @@ import (
 	"github.com/urfave/cli/v3"
 )
 
+var (
+	ErrNoProjectSelected = errors.New("no project selected")
+)
+
 var (
 	template        *bootstrap.Template
 	templateName    string
@@ -49,7 +53,6 @@ var (
 				{
 					Name:      "create",
 					Usage:     "Bootstrap a new application from a template or through guided creation",
-					Before:    requireProject,
 					Action:    setupTemplate,
 					ArgsUsage: "`APP_NAME`",
 					Flags: []cli.Flag{
@@ -150,7 +153,7 @@ func requireProject(ctx context.Context, cmd *cli.Command) (context.Context, err
 		if len(cliConfig.Projects) > 0 {
 			var options []huh.Option[*config.ProjectConfig]
 			for _, p := range cliConfig.Projects {
-				options = append(options, huh.NewOption(p.Name+" ["+p.APIKey+"]", &p))
+				options = append(options, huh.NewOption(p.Name+" ["+util.ExtractSubdomain(p.URL)+"]", &p))
 			}
 			if err = huh.NewForm(
 				huh.NewGroup(huh.NewSelect[*config.ProjectConfig]().
@@ -179,7 +182,7 @@ func requireProject(ctx context.Context, cmd *cli.Command) (context.Context, err
 				}
 				return requireProject(ctx, cmd)
 			} else {
-				return nil, errors.New("no project selected")
+				return nil, ErrNoProjectSelected
 			}
 		}
 	}
@@ -413,12 +416,21 @@ func manageEnv(ctx context.Context, cmd *cli.Command) error {
 }
 
 func instantiateEnv(ctx context.Context, cmd *cli.Command, rootPath string, addlEnv *map[string]string, exampleFile string) (map[string]string, error) {
-	env := map[string]string{
-		"LIVEKIT_API_KEY":         project.APIKey,
-		"LIVEKIT_API_SECRET":      project.APISecret,
-		"LIVEKIT_URL":             project.URL,
-		"NEXT_PUBLIC_LIVEKIT_URL": project.URL,
+	env := map[string]string{}
+	if _, err := requireProject(ctx, cmd); err != nil {
+		if !errors.Is(err, ErrNoProjectSelected) {
+			return nil, err
+		}
+		// if no project is selected, we prompt for all environment variables including LIVEKIT_ ones
+	} else {
+		env = map[string]string{
+			"LIVEKIT_API_KEY":         project.APIKey,
+			"LIVEKIT_API_SECRET":      project.APISecret,
+			"LIVEKIT_URL":             project.URL,
+			"NEXT_PUBLIC_LIVEKIT_URL": project.URL,
+		}
 	}
+
 	if addlEnv != nil {
 		for k, v := range *addlEnv {
 			env[k] = v

pkg/config/config.go

@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"regexp"
 	"strings"
 
+	"github.com/livekit/livekit-cli/v2/pkg/util"
 	"gopkg.in/yaml.v3"
 )
 
@@ -70,17 +70,8 @@ func LoadProjectBySubdomain(subdomain string) (*ProjectConfig, error) {
 
 	fmt.Println("Loading project by subdomain", subdomain)
 
-	extractSubdomain := func(url string) string {
-		subdomainPattern := regexp.MustCompile(`^(?:https?|wss?)://([^.]+)\.`)
-		matches := subdomainPattern.FindStringSubmatch(url)
-		if len(matches) > 1 {
-			return matches[1]
-		}
-		return ""
-	}
-
 	for _, p := range conf.Projects {
-		projectSubdomain := extractSubdomain(p.URL)
+		projectSubdomain := util.ExtractSubdomain(p.URL)
 		if projectSubdomain == subdomain {
 			return &p, nil
 		}

pkg/util/url.go

@@ -0,0 +1,14 @@
+package util
+
+import (
+	"regexp"
+)
+
+func ExtractSubdomain(url string) string {
+	subdomainPattern := regexp.MustCompile(`^(?:https?|wss?)://([^.]+)\.`)
+	matches := subdomainPattern.FindStringSubmatch(url)
+	if len(matches) > 1 {
+		return matches[1]
+	}
+	return ""
+}

version.go

@@ -15,5 +15,5 @@
 package livekitcli
 
 const (
-	Version = "2.4.5"
+	Version = "2.4.6"
 )