Fix FilesService.Upload

client.go

@@ -18,11 +18,11 @@ const (
 )
 
 const (
-	defaultUserAgent = "go-putio"
-	defaultMediaType = "application/json"
-	defaultBaseURL   = "https://api.put.io"
-	defaultUploadURL = "https://upload.put.io"
-	defaultTusURL    = "https://upload.put.io/files/"
+	defaultUserAgent  = "go-putio"
+	defaultMediaType  = "application/json"
+	defaultBaseURL    = "https://api.put.io"
+	defaultUploadHost = "upload.put.io"
+	defaultTusURL     = "https://upload.put.io/files/"
 )
 
 // Client manages communication with Put.io v2 API.
@@ -109,17 +109,16 @@ func (c *Client) NewRequest(ctx context.Context, method, relURL string, body io.
 		return nil, fmt.Errorf("%w", err)
 	}
 
+	u := c.BaseURL.ResolveReference(rel)
+
 	// Workaround for upload endpoints. Upload server is different than API server.
-	var u *url.URL
 	switch {
-	case relURL == "$upload$":
-		u, _ = url.Parse(defaultUploadURL)
+	case relURL == "/v2/files/upload":
+		u.Host = defaultUploadHost
 	case relURL == "$upload-tus$":
 		u, _ = url.Parse(defaultTusURL)
 	case strings.HasPrefix(relURL, "http://") || strings.HasPrefix(relURL, "https://"):
 		u = rel
-	default:
-		u = c.BaseURL.ResolveReference(rel)
 	}
 
 	req, err := http.NewRequestWithContext(ctx, method, u.String(), body)

client_test.go

@@ -64,3 +64,33 @@ func TestNewRequest_customUserAgent(t *testing.T) {
 		t.Errorf("got: %v, want: %v", got, userAgent)
 	}
 }
+
+func TestNewRequest_resolveAbsoluteUrl(t *testing.T) {
+	cl := NewClient(nil)
+	fullUrl := "https://api.put.io/v2/files/list/continue"
+
+	req, _ := cl.NewRequest(context.Background(), http.MethodGet, "/v2/files/list/continue", nil)
+	if got := req.URL.String(); got != fullUrl {
+		t.Errorf("got: %v, want: %v", got, fullUrl)
+	}
+}
+
+func TestNewRequest_overrideBaseUrl(t *testing.T) {
+	cl := NewClient(nil)
+	fullUrl := "https://upload.put.io/v2/files/upload"
+
+	req, _ := cl.NewRequest(context.Background(), http.MethodGet, "/v2/files/upload", nil)
+	if got := req.URL.String(); got != fullUrl {
+		t.Errorf("got: %v, want: %v", got, fullUrl)
+	}
+}
+
+func TestNewRequest_overrideWithAbsoluteUrl(t *testing.T) {
+	cl := NewClient(nil)
+	fullUrl := "https://my-custom-url.com/endpoint?query=param"
+
+	req, _ := cl.NewRequest(context.Background(), http.MethodGet, "https://my-custom-url.com/endpoint?query=param", nil)
+	if got := req.URL.String(); got != fullUrl {
+		t.Errorf("got: %v, want: %v", got, fullUrl)
+	}
+}

files.go

@@ -243,7 +243,7 @@ func (f *FilesService) Upload(ctx context.Context, r io.Reader, filename string,
 		return Upload{}, fmt.Errorf("%w", err)
 	}
 
-	req, err := f.client.NewRequest(ctx, http.MethodPost, "$upload$", &buf)
+	req, err := f.client.NewRequest(ctx, http.MethodPost, "/v2/files/upload", &buf)
 	if err != nil {
 		return Upload{}, fmt.Errorf("%w", err)
 	}