chore: oauth facility

Author: BhautikChudasama

README.md

@@ -157,12 +157,13 @@ createos --help
 | `createos open`   | Open a project's live URL in your browser         |
 | `createos scale`  | Adjust replicas and resources for an environment  |
 
-### OAuth
+### OAuth Clients
 
-| Command                         | Description              |
-| ------------------------------- | ------------------------ |
-| `createos oauth clients list`   | List OAuth clients       |
-| `createos oauth clients create` | Create a new OAuth client |
+| Command                                | Description                           |
+| -------------------------------------- | ------------------------------------- |
+| `createos oauth-clients list`          | List your OAuth clients               |
+| `createos oauth-clients create`        | Create a new OAuth client             |
+| `createos oauth-clients instructions`  | Show setup instructions for a client  |
 
 ### Users
 
@@ -184,6 +185,16 @@ createos --help
 All commands that would normally show an interactive prompt accept flags instead:
 
 ```bash
+# OAuth clients
+createos oauth-clients instructions --client <client-id>
+createos oauth-clients create \
+  --name "My App" \
+  --redirect-uri https://myapp.com/callback \
+  --app-url https://myapp.com \
+  --policy-url https://myapp.com/privacy \
+  --tos-url https://myapp.com/tos \
+  --logo-url https://myapp.com/logo.png
+
 # Projects
 createos projects get --project <id>
 

cmd/oauth/clients.go

@@ -1,20 +1,39 @@
+// Package oauth provides OAuth client management commands.
 package oauth
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/pterm/pterm"
 	"github.com/urfave/cli/v2"
 
 	"github.com/NodeOps-app/createos-cli/internal/api"
+	"github.com/NodeOps-app/createos-cli/internal/terminal"
 )
 
 func newCreateCommand() *cli.Command {
 	return &cli.Command{
 		Name:  "create",
 		Usage: "Create an OAuth client",
-		Description: "Starts an interactive flow to create an OAuth client.\n\n" +
-			"   You'll be asked for the client name, redirect URIs, visibility, and policy URLs.",
+		Description: "Creates an OAuth client interactively, or non-interactively via flags.\n\n" +
+			"   Non-interactive example:\n" +
+			"     createos oauth-clients create \\\n" +
+			"       --name \"My App\" \\\n" +
+			"       --redirect-uri https://myapp.com/callback \\\n" +
+			"       --app-url https://myapp.com \\\n" +
+			"       --policy-url https://myapp.com/privacy \\\n" +
+			"       --tos-url https://myapp.com/tos \\\n" +
+			"       --logo-url https://myapp.com/logo.png",
+		Flags: []cli.Flag{
+			&cli.StringFlag{Name: "name", Usage: "Client name"},
+			&cli.StringSliceFlag{Name: "redirect-uri", Usage: "Redirect URI (repeatable)"},
+			&cli.BoolFlag{Name: "public", Usage: "Create a public client (no client secret)"},
+			&cli.StringFlag{Name: "app-url", Usage: "Application URL"},
+			&cli.StringFlag{Name: "policy-url", Usage: "Privacy policy URL"},
+			&cli.StringFlag{Name: "tos-url", Usage: "Terms of service URL"},
+			&cli.StringFlag{Name: "logo-url", Usage: "Logo URL"},
+		},
 		Action: func(c *cli.Context) error {
 			client, err := getClient(c)
 			if err != nil {
@@ -29,51 +48,95 @@ func newCreateCommand() *cli.Command {
 				return fmt.Errorf("you already have the maximum number of OAuth clients (4)\n\n  To continue, delete one through the dashboard or reuse an existing client")
 			}
 
-			name, err := promptRequiredText("Client name", validateClientName)
-			if err != nil {
-				return err
-			}
+			isInteractive := terminal.IsInteractive()
+			hasFlags := c.IsSet("name") || c.IsSet("redirect-uri")
 
-			redirectURIs, err := promptRedirectURIs()
-			if err != nil {
-				return err
-			}
+			var name string
+			var redirectURIs []string
+			var public bool
+			var clientURI, policyURI, tosURI, logoURI string
 
-			public, err := pterm.DefaultInteractiveConfirm.
-				WithDefaultText("Should this be a public client? Public clients do not use a client secret").
-				WithDefaultValue(false).
-				Show()
-			if err != nil {
-				return fmt.Errorf("could not read client type: %w", err)
-			}
+			if isInteractive && !hasFlags {
+				name, err = promptRequiredText("Client name", validateClientName)
+				if err != nil {
+					return err
+				}
 
-			clientURI, err := promptRequiredText("Application URL", validateURI)
-			if err != nil {
-				return err
-			}
-			policyURI, err := promptRequiredText("Privacy policy URL", validateURI)
-			if err != nil {
-				return err
-			}
-			tosURI, err := promptRequiredText("Terms of service URL", validateURI)
-			if err != nil {
-				return err
-			}
-			logoURI, err := promptRequiredText("Logo URL", validateURI)
-			if err != nil {
-				return err
-			}
+				redirectURIs, err = promptRedirectURIs()
+				if err != nil {
+					return err
+				}
 
-			confirm, err := pterm.DefaultInteractiveConfirm.
-				WithDefaultText("Create this OAuth client now?").
-				WithDefaultValue(true).
-				Show()
-			if err != nil {
-				return fmt.Errorf("could not read confirmation: %w", err)
-			}
-			if !confirm {
-				fmt.Println("Cancelled. Your OAuth client was not created.")
-				return nil
+				public, err = pterm.DefaultInteractiveConfirm.
+					WithDefaultText("Should this be a public client? Public clients do not use a client secret").
+					WithDefaultValue(false).
+					Show()
+				if err != nil {
+					return fmt.Errorf("could not read client type: %w", err)
+				}
+
+				clientURI, err = promptRequiredText("Application URL", validateURI)
+				if err != nil {
+					return err
+				}
+				policyURI, err = promptRequiredText("Privacy policy URL", validateURI)
+				if err != nil {
+					return err
+				}
+				tosURI, err = promptRequiredText("Terms of service URL", validateURI)
+				if err != nil {
+					return err
+				}
+				logoURI, err = promptRequiredText("Logo URL", validateURI)
+				if err != nil {
+					return err
+				}
+
+				confirm, err := pterm.DefaultInteractiveConfirm.
+					WithDefaultText("Create this OAuth client now?").
+					WithDefaultValue(true).
+					Show()
+				if err != nil {
+					return fmt.Errorf("could not read confirmation: %w", err)
+				}
+				if !confirm {
+					fmt.Println("Cancelled. Your OAuth client was not created.")
+					return nil
+				}
+			} else {
+				name = strings.TrimSpace(c.String("name"))
+				if err := validateClientName(name); err != nil {
+					return fmt.Errorf("--name: %w", err)
+				}
+
+				redirectURIs = c.StringSlice("redirect-uri")
+				if len(redirectURIs) == 0 {
+					return fmt.Errorf("at least one --redirect-uri is required")
+				}
+				for _, u := range redirectURIs {
+					if err := validateURI(u); err != nil {
+						return fmt.Errorf("--redirect-uri %q: %w", u, err)
+					}
+				}
+
+				public = c.Bool("public")
+
+				clientURI = c.String("app-url")
+				if err := validateURI(clientURI); err != nil {
+					return fmt.Errorf("--app-url: %w", err)
+				}
+				policyURI = c.String("policy-url")
+				if err := validateURI(policyURI); err != nil {
+					return fmt.Errorf("--policy-url: %w", err)
+				}
+				tosURI = c.String("tos-url")
+				if err := validateURI(tosURI); err != nil {
+					return fmt.Errorf("--tos-url: %w", err)
+				}
+				logoURI = c.String("logo-url")
+				if err := validateURI(logoURI); err != nil {
+					return fmt.Errorf("--logo-url: %w", err)
+				}
 			}
 
 			clientID, err := client.CreateOAuthClient(api.CreateOAuthClientInput{
@@ -94,10 +157,6 @@ func newCreateCommand() *cli.Command {
 			detail, err := client.GetOAuthClient(clientID)
 			if err == nil && detail != nil {
 				printInstructions(c.String("api-url"), detail)
-			} else {
-				fmt.Println()
-				pterm.Println(pterm.Gray("  Hint: To see setup instructions for this client, run:"))
-				pterm.Println(pterm.Gray("    createos oauth clients instructions " + clientID))
 			}
 
 			return nil

cmd/oauth/create.go

@@ -9,6 +9,7 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"github.com/NodeOps-app/createos-cli/internal/api"
+	"github.com/NodeOps-app/createos-cli/internal/terminal"
 )
 
 func getClient(c *cli.Context) (*api.APIClient, error) {
@@ -19,6 +20,50 @@ func getClient(c *cli.Context) (*api.APIClient, error) {
 	return client, nil
 }
 
+// resolveOAuthClientID resolves a client ID from flag, arg, or interactive select.
+func resolveOAuthClientID(c *cli.Context, apiClient *api.APIClient) (string, error) {
+	if id := c.String("client"); id != "" {
+		return id, nil
+	}
+	if c.NArg() > 0 {
+		return c.Args().First(), nil
+	}
+	if !terminal.IsInteractive() {
+		return "", fmt.Errorf("please provide a client ID\n\n  Example:\n    createos oauth-clients %s --client <client-id>", c.Command.Name)
+	}
+	return pickOAuthClient(apiClient)
+}
+
+func pickOAuthClient(apiClient *api.APIClient) (string, error) {
+	clients, err := apiClient.ListOAuthClients()
+	if err != nil {
+		return "", err
+	}
+	if len(clients) == 0 {
+		return "", fmt.Errorf("you don't have any OAuth clients yet — run 'createos oauth-clients create' to create one")
+	}
+	if len(clients) == 1 {
+		return clients[0].ID, nil
+	}
+	options := make([]string, len(clients))
+	for i, cl := range clients {
+		options[i] = cl.Name
+	}
+	selected, err := pterm.DefaultInteractiveSelect.
+		WithOptions(options).
+		WithDefaultText("Select an OAuth client").
+		Show()
+	if err != nil {
+		return "", fmt.Errorf("could not read selection: %w", err)
+	}
+	for i, opt := range options {
+		if opt == selected {
+			return clients[i].ID, nil
+		}
+	}
+	return "", fmt.Errorf("no client selected")
+}
+
 func promptRequiredText(prompt string, validate func(string) error) (string, error) {
 	for {
 		value, err := pterm.DefaultInteractiveTextInput.Show(prompt)
@@ -171,6 +216,4 @@ func printInstructions(apiURL string, client *api.OAuthClientDetail) {
 	fmt.Println("This CLI can fetch your client details, but the CreateOS API does not currently return the auth/token endpoints directly.")
 	fmt.Println("The URLs above match the tested oauth-client-test setup. If your deployment uses a different identity host, replace them there.")
 	fmt.Println()
-	pterm.Println(pterm.Gray("  Hint: To review app consents and revoke them, run:"))
-	pterm.Println(pterm.Gray("    createos users oauth-consents list"))
 }

cmd/oauth/helpers.go

@@ -1,29 +1,31 @@
 package oauth
 
 import (
-	"fmt"
-
 	"github.com/urfave/cli/v2"
 )
 
 func newInstructionsCommand() *cli.Command {
 	return &cli.Command{
 		Name:      "instructions",
 		Usage:     "Show setup instructions for an OAuth client",
-		ArgsUsage: "<client-id>",
+		ArgsUsage: "[client-id]",
 		Description: "Shows the client details you need after registration, including redirect URIs,\n" +
 			"whether the client is public, and the user info endpoint.",
+		Flags: []cli.Flag{
+			&cli.StringFlag{Name: "client", Usage: "OAuth client ID"},
+		},
 		Action: func(c *cli.Context) error {
-			if c.NArg() == 0 {
-				return fmt.Errorf("please provide a client ID\n\n  To see your client IDs, run:\n    createos oauth clients list")
+			apiClient, err := getClient(c)
+			if err != nil {
+				return err
 			}
 
-			client, err := getClient(c)
+			clientID, err := resolveOAuthClientID(c, apiClient)
 			if err != nil {
 				return err
 			}
 
-			detail, err := client.GetOAuthClient(c.Args().First())
+			detail, err := apiClient.GetOAuthClient(clientID)
 			if err != nil {
 				return err
 			}

cmd/oauth/instructions.go

@@ -24,9 +24,6 @@ func newListCommand() *cli.Command {
 
 			if len(clients) == 0 {
 				fmt.Println("You don't have any OAuth clients yet.")
-				fmt.Println()
-				pterm.Println(pterm.Gray("  Hint: To create one, run:"))
-				pterm.Println(pterm.Gray("    createos oauth clients create"))
 				return nil
 			}
 
@@ -45,8 +42,6 @@ func newListCommand() *cli.Command {
 				return err
 			}
 			fmt.Println()
-			pterm.Println(pterm.Gray("  Hint: To see setup instructions for a client, run:"))
-			pterm.Println(pterm.Gray("    createos oauth clients instructions <client-id>"))
 			return nil
 		},
 	}

cmd/oauth/list.go

@@ -2,13 +2,15 @@ package oauth
 
 import "github.com/urfave/cli/v2"
 
-// NewOAuthCommand creates the oauth command with subcommands.
+// NewOAuthCommand creates the oauth-clients command with subcommands.
 func NewOAuthCommand() *cli.Command {
 	return &cli.Command{
-		Name:  "oauth",
+		Name:  "oauth-clients",
 		Usage: "Manage OAuth clients",
 		Subcommands: []*cli.Command{
-			newClientsCommand(),
+			newListCommand(),
+			newCreateCommand(),
+			newInstructionsCommand(),
 		},
 	}
 }

cmd/oauth/oauth.go

@@ -127,7 +127,7 @@ func NewApp() *cli.App {
 				fmt.Println("  environments   Manage project environments")
 				fmt.Println("  init           Link this directory to a CreateOS project")
 				fmt.Println("  logout         Sign out from CreateOS")
-				fmt.Println("  oauth          Manage OAuth clients")
+				fmt.Println("  oauth-clients  Manage OAuth clients")
 				fmt.Println("  open           Open project URL or dashboard in browser")
 				fmt.Println("  projects       Manage projects")
 				fmt.Println("  scale          Adjust replicas and resources")