Fix the URL errors during jcli center login callback

Author: LinuxSuRen

app/cmd/center_login.go

@@ -10,6 +10,7 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
+	"net/url"
 	"sync"
 
 	"github.com/jenkins-zh/jenkins-cli/app/i18n"
@@ -80,10 +81,13 @@ var centerLoginCmd = &cobra.Command{
 			logger.Warn("cannot find the external ip, use local instead of.")
 		}
 		port := listener.Addr().(*net.TCPAddr).Port
-		callback := fmt.Sprintf(jenkins.URL+"/instance/generateToken?callback=http://%s:%d", ipAddr, port)
 
-		_ = util.Open(callback, "", nil)
-		httpServerDone.Wait()
+		var callback string
+		if callback, err = util.URLJoinAsString(jenkins.URL,
+			fmt.Sprintf("/instance/generateToken?callback=%s%s:%d", url.QueryEscape("http://"), ipAddr, port)); err == nil {
+			_ = util.Open(callback, "", nil)
+			httpServerDone.Wait()
+		}
 		return
 	},
 }

client/common.go

@@ -11,8 +11,6 @@ import (
 	"log"
 	"moul.io/http2curl"
 	"net/http"
-	"net/url"
-	"path"
 	"time"
 
 	"github.com/jenkins-zh/jenkins-cli/app"
@@ -246,18 +244,11 @@ func (j *JenkinsCore) Request(method, api string, headers map[string]string, pay
 		requestURL string
 	)
 
-	var jenkinsHost *url.URL
-	if jenkinsHost, err = url.Parse(j.URL); err == nil {
-		pathURL, _ := url.Parse(path.Join(jenkinsHost.Path, api))
-		jenkinsHost = jenkinsHost.ResolveReference(pathURL)
-	}
-
-	if err != nil {
+	if requestURL, err = util.URLJoinAsString(j.URL, api); err != nil {
 		err = fmt.Errorf("cannot parse the URL of Jenkins, error is %v", err)
 		return
 	}
 
-	requestURL = jenkinsHost.String()
 	logger.Debug("send HTTP request", zap.String("URL", requestURL), zap.String("method", method))
 	if req, err = http.NewRequest(method, requestURL, payload); err != nil {
 		return

util/url.go

@@ -0,0 +1,24 @@
+package util
+
+import (
+	"net/url"
+	"path"
+)
+
+// URLJoin is a util function to join host URL and API URL
+func URLJoin(host, api string) (targetURL *url.URL, err error) {
+	if targetURL, err = url.Parse(host); err == nil {
+		pathURL, _ := url.Parse(path.Join(targetURL.Path, api))
+		targetURL = targetURL.ResolveReference(pathURL)
+	}
+	return
+}
+
+//URLJoinAsString  is a util function to join host URL and API URL
+func URLJoinAsString(host, api string) (targetURLStr string, err error) {
+	var targetURL *url.URL
+	if targetURL, err = URLJoin(host, api); err == nil {
+		targetURLStr = targetURL.String()
+	}
+	return
+}