From 536c3803db48f2bfba8ca14b918d817c7ac5bdf5 Mon Sep 17 00:00:00 2001
From: Rita Zerrizuela <zeta@widcket.com>
Date: Fri, 2 Apr 2021 15:29:26 -0300
Subject: [PATCH] Add default Token Endpoint Auth Method on `apps create`
 [CLI-115] (#217)

* Add default Token Endpoint Auth method

* Update internal/cli/apps.go

Co-authored-by: Cyril David <cyx@users.noreply.github.com>

Co-authored-by: Cyril David <cyx@users.noreply.github.com>
---
 internal/cli/apps.go | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/internal/cli/apps.go b/internal/cli/apps.go
index e147bc166..67291ad94 100644
--- a/internal/cli/apps.go
+++ b/internal/cli/apps.go
@@ -381,16 +381,22 @@ auth0 apps create -n myapp -t [native|spa|regular|m2m] -- description <descripti
 
 			// Load values into a fresh app instance
 			a := &management.Client{
-				Name:                    &inputs.Name,
-				Description:             &inputs.Description,
-				AppType:                 auth0.String(apiTypeFor(inputs.Type)),
-				Callbacks:               stringToInterfaceSlice(inputs.Callbacks),
-				AllowedOrigins:          stringToInterfaceSlice(inputs.AllowedOrigins),
-				WebOrigins:              stringToInterfaceSlice(inputs.AllowedWebOrigins),
-				AllowedLogoutURLs:       stringToInterfaceSlice(inputs.AllowedLogoutURLs),
-				TokenEndpointAuthMethod: apiAuthMethodFor(inputs.AuthMethod),
-				OIDCConformant:          &oidcConformant,
-				JWTConfiguration:        &management.ClientJWTConfiguration{Algorithm: &algorithm},
+				Name:              &inputs.Name,
+				Description:       &inputs.Description,
+				AppType:           auth0.String(apiTypeFor(inputs.Type)),
+				Callbacks:         stringToInterfaceSlice(inputs.Callbacks),
+				AllowedOrigins:    stringToInterfaceSlice(inputs.AllowedOrigins),
+				WebOrigins:        stringToInterfaceSlice(inputs.AllowedWebOrigins),
+				AllowedLogoutURLs: stringToInterfaceSlice(inputs.AllowedLogoutURLs),
+				OIDCConformant:    &oidcConformant,
+				JWTConfiguration:  &management.ClientJWTConfiguration{Algorithm: &algorithm},
+			}
+
+			// Set token endpoint auth method
+			if len(inputs.AuthMethod) == 0 {
+				a.TokenEndpointAuthMethod = apiDefaultAuthMethodFor(inputs.Type)
+			} else {
+				a.TokenEndpointAuthMethod = apiAuthMethodFor(inputs.AuthMethod)
 			}
 
 			// Set grants
@@ -666,6 +672,15 @@ func apiAuthMethodFor(v string) *string {
 	}
 }
 
+func apiDefaultAuthMethodFor(t string) *string {
+	switch apiTypeFor(strings.ToLower(t)) {
+	case appTypeNative, appTypeSPA:
+		return auth0.String("none")
+	default:
+		return nil
+	}
+}
+
 func apiGrantsFor(s []string) []interface{} {
 	res := make([]interface{}, len(s))