Add ContentType to Upload

99designs · Feb 28, 2020 · ca8e60d · ca8e60d
1 parent b788cce
commit ca8e60d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/graphql/handler/transport/http_form.go b/graphql/handler/transport/http_form.go
@@ -107,9 +107,10 @@ func (f MultipartForm) Do(w http.ResponseWriter, r *http.Request, exec graphql.G
 
 		if len(paths) == 1 {
 			upload = graphql.Upload{
-				File:     file,
-				Size:     header.Size,
-				Filename: header.Filename,
+				File:        file,
+				Size:        header.Size,
+				Filename:    header.Filename,
+				ContentType: header.Header.Get("Content-Type"),
 			}
 
 			if err := params.AddUpload(upload, key, paths[0]); err != nil {
@@ -127,9 +128,10 @@ func (f MultipartForm) Do(w http.ResponseWriter, r *http.Request, exec graphql.G
 				}
 				for _, path := range paths {
 					upload = graphql.Upload{
-						File:     &bytesReader{s: &fileBytes, i: 0, prevRune: -1},
-						Size:     header.Size,
-						Filename: header.Filename,
+						File:        &bytesReader{s: &fileBytes, i: 0, prevRune: -1},
+						Size:        header.Size,
+						Filename:    header.Filename,
+						ContentType: header.Header.Get("Content-Type"),
 					}
 
 					if err := params.AddUpload(upload, key, path); err != nil {
@@ -173,9 +175,10 @@ func (f MultipartForm) Do(w http.ResponseWriter, r *http.Request, exec graphql.G
 					}
 					defer pathTmpFile.Close()
 					upload = graphql.Upload{
-						File:     pathTmpFile,
-						Size:     header.Size,
-						Filename: header.Filename,
+						File:        pathTmpFile,
+						Size:        header.Size,
+						Filename:    header.Filename,
+						ContentType: header.Header.Get("Content-Type"),
 					}
 
 					if err := params.AddUpload(upload, key, path); err != nil {

diff --git a/graphql/upload.go b/graphql/upload.go
@@ -6,9 +6,10 @@ import (
 )
 
 type Upload struct {
-	File     io.Reader
-	Filename string
-	Size     int64
+	File        io.Reader
+	Filename    string
+	Size        int64
+	ContentType string
 }
 
 func MarshalUpload(f Upload) Marshaler {