Merge pull request #14 from dacohen/force-leading-slash

Add leading slash to URL Path in getBaseUrlString function, if one does not already exist

oauth.go

@@ -188,8 +188,8 @@ func getBaseUrlString(u *url.URL) string {
 		host = hostPort[0]
 	}
 	path := u.EscapedPath()
-	if path == "" {
-		path = "/"
+	if path == "" || path[0] != '/' {
+		path = "/" + path
 	}
 	return fmt.Sprintf("%v://%v%v", scheme, host, path)
 }

oauth_test.go

@@ -253,6 +253,15 @@ func TestGetBaseUrlString_ShouldAddTrailingSlash(t *testing.T) {
 	}
 }
 
+func TestGetBaseUrlString_ShouldAddLeadingSlashToPath(t *testing.T) {
+	u, _ := url.Parse("https://api.mastercard.com")
+	u.Path = "test/service"
+	baseUrl := getBaseUrlString(u)
+	if "https://api.mastercard.com/test/service" != baseUrl {
+		t.Errorf("Something went wrong, got %v", baseUrl)
+	}
+}
+
 func TestGetBaseUrlString_ShouldUseLowercaseSchemesAndHosts(t *testing.T) {
 	u, _ := url.Parse("HTTPS://API.MASTERCARD.COM/TEST")
 	baseUrl := getBaseUrlString(u)