Changeset fbdf62764ba0…
Parent f8151ea4ffc6…
by Benjamin Pollack <benjamin@fogcreek.com>
Changes to one file · Browse files at fbdf62764ba0 Showing diff from parent f8151ea4ffc6 Diff from another changeset...
@@ -34,6 +34,14 @@
type apiParams map[string]string
+func (p *apiParams) Values() url.Values {
+ v := url.Values{}
+ for key, value := range *p {
+ v.Set(key, value)
+ }
+ return v
+}
+
type Credentials map[string]map[string]string
func NewClient(kilnUrl *url.URL) *Client {
@@ -229,29 +237,25 @@
// Returns the body from an API call via HTTP GET
func (k *Client) apiGet(route string, params apiParams) ([]byte, error) {
- return k.apiRequest(route, params, "GET")
+ return k.apiRequest(route, params.Values(), "GET")
}
// Returns the body from an API call via HTTP POST
func (k *Client) apiPost(route string, params apiParams) ([]byte, error) {
- return k.apiRequest(route, params, "POST")
-}
-
-func (k *Client) apiRequest(route string, params apiParams, method string) ([]byte, error) {
- v := url.Values{}
- for key, value := range params {
- v.Set(key, value)
- }
+ return k.apiRequest(route, params.Values(), "POST")
+}
+
+func (k *Client) apiRequest(route string, values url.Values, method string) ([]byte, error) {
if k.credentials.Token != "" {
- v.Set("token", k.credentials.Token)
+ values.Set("token", k.credentials.Token)
}
var resp *http.Response
var err error
if method == "GET" {
- resp, err = http.Get(k.apiRoute(route) + "?" + v.Encode())
+ resp, err = http.Get(k.apiRoute(route) + "?" + values.Encode())
} else if method == "POST" {
- resp, err = http.PostForm(k.apiRoute(route), v)
+ resp, err = http.PostForm(k.apiRoute(route), values)
}
if err != nil {
|
Loading...