From bb66716357b3fd71ca526f57542cf82c29e383ea Mon Sep 17 00:00:00 2001 From: Ryuji Iwata Date: Sat, 9 Mar 2019 12:53:16 +0900 Subject: [PATCH 1/2] Changed processing order and added error check --- api.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/api.go b/api.go index 9ea8c0a..e3308a7 100644 --- a/api.go +++ b/api.go @@ -41,16 +41,19 @@ func generateRequest(method string, path string, paramStruct interface{}) (*http } func generateRequestWithToken(method string, path string, paramStruct interface{}) (*http.Request, error) { - req, err := generateRequest(method, path, paramStruct) token := os.Getenv("PIXELA_USER_TOKEN") if token == "" { return nil, fmt.Errorf("token is not set. please specify your token by PIXELA_USER_TOKEN environment variable") } - req.Header.Set("X-USER-TOKEN", token) + req, err := generateRequest(method, path, paramStruct) - return req, err + if err == nil { + req.Header.Set("X-USER-TOKEN", token) + } + + return rep, err } func doRequest(req *http.Request) error { From 988fd9eff145142a4433ae3845e667477acd85ae Mon Sep 17 00:00:00 2001 From: Ryuji Iwata Date: Sat, 9 Mar 2019 22:03:56 +0900 Subject: [PATCH 2/2] fix type from rep to req --- api.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api.go b/api.go index e3308a7..303aa6f 100644 --- a/api.go +++ b/api.go @@ -53,7 +53,7 @@ func generateRequestWithToken(method string, path string, paramStruct interface{ req.Header.Set("X-USER-TOKEN", token) } - return rep, err + return req, err } func doRequest(req *http.Request) error {