Fix requests for content-download endpoints.

Diwaker Gupta · Diwaker Gupta · commit 13ed6f02d47d · 2016-07-29T10:17:04.000-07:00
diff --git a/dropbox/files/client.go b/dropbox/files/client.go
@@ -779,12 +779,12 @@ func (dbx *apiImpl) Download(arg *DownloadArg) (res *FileMetadata, content io.Re
 		return
 	}
 
-	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "download"), bytes.NewReader(b))
+	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "download"), nil)
 	if err != nil {
 		return
 	}
 
-	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Dropbox-API-Arg", string(b))
 	if dbx.Config.AsMemberID != "" {
 		req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)
 	}
@@ -940,12 +940,12 @@ func (dbx *apiImpl) GetPreview(arg *PreviewArg) (res *FileMetadata, content io.R
 		return
 	}
 
-	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_preview"), bytes.NewReader(b))
+	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_preview"), nil)
 	if err != nil {
 		return
 	}
 
-	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Dropbox-API-Arg", string(b))
 	if dbx.Config.AsMemberID != "" {
 		req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)
 	}
@@ -1090,12 +1090,12 @@ func (dbx *apiImpl) GetThumbnail(arg *ThumbnailArg) (res *FileMetadata, content
 		return
 	}
 
-	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_thumbnail"), bytes.NewReader(b))
+	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_thumbnail"), nil)
 	if err != nil {
 		return
 	}
 
-	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Dropbox-API-Arg", string(b))
 	if dbx.Config.AsMemberID != "" {
 		req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)
 	}
diff --git a/dropbox/sharing/client.go b/dropbox/sharing/client.go
@@ -1088,12 +1088,12 @@ func (dbx *apiImpl) GetSharedLinkFile(arg *GetSharedLinkMetadataArg) (res IsShar
 		return
 	}
 
-	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "sharing", "get_shared_link_file"), bytes.NewReader(b))
+	req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "sharing", "get_shared_link_file"), nil)
 	if err != nil {
 		return
 	}
 
-	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Dropbox-API-Arg", string(b))
 	if dbx.Config.AsMemberID != "" {
 		req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)
 	}
diff --git a/generator/go_client.stoneg.py b/generator/go_client.stoneg.py
@@ -103,7 +103,8 @@ def _generate_request(self, namespace, route):
             with self.block('if err != nil'):
                 out('return')
             out()
-            if style is not 'upload':
+            if host != 'content':
+                print(host, namespace.name, route.name)
                 body = 'bytes.NewReader(b)'
         if style == 'upload':
             body = 'content'
@@ -114,7 +115,7 @@ def _generate_request(self, namespace, route):
             out('return')
         out()
         if not is_void_type(route.arg_data_type):
-            if style == 'upload':
+            if host == 'content':
                 out('req.Header.Set("Dropbox-API-Arg", string(b))')
             else:
                 out('req.Header.Set("Content-Type", "application/json")')

Original file line number	Diff line number	Diff line change
`@@ -779,12 +779,12 @@ func (dbx apiImpl) Download(arg DownloadArg) (res *FileMetadata, content io.Re`
`779`	`779`	`return`
`780`	`780`	`}`
`781`	`781`
`782`		`- req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "download"), bytes.NewReader(b))`
	`782`	`+ req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "download"), nil)`
`783`	`783`	`if err != nil {`
`784`	`784`	`return`
`785`	`785`	`}`
`786`	`786`
`787`		`- req.Header.Set("Content-Type", "application/json")`
	`787`	`+ req.Header.Set("Dropbox-API-Arg", string(b))`
`788`	`788`	`if dbx.Config.AsMemberID != "" {`
`789`	`789`	`req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)`
`790`	`790`	`}`
`@@ -940,12 +940,12 @@ func (dbx apiImpl) GetPreview(arg PreviewArg) (res *FileMetadata, content io.R`
`940`	`940`	`return`
`941`	`941`	`}`
`942`	`942`
`943`		`- req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_preview"), bytes.NewReader(b))`
	`943`	`+ req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_preview"), nil)`
`944`	`944`	`if err != nil {`
`945`	`945`	`return`
`946`	`946`	`}`
`947`	`947`
`948`		`- req.Header.Set("Content-Type", "application/json")`
	`948`	`+ req.Header.Set("Dropbox-API-Arg", string(b))`
`949`	`949`	`if dbx.Config.AsMemberID != "" {`
`950`	`950`	`req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)`
`951`	`951`	`}`
`@@ -1090,12 +1090,12 @@ func (dbx apiImpl) GetThumbnail(arg ThumbnailArg) (res *FileMetadata, content`
`1090`	`1090`	`return`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`		`- req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_thumbnail"), bytes.NewReader(b))`
	`1093`	`+ req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "files", "get_thumbnail"), nil)`
`1094`	`1094`	`if err != nil {`
`1095`	`1095`	`return`
`1096`	`1096`	`}`
`1097`	`1097`
`1098`		`- req.Header.Set("Content-Type", "application/json")`
	`1098`	`+ req.Header.Set("Dropbox-API-Arg", string(b))`
`1099`	`1099`	`if dbx.Config.AsMemberID != "" {`
`1100`	`1100`	`req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)`
`1101`	`1101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1088,12 +1088,12 @@ func (dbx apiImpl) GetSharedLinkFile(arg GetSharedLinkMetadataArg) (res IsShar`
`1088`	`1088`	`return`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`		`- req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "sharing", "get_shared_link_file"), bytes.NewReader(b))`
	`1091`	`+ req, err := http.NewRequest("POST", (*dropbox.Context)(dbx).GenerateURL("content", "sharing", "get_shared_link_file"), nil)`
`1092`	`1092`	`if err != nil {`
`1093`	`1093`	`return`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`		`- req.Header.Set("Content-Type", "application/json")`
	`1096`	`+ req.Header.Set("Dropbox-API-Arg", string(b))`
`1097`	`1097`	`if dbx.Config.AsMemberID != "" {`
`1098`	`1098`	`req.Header.Set("Dropbox-API-Select-User", dbx.Config.AsMemberID)`
`1099`	`1099`	`}`