From 7d7930b3639201715fe63c86d201fae8e46bf3a4 Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Mon, 1 Mar 2021 01:27:39 -0300 Subject: [PATCH] Add the same default grants that Manage uses --- internal/cli/apps.go | 54 +++++++++++++++++++++++++++------------ internal/cli/apps_test.go | 2 +- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/internal/cli/apps.go b/internal/cli/apps.go index 2f5349957..109f99d67 100644 --- a/internal/cli/apps.go +++ b/internal/cli/apps.go @@ -227,15 +227,20 @@ auth0 apps create --name myapp --type [native|spa|regular|m2m] Name: &flags.Name, Description: &flags.Description, AppType: auth0.String(apiTypeFor(flags.Type)), - Callbacks: apiURLsFor(flags.Callbacks), - AllowedOrigins: apiURLsFor(flags.AllowedOrigins), - WebOrigins: apiURLsFor(flags.AllowedWebOrigins), - AllowedLogoutURLs: apiURLsFor(flags.AllowedLogoutURLs), + Callbacks: stringToInterfaceSlice(flags.Callbacks), + AllowedOrigins: stringToInterfaceSlice(flags.AllowedOrigins), + WebOrigins: stringToInterfaceSlice(flags.AllowedWebOrigins), + AllowedLogoutURLs: stringToInterfaceSlice(flags.AllowedLogoutURLs), TokenEndpointAuthMethod: apiAuthMethodFor(flags.AuthMethod), - GrantTypes: apiGrantsFor(flags.Grants), OIDCConformant: &oidcConformant, } + if (len(flags.Grants) == 0) { + a.GrantTypes = apiDefaultGrantsFor(flags.Type) + } else { + a.GrantTypes = apiGrantsFor(flags.Grants) + } + err := ansi.Spinner("Creating application", func() error { return cli.api.Client.Create(a) }) @@ -346,10 +351,10 @@ auth0 apps update --name myapp --type [native|spa|regular|m2m] Name: &inputs.Name, Description: &inputs.Description, AppType: auth0.String(apiTypeFor(inputs.Type)), - Callbacks: apiURLsFor(inputs.Callbacks), - AllowedOrigins: apiURLsFor(inputs.AllowedOrigins), - WebOrigins: apiURLsFor(inputs.AllowedWebOrigins), - AllowedLogoutURLs: apiURLsFor(inputs.AllowedLogoutURLs), + Callbacks: stringToInterfaceSlice(inputs.Callbacks), + AllowedOrigins: stringToInterfaceSlice(inputs.AllowedOrigins), + WebOrigins: stringToInterfaceSlice(inputs.AllowedWebOrigins), + AllowedLogoutURLs: stringToInterfaceSlice(inputs.AllowedLogoutURLs), TokenEndpointAuthMethod: apiAuthMethodFor(inputs.AuthMethod), GrantTypes: apiGrantsFor(inputs.Grants), } @@ -403,14 +408,6 @@ func apiTypeFor(v string) string { } } -func apiURLsFor(s []string) []interface{} { - res := make([]interface{}, len(s)) - for i, v := range s { - res[i] = v - } - return res -} - func apiAuthMethodFor(v string) *string { switch strings.ToLower(v) { case "none": @@ -456,6 +453,21 @@ func apiGrantsFor(s []string) []interface{} { return res } +func apiDefaultGrantsFor(t string) []interface{} { + switch strings.ToLower(t) { + case "native": + return stringToInterfaceSlice([]string{"implicit", "authorization-code", "refresh-token"}) + case "spa", "single page web application": + return stringToInterfaceSlice([]string{"implicit", "authorization-code", "refresh-token"}) + case "regular", "regular web application": + return stringToInterfaceSlice([]string{"implicit", "authorization-code", "refresh-token", "client-credentials"}) + case "m2m", "machine to machine": + return stringToInterfaceSlice([]string{"client-credentials"}) + default: + return nil + } +} + func urlsFor(s []interface{}) []string { res := make([]string, len(s)) for i, v := range s { @@ -463,3 +475,11 @@ func urlsFor(s []interface{}) []string { } return res } + +func stringToInterfaceSlice(s []string) []interface{} { + var result []interface{} = make([]interface{}, len(s)) + for i, d := range s { + result[i] = d + } + return result +} diff --git a/internal/cli/apps_test.go b/internal/cli/apps_test.go index 35d9d3876..e998c6dd7 100644 --- a/internal/cli/apps_test.go +++ b/internal/cli/apps_test.go @@ -25,7 +25,7 @@ func TestClientsListCmd(t *testing.T) { { Name: auth0.String("some-name"), ClientID: auth0.String("some-id"), - Callbacks: apiURLsFor([]string{"http://localhost"}), + Callbacks: stringToInterfaceSlice([]string{"http://localhost"}), }, }, }, nil)