✨Added Easier Content Type Setting

hoppscotch · Feb 11, 2020 · ae46654 · ae46654
1 parent fe137f9
commit ae46654
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/cli.go b/cli.go
@@ -45,8 +45,8 @@ func main() {
 			Usage: "Add the Password",
 		},
 		cli.StringFlag{
-			Name:  "ctype, c",
-			Value: "application/json",
+			Name: "ctype, c",
+			//Value: "application/json",
 			Usage: "Change the Content Type",
 		},
 		cli.StringFlag{

diff --git a/methods/delete.go b/methods/delete.go
@@ -18,7 +18,7 @@ func Deletebasic(c *cli.Context) error {
 	var jsonStr = []byte(c.String("body"))
 	req, err := http.NewRequest("DELETE", url, bytes.NewBuffer(jsonStr))
 	//req.Header.Set("X-Custom-Header", "myvalue")
-	req.Header.Set("Content-Type", c.String("ctype"))
+	req.Header.Set("Content-Type", Contenttypes[c.String("ctype")])
 	if c.String("token") != "" {
 		var bearer = "Bearer " + c.String("token")
 		req.Header.Add("Authorization", bearer)

diff --git a/methods/fns.go b/methods/fns.go
@@ -39,3 +39,11 @@ func basicAuth(username, password string) string {
 	auth := username + ":" + password
 	return base64.StdEncoding.EncodeToString([]byte(auth))
 }
+
+//Contenttypes can be used in Place for ctypes
+var Contenttypes = map[string]string{
+	"html":  "text/html",
+	"js":    "application/json",
+	"xml":   "application/xml",
+	"plain": "text/plain",
+}
diff --git a/methods/patch.go b/methods/patch.go
@@ -19,7 +19,7 @@ func Patchbasic(c *cli.Context) {
 	var jsonStr = []byte(c.String("body"))
 	req, err := http.NewRequest("PATCH", url, bytes.NewBuffer(jsonStr))
 	//req.Header.Set("X-Custom-Header", "myvalue")
-	req.Header.Set("Content-Type", c.String("ctype"))
+	req.Header.Set("Content-Type", Contenttypes[c.String("ctype")])
 	if c.String("token") != "" {
 		var bearer = "Bearer " + c.String("token")
 		req.Header.Add("Authorization", bearer)

diff --git a/methods/post.go b/methods/post.go
@@ -19,7 +19,8 @@ func Postbasic(c *cli.Context) {
 	var jsonStr = []byte(c.String("body"))
 	req, err := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
 	//req.Header.Set("X-Custom-Header", "myvalue")
-	req.Header.Set("Content-Type", c.String("ctype"))
+	req.Header.Set("Content-Type", Contenttypes[c.String("ctype")])
+	fmt.Print(Contenttypes[c.String("ctype")] + "\n")
 	if c.String("token") != "" {
 		var bearer = "Bearer " + c.String("token")
 		req.Header.Add("Authorization", bearer)
@@ -29,6 +30,7 @@ func Postbasic(c *cli.Context) {
 		pw := c.String("p")
 		req.Header.Add("Authorization", "Basic "+basicAuth(un, pw))
 	}
+	fmt.Print(req.Header)
 	client := &http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {

diff --git a/methods/put.go b/methods/put.go
@@ -18,7 +18,7 @@ func Putbasic(c *cli.Context) error {
 	var jsonStr = []byte(c.String("body"))
 	req, err := http.NewRequest("PUT", url, bytes.NewBuffer(jsonStr))
 	//req.Header.Set("X-Custom-Header", "myvalue")
-	req.Header.Set("Content-Type", c.String("ctype"))
+	req.Header.Set("Content-Type", Contenttypes[c.String("ctype")])
 	if c.String("token") != "" {
 		var bearer = "Bearer " + c.String("token")
 		req.Header.Add("Authorization", bearer)