make helper functions into client methods

charleswli · charleswli · commit f479b6a85715 · 2015-03-17T02:47:14.000Z
diff --git a/main.go b/main.go
@@ -82,11 +82,7 @@ func main() {
 	}
 
 	// POST /connect
-	postRes, mfaRes, err =
-		// client.ConnectAddUser("plaid_test", "plaid_good", "", "citi", nil)
-		// client.ConnectUpdate("plaid_selections", "plaid_good", "", "test")
-		client.AuthUpdate("plaid_test", "plaid_good", "", "test_chase")
-		// client.ConnectUpdateStep("plaid_test", "plaid_good", "", "tomato", "test")
+	postRes, mfaRes, err = client.ConnectAddUser("plaid_test", "plaid_good", "", "citi", nil)
 	if err != nil {
 		fmt.Println(err)
 	} else if mfaRes != nil {
@@ -120,13 +116,13 @@ func main() {
 	} else {
 		fmt.Println(postRes.Accounts)
 		fmt.Println("Connect GET")
-		connectRes, _, _ := client.ConnectGet("test", &plaid.ConnectGetOptions{true, "", "", ""})
+		connectRes, _, _ := client.ConnectGet("test_citi", &plaid.ConnectGetOptions{true, "", "", ""})
 		fmt.Println(len(connectRes.Transactions))
 		fmt.Println(connectRes.Transactions)
 		// fmt.Println(client.ConnectGet("test", nil))
 
 		fmt.Println("Connect DELETE")
-		fmt.Println(client.ConnectDelete("test"))
+		fmt.Println(client.ConnectDelete("test_citi"))
 	}
 
 	// POST /balance
diff --git a/plaid/auth.go b/plaid/auth.go
@@ -22,8 +22,7 @@ func (c client) AuthAddUser(username, password, pin, institutionType string,
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/auth",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/auth", bytes.NewReader(jsonText))
 }
 
 // POST /auth/step
@@ -41,8 +40,7 @@ func (c client) AuthStepSendMethod(accessToken, key, value string) (postRes *pos
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/auth/step",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/auth/step", bytes.NewReader(jsonText))
 }
 
 // POST /auth/step
@@ -59,8 +57,7 @@ func (c client) AuthStep(accessToken, answer string) (postRes *postResponse,
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/auth/step",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/auth/step", bytes.NewReader(jsonText))
 }
 
 // POST /auth/get
@@ -75,8 +72,7 @@ func (c client) AuthGet(accessToken string) (postRes *postResponse, err error) {
 		return nil, err
 	}
 	// /auth/get will never return an MFA response
-	postRes, _, err = postAndUnmarshal(c.environment, "/auth/get",
-		bytes.NewReader(jsonText))
+	postRes, _, err = c.postAndUnmarshal("/auth/get", bytes.NewReader(jsonText))
 	return postRes, err
 }
 
@@ -96,8 +92,7 @@ func (c client) AuthUpdate(username, password, pin, accessToken string) (postRes
 	if err != nil {
 		return nil, nil, err
 	}
-	return patchAndUnmarshal(c.environment, "/auth",
-		bytes.NewReader(jsonText))
+	return c.patchAndUnmarshal("/auth", bytes.NewReader(jsonText))
 }
 
 // PATCH /auth/step
@@ -117,8 +112,7 @@ func (c client) AuthUpdateStep(username, password, pin, mfa, accessToken string)
 	if err != nil {
 		return nil, nil, err
 	}
-	return patchAndUnmarshal(c.environment, "/auth/step",
-		bytes.NewReader(jsonText))
+	return c.patchAndUnmarshal("/auth/step", bytes.NewReader(jsonText))
 }
 
 // DELETE /auth
@@ -132,8 +126,7 @@ func (c client) AuthDelete(accessToken string) (deleteRes *deleteResponse, err e
 	if err != nil {
 		return nil, err
 	}
-	return deleteAndUnmarshal(c.environment, "/auth",
-		bytes.NewReader(jsonText))
+	return c.deleteAndUnmarshal("/auth", bytes.NewReader(jsonText))
 }
 
 type AuthOptions struct {
diff --git a/plaid/balance.go b/plaid/balance.go
@@ -16,8 +16,7 @@ func (c client) Balance(accessToken string) (postRes *postResponse, err error) {
 	if err != nil {
 		return nil, err
 	}
-	postRes, _, err = postAndUnmarshal(c.environment, "/balance",
-		bytes.NewReader(jsonText))
+	postRes, _, err = c.postAndUnmarshal("/balance", bytes.NewReader(jsonText))
 	return postRes, err
 }
 
diff --git a/plaid/connect.go b/plaid/connect.go
@@ -22,8 +22,7 @@ func (c client) ConnectAddUser(username, password, pin, institutionType string,
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/connect",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/connect", bytes.NewReader(jsonText))
 }
 
 // POST /connect/step
@@ -41,8 +40,7 @@ func (c client) ConnectStepSendMethod(accessToken, key, value string) (postRes *
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/connect/step",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/connect/step", bytes.NewReader(jsonText))
 }
 
 // POST /connect/step
@@ -59,8 +57,7 @@ func (c client) ConnectStep(accessToken, answer string) (postRes *postResponse,
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/connect/step",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/connect", bytes.NewReader(jsonText))
 }
 
 // POST /connect/get
@@ -77,8 +74,7 @@ func (c client) ConnectGet(accessToken string, options *ConnectGetOptions) (post
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/connect/get",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/connect/get", bytes.NewReader(jsonText))
 }
 
 // PATCH /connect
@@ -97,8 +93,7 @@ func (c client) ConnectUpdate(username, password, pin, accessToken string) (post
 	if err != nil {
 		return nil, nil, err
 	}
-	return patchAndUnmarshal(c.environment, "/connect",
-		bytes.NewReader(jsonText))
+	return c.patchAndUnmarshal("/connect", bytes.NewReader(jsonText))
 }
 
 // PATCH /connect/step
@@ -118,8 +113,7 @@ func (c client) ConnectUpdateStep(username, password, pin, mfa, accessToken stri
 	if err != nil {
 		return nil, nil, err
 	}
-	return patchAndUnmarshal(c.environment, "/connect/step",
-		bytes.NewReader(jsonText))
+	return c.patchAndUnmarshal("/connect/step", bytes.NewReader(jsonText))
 }
 
 // DELETE /connect
@@ -133,8 +127,7 @@ func (c client) ConnectDelete(accessToken string) (deleteRes *deleteResponse, er
 	if err != nil {
 		return nil, err
 	}
-	return deleteAndUnmarshal(c.environment, "/connect",
-		bytes.NewReader(jsonText))
+	return c.deleteAndUnmarshal("/connect", bytes.NewReader(jsonText))
 }
 
 type ConnectOptions struct {
diff --git a/plaid/plaid.go b/plaid/plaid.go
@@ -9,15 +9,18 @@ import (
 )
 
 func NewClient(clientID, secret string, environment environmentURL) client {
-	return client{clientID, secret, environment}
+	return client{clientID, secret, environment, &http.Client{}}
 }
 
 type client struct {
 	clientID    string
 	secret      string
 	environment environmentURL
+	httpClient  *http.Client
 }
 
+var userAgent = "plaid-go"
+
 type environmentURL string
 
 var Tartan environmentURL = "https://tartan.plaid.com"
@@ -133,6 +136,7 @@ type deleteResponse struct {
 	Message string `json:"message"`
 }
 
+// getAndUnmarshal is not a method because no client authentication is required
 func getAndUnmarshal(environment environmentURL, endpoint string, structure interface{}) error {
 	res, err := http.Get(string(environment) + endpoint)
 	if err != nil {
@@ -160,10 +164,16 @@ func getAndUnmarshal(environment environmentURL, endpoint string, structure inte
 	return plaidErr
 }
 
-func postAndUnmarshal(environment environmentURL, endpoint string,
+func (c client) postAndUnmarshal(endpoint string,
 	body io.Reader) (*postResponse, *mfaResponse, error) {
 	// Read response body
-	res, err := http.Post(string(environment)+endpoint, "application/json", body)
+	req, err := http.NewRequest("POST", string(c.environment)+endpoint, body)
+	if err != nil {
+		return nil, nil, err
+	}
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("User-Agent", "plaid-go")
+	res, err := c.httpClient.Do(req)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -176,16 +186,16 @@ func postAndUnmarshal(environment environmentURL, endpoint string,
 	return unmarshalPostMFA(res, raw)
 }
 
-func patchAndUnmarshal(environment environmentURL, endpoint string,
+func (c client) patchAndUnmarshal(endpoint string,
 	body io.Reader) (*postResponse, *mfaResponse, error) {
 
-	httpClient := &http.Client{}
-	req, err := http.NewRequest("PATCH", string(environment)+endpoint, body)
+	req, err := http.NewRequest("PATCH", string(c.environment)+endpoint, body)
 	if err != nil {
 		return nil, nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
-	res, err := httpClient.Do(req)
+	req.Header.Add("User-Agent", "plaid-go")
+	res, err := c.httpClient.Do(req)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -198,16 +208,16 @@ func patchAndUnmarshal(environment environmentURL, endpoint string,
 	return unmarshalPostMFA(res, raw)
 }
 
-func deleteAndUnmarshal(environment environmentURL, endpoint string,
+func (c client) deleteAndUnmarshal(endpoint string,
 	body io.Reader) (*deleteResponse, error) {
 
-	httpClient := &http.Client{}
-	req, err := http.NewRequest("DELETE", string(environment)+endpoint, body)
+	req, err := http.NewRequest("DELETE", string(c.environment)+endpoint, body)
 	if err != nil {
 		return nil, err
 	}
 	req.Header.Add("Content-Type", "application/json")
-	res, err := httpClient.Do(req)
+	req.Header.Add("User-Agent", "plaid-go")
+	res, err := c.httpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
diff --git a/plaid/upgrade.go b/plaid/upgrade.go
@@ -20,8 +20,7 @@ func (c client) Upgrade(accessToken, upgradeTo string,
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/upgrade",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/upgrade", bytes.NewReader(jsonText))
 }
 
 // POST /upgrade/step
@@ -39,8 +38,7 @@ func (c client) UpgradeStepSendMethod(accessToken, key, value string) (postRes *
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/upgrade/step",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/upgrade/step", bytes.NewReader(jsonText))
 }
 
 // POST /upgrade/step
@@ -57,8 +55,7 @@ func (c client) UpgradeStep(accessToken, answer string) (postRes *postResponse,
 	if err != nil {
 		return nil, nil, err
 	}
-	return postAndUnmarshal(c.environment, "/upgrade/step",
-		bytes.NewReader(jsonText))
+	return c.postAndUnmarshal("/upgrade/step", bytes.NewReader(jsonText))
 }
 
 type UpgradeOptions struct {

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ func (c client) AuthAddUser(username, password, pin, institutionType string,`
`22`	`22`	`if err != nil {`
`23`	`23`	`return nil, nil, err`
`24`	`24`	`}`
`25`		`- return postAndUnmarshal(c.environment, "/auth",`
`26`		`- bytes.NewReader(jsonText))`
	`25`	`+ return c.postAndUnmarshal("/auth", bytes.NewReader(jsonText))`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`// POST /auth/step`
`@@ -41,8 +40,7 @@ func (c client) AuthStepSendMethod(accessToken, key, value string) (postRes *pos`
`41`	`40`	`if err != nil {`
`42`	`41`	`return nil, nil, err`
`43`	`42`	`}`
`44`		`- return postAndUnmarshal(c.environment, "/auth/step",`
`45`		`- bytes.NewReader(jsonText))`
	`43`	`+ return c.postAndUnmarshal("/auth/step", bytes.NewReader(jsonText))`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`// POST /auth/step`
`@@ -59,8 +57,7 @@ func (c client) AuthStep(accessToken, answer string) (postRes *postResponse,`
`59`	`57`	`if err != nil {`
`60`	`58`	`return nil, nil, err`
`61`	`59`	`}`
`62`		`- return postAndUnmarshal(c.environment, "/auth/step",`
`63`		`- bytes.NewReader(jsonText))`
	`60`	`+ return c.postAndUnmarshal("/auth/step", bytes.NewReader(jsonText))`
`64`	`61`	`}`
`65`	`62`
`66`	`63`	`// POST /auth/get`
`@@ -75,8 +72,7 @@ func (c client) AuthGet(accessToken string) (postRes *postResponse, err error) {`
`75`	`72`	`return nil, err`
`76`	`73`	`}`
`77`	`74`	`// /auth/get will never return an MFA response`
`78`		`- postRes, _, err = postAndUnmarshal(c.environment, "/auth/get",`
`79`		`- bytes.NewReader(jsonText))`
	`75`	`+ postRes, _, err = c.postAndUnmarshal("/auth/get", bytes.NewReader(jsonText))`
`80`	`76`	`return postRes, err`
`81`	`77`	`}`
`82`	`78`
`@@ -96,8 +92,7 @@ func (c client) AuthUpdate(username, password, pin, accessToken string) (postRes`
`96`	`92`	`if err != nil {`
`97`	`93`	`return nil, nil, err`
`98`	`94`	`}`
`99`		`- return patchAndUnmarshal(c.environment, "/auth",`
`100`		`- bytes.NewReader(jsonText))`
	`95`	`+ return c.patchAndUnmarshal("/auth", bytes.NewReader(jsonText))`
`101`	`96`	`}`
`102`	`97`
`103`	`98`	`// PATCH /auth/step`
`@@ -117,8 +112,7 @@ func (c client) AuthUpdateStep(username, password, pin, mfa, accessToken string)`
`117`	`112`	`if err != nil {`
`118`	`113`	`return nil, nil, err`
`119`	`114`	`}`
`120`		`- return patchAndUnmarshal(c.environment, "/auth/step",`
`121`		`- bytes.NewReader(jsonText))`
	`115`	`+ return c.patchAndUnmarshal("/auth/step", bytes.NewReader(jsonText))`
`122`	`116`	`}`
`123`	`117`
`124`	`118`	`// DELETE /auth`
`@@ -132,8 +126,7 @@ func (c client) AuthDelete(accessToken string) (deleteRes *deleteResponse, err e`
`132`	`126`	`if err != nil {`
`133`	`127`	`return nil, err`
`134`	`128`	`}`
`135`		`- return deleteAndUnmarshal(c.environment, "/auth",`
`136`		`- bytes.NewReader(jsonText))`
	`129`	`+ return c.deleteAndUnmarshal("/auth", bytes.NewReader(jsonText))`
`137`	`130`	`}`
`138`	`131`
`139`	`132`	`type AuthOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ func (c client) Balance(accessToken string) (postRes *postResponse, err error) {`
`16`	`16`	`if err != nil {`
`17`	`17`	`return nil, err`
`18`	`18`	`}`
`19`		`- postRes, _, err = postAndUnmarshal(c.environment, "/balance",`
`20`		`- bytes.NewReader(jsonText))`
	`19`	`+ postRes, _, err = c.postAndUnmarshal("/balance", bytes.NewReader(jsonText))`
`21`	`20`	`return postRes, err`
`22`	`21`	`}`
`23`	`22`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,7 @@ func (c client) ConnectAddUser(username, password, pin, institutionType string,`
`22`	`22`	`if err != nil {`
`23`	`23`	`return nil, nil, err`
`24`	`24`	`}`
`25`		`- return postAndUnmarshal(c.environment, "/connect",`
`26`		`- bytes.NewReader(jsonText))`
	`25`	`+ return c.postAndUnmarshal("/connect", bytes.NewReader(jsonText))`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`// POST /connect/step`
`@@ -41,8 +40,7 @@ func (c client) ConnectStepSendMethod(accessToken, key, value string) (postRes *`
`41`	`40`	`if err != nil {`
`42`	`41`	`return nil, nil, err`
`43`	`42`	`}`
`44`		`- return postAndUnmarshal(c.environment, "/connect/step",`
`45`		`- bytes.NewReader(jsonText))`
	`43`	`+ return c.postAndUnmarshal("/connect/step", bytes.NewReader(jsonText))`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`// POST /connect/step`
`@@ -59,8 +57,7 @@ func (c client) ConnectStep(accessToken, answer string) (postRes *postResponse,`
`59`	`57`	`if err != nil {`
`60`	`58`	`return nil, nil, err`
`61`	`59`	`}`
`62`		`- return postAndUnmarshal(c.environment, "/connect/step",`
`63`		`- bytes.NewReader(jsonText))`
	`60`	`+ return c.postAndUnmarshal("/connect", bytes.NewReader(jsonText))`
`64`	`61`	`}`
`65`	`62`
`66`	`63`	`// POST /connect/get`
`@@ -77,8 +74,7 @@ func (c client) ConnectGet(accessToken string, options *ConnectGetOptions) (post`
`77`	`74`	`if err != nil {`
`78`	`75`	`return nil, nil, err`
`79`	`76`	`}`
`80`		`- return postAndUnmarshal(c.environment, "/connect/get",`
`81`		`- bytes.NewReader(jsonText))`
	`77`	`+ return c.postAndUnmarshal("/connect/get", bytes.NewReader(jsonText))`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`// PATCH /connect`
`@@ -97,8 +93,7 @@ func (c client) ConnectUpdate(username, password, pin, accessToken string) (post`
`97`	`93`	`if err != nil {`
`98`	`94`	`return nil, nil, err`
`99`	`95`	`}`
`100`		`- return patchAndUnmarshal(c.environment, "/connect",`
`101`		`- bytes.NewReader(jsonText))`
	`96`	`+ return c.patchAndUnmarshal("/connect", bytes.NewReader(jsonText))`
`102`	`97`	`}`
`103`	`98`
`104`	`99`	`// PATCH /connect/step`
`@@ -118,8 +113,7 @@ func (c client) ConnectUpdateStep(username, password, pin, mfa, accessToken stri`
`118`	`113`	`if err != nil {`
`119`	`114`	`return nil, nil, err`
`120`	`115`	`}`
`121`		`- return patchAndUnmarshal(c.environment, "/connect/step",`
`122`		`- bytes.NewReader(jsonText))`
	`116`	`+ return c.patchAndUnmarshal("/connect/step", bytes.NewReader(jsonText))`
`123`	`117`	`}`
`124`	`118`
`125`	`119`	`// DELETE /connect`
`@@ -133,8 +127,7 @@ func (c client) ConnectDelete(accessToken string) (deleteRes *deleteResponse, er`
`133`	`127`	`if err != nil {`
`134`	`128`	`return nil, err`
`135`	`129`	`}`
`136`		`- return deleteAndUnmarshal(c.environment, "/connect",`
`137`		`- bytes.NewReader(jsonText))`
	`130`	`+ return c.deleteAndUnmarshal("/connect", bytes.NewReader(jsonText))`
`138`	`131`	`}`
`139`	`132`
`140`	`133`	`type ConnectOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,7 @@ func (c client) Upgrade(accessToken, upgradeTo string,`
`20`	`20`	`if err != nil {`
`21`	`21`	`return nil, nil, err`
`22`	`22`	`}`
`23`		`- return postAndUnmarshal(c.environment, "/upgrade",`
`24`		`- bytes.NewReader(jsonText))`
	`23`	`+ return c.postAndUnmarshal("/upgrade", bytes.NewReader(jsonText))`
`25`	`24`	`}`
`26`	`25`
`27`	`26`	`// POST /upgrade/step`
`@@ -39,8 +38,7 @@ func (c client) UpgradeStepSendMethod(accessToken, key, value string) (postRes *`
`39`	`38`	`if err != nil {`
`40`	`39`	`return nil, nil, err`
`41`	`40`	`}`
`42`		`- return postAndUnmarshal(c.environment, "/upgrade/step",`
`43`		`- bytes.NewReader(jsonText))`
	`41`	`+ return c.postAndUnmarshal("/upgrade/step", bytes.NewReader(jsonText))`
`44`	`42`	`}`
`45`	`43`
`46`	`44`	`// POST /upgrade/step`
`@@ -57,8 +55,7 @@ func (c client) UpgradeStep(accessToken, answer string) (postRes *postResponse,`
`57`	`55`	`if err != nil {`
`58`	`56`	`return nil, nil, err`
`59`	`57`	`}`
`60`		`- return postAndUnmarshal(c.environment, "/upgrade/step",`
`61`		`- bytes.NewReader(jsonText))`
	`58`	`+ return c.postAndUnmarshal("/upgrade/step", bytes.NewReader(jsonText))`
`62`	`59`	`}`
`63`	`60`
`64`	`61`	`type UpgradeOptions struct {`