From d3f4628c1ba7a5571af00959e20971108b7f8cd5 Mon Sep 17 00:00:00 2001 From: andig Date: Tue, 18 Jun 2024 11:09:45 +0200 Subject: [PATCH 1/2] Chore: improve token generation --- cmd/token.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cmd/token.go b/cmd/token.go index 955616d61a..ef93968018 100644 --- a/cmd/token.go +++ b/cmd/token.go @@ -52,7 +52,8 @@ func runToken(cmd *cobra.Command, args []string) { var token *oauth2.Token var err error - if strings.ToLower(vehicleConf.Type) == "template" { + isTemplate := strings.ToLower(vehicleConf.Type) == "template" + if isTemplate { instance, err := templates.RenderInstance(templates.Vehicle, vehicleConf.Other) if err != nil { log.FATAL.Fatalf("rendering template failed: %v", err) @@ -84,8 +85,16 @@ func runToken(cmd *cobra.Command, args []string) { fmt.Println() fmt.Println("Add the following tokens to the vehicle config:") fmt.Println() - fmt.Println(" type: " + typ) - fmt.Println(" tokens:") - fmt.Println(" access:", token.AccessToken) - fmt.Println(" refresh:", token.RefreshToken) + + if isTemplate { + fmt.Println(" type: template") + fmt.Println(" template: " + typ) + fmt.Println(" accesstoken:", token.AccessToken) + fmt.Println(" refreshtoken:", token.RefreshToken) + } else { + fmt.Println(" type: " + typ) + fmt.Println(" tokens:") + fmt.Println(" access:", token.AccessToken) + fmt.Println(" refresh:", token.RefreshToken) + } } From 6a3f6d903dc65f07771834a78ed7e1e900baae35 Mon Sep 17 00:00:00 2001 From: andig Date: Tue, 18 Jun 2024 11:11:18 +0200 Subject: [PATCH 2/2] wip --- cmd/token.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/token.go b/cmd/token.go index ef93968018..9dd1ec3cf5 100644 --- a/cmd/token.go +++ b/cmd/token.go @@ -88,11 +88,11 @@ func runToken(cmd *cobra.Command, args []string) { if isTemplate { fmt.Println(" type: template") - fmt.Println(" template: " + typ) + fmt.Println(" template:", typ) fmt.Println(" accesstoken:", token.AccessToken) fmt.Println(" refreshtoken:", token.RefreshToken) } else { - fmt.Println(" type: " + typ) + fmt.Println(" type:", typ) fmt.Println(" tokens:") fmt.Println(" access:", token.AccessToken) fmt.Println(" refresh:", token.RefreshToken)