From 3fda221153c55f6335d5e781d72b3dd7efe22be0 Mon Sep 17 00:00:00 2001 From: Kevin Lyda <kevin@ie.suberic.net> Date: Mon, 22 Oct 2018 14:28:41 +0100 Subject: [PATCH] Always send auto_token. --- client/client.go | 4 ++-- cmd/cashier/main.go | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/client.go b/client/client.go index 09da7879..0c78d88d 100644 --- a/client/client.go +++ b/client/client.go @@ -207,8 +207,8 @@ func StartHTTPServer() *Listener { go func() { err := listener.srv.Serve(l) - if err == http.ErrServerClosed { - fmt.Printf("Httpserver: Server() error: %s", err) + if err != http.ErrServerClosed { + fmt.Printf("Httpserver: Server() error: %s\n", err) } return }() diff --git a/cmd/cashier/main.go b/cmd/cashier/main.go index bfbb6456..ff751ddb 100644 --- a/cmd/cashier/main.go +++ b/cmd/cashier/main.go @@ -49,14 +49,15 @@ func main() { if err != nil { log.Fatalln("Error generating key pair: ", err) } - authURL := c.CA listener := &client.Listener{} + port := 0 if c.AutoToken { listener = client.StartHTTPServer() if listener != nil { - authURL = fmt.Sprintf("%s?auto_token=%d", c.CA, listener.Port) + port = listener.Port } } + authURL := fmt.Sprintf("%s?auto_token=%d", c.CA, port) fmt.Printf("Your browser has been opened to visit %s\n", authURL) if err := browser.OpenURL(authURL); err != nil { fmt.Println("Error launching web browser. Go to the link in your web browser") -- GitLab