wip

auth0 · Apr 15, 2023 · de49adc · de49adc
1 parent 1078c79
commit de49adc
Show file tree

Hide file tree

Showing 19 changed files with 415 additions and 419 deletions.
diff --git a/go.mod b/go.mod
@@ -76,6 +76,7 @@ require (
 	github.com/yuin/goldmark v1.5.2 // indirect
 	github.com/yuin/goldmark-emoji v1.0.1 // indirect
 	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
 	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/net v0.9.0 // indirect
 	golang.org/x/tools v0.6.0 // indirect

diff --git a/go.sum b/go.sum
@@ -190,6 +190,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=

diff --git a/internal/cli/actions.go b/internal/cli/actions.go
@@ -468,7 +468,7 @@ func openActionCmd(cli *cli) *cobra.Command {
 				inputs.ID = args[0]
 			}
 
-			openManageURL(cli, cli.config.DefaultTenant, formatActionDetailsPath(url.PathEscape(inputs.ID)))
+			openManageURL(cli, cli.Config.DefaultTenant, formatActionDetailsPath(url.PathEscape(inputs.ID)))
 			return nil
 		},
 	}

diff --git a/internal/cli/apis.go b/internal/cli/apis.go
@@ -480,7 +480,7 @@ func openAPICmd(cli *cli) *cobra.Command {
 				}
 			}
 
-			openManageURL(cli, cli.config.DefaultTenant, formatAPISettingsPath(inputs.ID))
+			openManageURL(cli, cli.Config.DefaultTenant, formatAPISettingsPath(inputs.ID))
 			return nil
 		},
 	}

diff --git a/internal/cli/apps.go b/internal/cli/apps.go
@@ -179,7 +179,7 @@ func useAppCmd(cli *cli) *cobra.Command {
 				}
 			}
 
-			if err := cli.setDefaultAppID(inputs.ID); err != nil {
+			if err := cli.Config.SaveNewDefaultAppIDForTenant(cli.tenant, inputs.ID); err != nil {
 				return err
 			}
 
@@ -479,7 +479,7 @@ func createAppCmd(cli *cli) *cobra.Command {
 				return fmt.Errorf("Unable to create application: %v", err)
 			}
 
-			if err := cli.setDefaultAppID(a.GetClientID()); err != nil {
+			if err := cli.Config.SaveNewDefaultAppIDForTenant(cli.tenant, a.GetClientID()); err != nil {
 				return err
 			}
 
@@ -737,7 +737,7 @@ func openAppCmd(cli *cli) *cobra.Command {
 				inputs.ID = args[0]
 			}
 
-			openManageURL(cli, cli.config.DefaultTenant, formatAppSettingsPath(inputs.ID))
+			openManageURL(cli, cli.Config.DefaultTenant, formatAppSettingsPath(inputs.ID))
 			return nil
 		},
 	}
@@ -879,7 +879,7 @@ func (c *cli) appPickerOptions(requestOpts ...management.RequestOption) pickerOp
 			return nil, err
 		}
 
-		tenant, err := c.getTenant()
+		tenant, err := c.Config.GetTenant(c.tenant)
 		if err != nil {
 			return nil, err
 		}