From 20a36a315aebe07289bd3e25aa5556d43df746a6 Mon Sep 17 00:00:00 2001 From: Alex Aperis Date: Thu, 7 Mar 2024 16:29:49 +0100 Subject: [PATCH] remove any trailing slash from baseUrl - also rename url var to something more informative --- login/login.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/login/login.go b/login/login.go index 960733b9..2fbd18ea 100755 --- a/login/login.go +++ b/login/login.go @@ -113,7 +113,7 @@ type AuthInfo struct { // requests the /info endpoint to fetch the parameters needed for login func GetAuthInfo(baseURL string) (*AuthInfo, error) { - url := baseURL + "/info" + url := strings.TrimSuffix(baseURL, "/") + "/info" resp, err := http.Get(url) if err != nil { return nil, err @@ -181,15 +181,15 @@ func NewLogin(args []string) error { // `clientID` set. func NewDeviceLogin(args []string) (DeviceLogin, error) { - var url string + var loginUrl string err := Args.Parse(args[1:]) if err != nil { return DeviceLogin{}, err } if len(Args.Args()) == 1 { - url = Args.Args()[0] + loginUrl = Args.Args()[0] } - info, err := GetAuthInfo(url) + info, err := GetAuthInfo(loginUrl) if err != nil { return DeviceLogin{}, fmt.Errorf("failed parsing arguments: %v", err) }