From ae4665412d31db136a3d8060d7fdea1405fd6d57 Mon Sep 17 00:00:00 2001 From: athul Date: Tue, 11 Feb 2020 19:41:57 +0530 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8Added=20Easier=20Content=20Type=20Sett?= =?UTF-8?q?ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cli.go | 4 ++-- methods/delete.go | 2 +- methods/fns.go | 8 ++++++++ methods/patch.go | 2 +- methods/post.go | 4 +++- methods/put.go | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cli.go b/cli.go index f1d658f..de5ad11 100644 --- 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 index aa4eb67..c54ae16 100644 --- 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 index d2f31a5..bcaf27f 100644 --- 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 index 7394fc6..e4f62de 100644 --- 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 index 74d369b..7fbde1e 100644 --- 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 index bf6e934..f11c993 100644 --- 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)