Merge pull request #25 from chenzhihao/fix-endpoint-url

fix the endpoint

Author: chenzhihao

client.go

@@ -9,6 +9,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"time"
 )
 
@@ -124,7 +125,12 @@ func (c *Client) newRequest(method, endpoint string, in interface{}) (*http.Requ
 		bodyreader = newbodyreader
 	}
 
-	req, err := http.NewRequest(method, c.Endpoint+endpoint+"/", bodyreader)
+	finalEndpoint := c.Endpoint+endpoint
+	if !strings.HasSuffix(endpoint, "/")  {
+		finalEndpoint = finalEndpoint + "/"
+	}
+
+	req, err := http.NewRequest(method, finalEndpoint, bodyreader)
 	if err != nil {
 		return nil, err
 	}

client_test.go

@@ -62,3 +62,19 @@ func TestClientKnownGoodEndpoint(t *testing.T) {
 		t.Errorf("Endpoint is not https://sentry.io/api/0 got %s", bclient.Endpoint)
 	}
 }
+
+func TestNewRequestWillNotAddExtraTrailingSlashToEndpoint(t *testing.T) {
+	endpoint := "some-endpoint/"
+	bclient, berr := NewClient("testauthclient", nil, nil)
+	if berr != nil {
+		t.Error(berr)
+	}
+	req, err := bclient.newRequest("get", endpoint, nil)
+	if req == nil || err != nil {
+		t.Errorf("can't generate request: %v", err)
+	}
+
+	if req.URL.String() != "https://sentry.io/api/0/some-endpoint/" {
+		t.Errorf("Endpoint is not https://sentry.io/api/0/some-endpoint/ got %s", req.URL.String())
+	}
+}

project.go

@@ -81,7 +81,7 @@ func (c *Client) GetProjects() ([]Project, *Link, error) {
 // GetOrgProjects fetchs all projects belonging to a organization
 func (c *Client) GetOrgProjects(o Organization) ([]Project, *Link, error) {
 	var proj []Project
-	link, err := c.doWithPagination("GET", fmt.Sprintf("organizations/%s/projects/", *o.Slug), &proj, nil)
+	link, err := c.doWithPagination("GET", fmt.Sprintf("organizations/%s/projects", *o.Slug), &proj, nil)
 	return proj, link, err
 }