fix conflict

Author: sahilsk11

client.go

@@ -80,6 +80,7 @@ type Client struct {
 	Document               DocumentService
 	Event                  EventService
 	FundingSource          FundingSourceService
+	KBA                    KBAService
 	MassPayment            MassPaymentService
 	OnDemandAuthorization  OnDemandAuthorizationService
 	Transfer               TransferService
@@ -124,6 +125,7 @@ func NewWithHTTPClient(key, secret string, environment Environment, httpClient H
 	c.Document = &DocumentServiceOp{c}
 	c.Event = &EventServiceOp{c}
 	c.FundingSource = &FundingSourceServiceOp{c}
+	c.KBA = &KBAServiceOp{c}
 	c.MassPayment = &MassPaymentServiceOp{c}
 	c.OnDemandAuthorization = &OnDemandAuthorizationServiceOp{c}
 	c.Transfer = &TransferServiceOp{c}
@@ -200,7 +202,7 @@ func (c *Client) RequestToken(ctx context.Context) error {
 
 	buf := bytes.NewBuffer([]byte("grant_type=client_credentials"))
 
-	req, err := http.NewRequest("POST", c.BuildAPIURL("token"), buf)
+	req, err := http.NewRequestWithContext(ctx, "POST", c.BuildAPIURL("token"), buf)
 	if err != nil {
 		return err
 	}
@@ -210,24 +212,19 @@ func (c *Client) RequestToken(ctx context.Context) error {
 
 	req.SetBasicAuth(c.Key, c.Secret)
 
-	req = req.WithContext(ctx)
-
 	res, err := c.HTTPClient.Do(req)
-
 	if err != nil {
 		return err
 	}
 
 	defer res.Body.Close()
 
 	resBody, err := ioutil.ReadAll(res.Body)
-
 	if err != nil {
 		return err
 	}
 
 	err = json.Unmarshal(resBody, &token)
-
 	if err != nil {
 		return err
 	}
@@ -270,8 +267,7 @@ func (c *Client) Get(ctx context.Context, path string, params *url.Values, heade
 		return err
 	}
 
-	req, err := http.NewRequest("GET", c.BuildAPIURL(path), nil)
-
+	req, err := http.NewRequestWithContext(ctx, "GET", c.BuildAPIURL(path), nil)
 	if err != nil {
 		return err
 	}
@@ -288,18 +284,14 @@ func (c *Client) Get(ctx context.Context, path string, params *url.Values, heade
 		req.URL.RawQuery = params.Encode()
 	}
 
-	req = req.WithContext(ctx)
-
 	res, err := c.HTTPClient.Do(req)
-
 	if err != nil {
 		return err
 	}
 
 	defer res.Body.Close()
 
 	resBody, err := ioutil.ReadAll(res.Body)
-
 	if err != nil {
 		return err
 	}
@@ -345,16 +337,14 @@ func (c *Client) Post(ctx context.Context, path string, body interface{}, header
 
 	if body != nil {
 		bodyBytes, err := json.Marshal(body)
-
 		if err != nil {
 			return err
 		}
 
 		bodyReader = bytes.NewReader(bodyBytes)
 	}
 
-	req, err := http.NewRequest("POST", c.BuildAPIURL(path), bodyReader)
-
+	req, err := http.NewRequestWithContext(ctx, "POST", c.BuildAPIURL(path), bodyReader)
 	if err != nil {
 		return err
 	}
@@ -368,10 +358,7 @@ func (c *Client) Post(ctx context.Context, path string, body interface{}, header
 	req.Header.Set("Content-Type", "application/vnd.dwolla.v1.hal+json")
 	req.Header.Set("User-Agent", "dwolla-v2-go")
 
-	req = req.WithContext(ctx)
-
 	res, err := c.HTTPClient.Do(req)
-
 	if err != nil {
 		return err
 	}
@@ -385,7 +372,6 @@ func (c *Client) Post(ctx context.Context, path string, body interface{}, header
 	}
 
 	resBody, err := ioutil.ReadAll(res.Body)
-
 	if err != nil {
 		return err
 	}
@@ -427,8 +413,9 @@ func (c *Client) Post(ctx context.Context, path string, body interface{}, header
 // Upload performs a multipart file upload to the Dwolla API
 func (c *Client) Upload(ctx context.Context, path string, documentType DocumentType, fileName string, file io.Reader, container interface{}) error {
 	var (
-		err      error
-		halError HALError
+		err             error
+		halError        HALError
+		validationError ValidationError
 	)
 
 	if err = c.EnsureToken(ctx); err != nil {
@@ -438,31 +425,26 @@ func (c *Client) Upload(ctx context.Context, path string, documentType DocumentT
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
 	part, err := writer.CreateFormFile("file", fileName)
-
 	if err != nil {
 		return err
 	}
 
 	_, err = io.Copy(part, file)
-
 	if err != nil {
 		return err
 	}
 
 	err = writer.WriteField("documentType", string(documentType))
-
 	if err != nil {
 		return err
 	}
 
 	err = writer.Close()
-
 	if err != nil {
 		return err
 	}
 
-	req, err := http.NewRequest("POST", c.BuildAPIURL(path), body)
-
+	req, err := http.NewRequestWithContext(ctx, "POST", c.BuildAPIURL(path), body)
 	if err != nil {
 		return err
 	}
@@ -473,10 +455,7 @@ func (c *Client) Upload(ctx context.Context, path string, documentType DocumentT
 	req.Header.Set("Content-Type", writer.FormDataContentType())
 	req.Header.Set("User-Agent", "dwolla-v2-go")
 
-	req = req.WithContext(ctx)
-
 	res, err := c.HTTPClient.Do(req)
-
 	if err != nil {
 		return err
 	}
@@ -490,7 +469,6 @@ func (c *Client) Upload(ctx context.Context, path string, documentType DocumentT
 	}
 
 	resBody, err := ioutil.ReadAll(res.Body)
-
 	if err != nil {
 		return err
 	}
@@ -511,6 +489,14 @@ func (c *Client) Upload(ctx context.Context, path string, documentType DocumentT
 			return c.Upload(ctx, path, documentType, fileName, file, container)
 		}
 
+		if halError.Code == "ValidationError" {
+			if err := json.Unmarshal(resBody, &validationError); err != nil {
+				return err
+			}
+
+			return validationError
+		}
+
 		return halError
 	}
 
@@ -532,8 +518,7 @@ func (c *Client) Delete(ctx context.Context, path string, params *url.Values, he
 		return err
 	}
 
-	req, err := http.NewRequest("DELETE", c.BuildAPIURL(path), nil)
-
+	req, err := http.NewRequestWithContext(ctx, "DELETE", c.BuildAPIURL(path), nil)
 	if err != nil {
 		return err
 	}
@@ -550,10 +535,7 @@ func (c *Client) Delete(ctx context.Context, path string, params *url.Values, he
 		req.URL.RawQuery = params.Encode()
 	}
 
-	req = req.WithContext(ctx)
-
 	res, err := c.HTTPClient.Do(req)
-
 	if err != nil {
 		return err
 	}
@@ -562,7 +544,6 @@ func (c *Client) Delete(ctx context.Context, path string, params *url.Values, he
 
 	if res.StatusCode > 299 {
 		resBody, err := ioutil.ReadAll(res.Body)
-
 		if err != nil {
 			return err
 		}
@@ -627,7 +608,7 @@ func (c *Client) CreateClientToken(ctx context.Context, action string, customer
 
 	var token ClientToken
 
-	if err := c.Post(ctx, "client-tokens", body, nil, token); err != nil {
+	if err := c.Post(ctx, "client-tokens", body, nil, &token); err != nil {
 		return nil, err
 	}
 

customer.go

@@ -37,7 +37,7 @@ const (
 	CustomerTypeUnverified CustomerType = "unverified"
 )
 
-// CustomerService is the customerservice interface
+// CustomerService is the customer service interface
 //
 // see: https://docsv2.dwolla.com/#customers
 type CustomerService interface {
@@ -281,6 +281,25 @@ func (c *Customer) CreateFundingSource(ctx context.Context, body *FundingSourceR
 	return &source, nil
 }
 
+// CreateFundingSourceToken creates a funding source dwolla.js token
+//
+// see: https://docs.dwolla.com/#create-a-funding-sources-token-for-dwolla-js
+func (c *Customer) CreateFundingSourceToken(ctx context.Context) (*FundingSourceToken, error) {
+	var token FundingSourceToken
+
+	if _, ok := c.Links["self"]; !ok {
+		return nil, errors.New("No funding sources resource link")
+	}
+
+	if err := c.client.Post(ctx, fmt.Sprintf("%s/funding-source-token", c.Links["self"].Href), nil, nil, &token); err != nil {
+		return nil, err
+	}
+
+	token.client = c.client
+
+	return &token, nil
+}
+
 // Deactivate deactivates a dwolla customer
 func (c *Customer) Deactivate(ctx context.Context) error {
 	if _, ok := c.Links["deactivate"]; !ok {
@@ -292,6 +311,25 @@ func (c *Customer) Deactivate(ctx context.Context) error {
 	return c.client.Post(ctx, c.Links["deactivate"].Href, request, nil, c)
 }
 
+// InitiateKBA initiates a knowledge based authentication session
+//
+// see: https://docs.dwolla.com/#initiate-kba-session
+func (c *Customer) InitiateKBA(ctx context.Context) (*KBA, error) {
+	var kba KBA
+
+	if _, ok := c.Links["self"]; !ok {
+		return nil, errors.New("No self resource link")
+	}
+
+	if err := c.client.Post(ctx, fmt.Sprintf("%s/kba", c.Links["self"].Href), nil, nil, &kba); err != nil {
+		return nil, err
+	}
+
+	kba.client = c.client
+
+	return &kba, nil
+}
+
 // ListBeneficialOwners returns the customer's beneficial owners
 //
 // see: https://docsv2.dwolla.com/#list-beneficial-owners

funding_source.go

@@ -76,6 +76,7 @@ type FundingSourceBankAccountType string
 type FundingSourceBalance struct {
 	Resource
 	Balance     Amount `json:"balance"`
+	Total       Amount `json:"total"`
 	LastUpdated string `json:"lastUpdated"`
 }
 
@@ -91,6 +92,12 @@ type FundingSourceRequest struct {
 	PlaidToken      string                       `json:"plaidToken,omitempty"`
 }
 
+// FundingSourceToken is a funding source dwolla.js token
+type FundingSourceToken struct {
+	Resource
+	Token string `json:"token"`
+}
+
 // Retrieve retrieves a funding source with the matching id
 //
 // see: https://docsv2.dwolla.com/#retrieve-a-funding-source

hal.go

@@ -14,6 +14,10 @@ type HALError struct {
 
 // HALError implements the error interface
 func (e HALError) Error() string {
+	if e.Path != "" {
+		return fmt.Sprintf("[%s] %s (%s)", e.Code, e.Message, e.Path)
+	}
+
 	return fmt.Sprintf("[%s] %s", e.Code, e.Message)
 }
 
@@ -24,17 +28,16 @@ type HALErrors map[string][]HALError
 type ValidationError struct {
 	Code     string    `json:"code"`
 	Message  string    `json:"message"`
-	Path     string    `json:"path"`
 	Embedded HALErrors `json:"_embedded"`
 }
 
 // Error implements the error interface
 func (v ValidationError) Error() string {
-	errorMessage := fmt.Sprintf("[%s] %s", v.Code, v.Message)
-	if len(v.Embedded) != 0 && len(v.Embedded["errors"]) != 0 {
-		errorMessage = v.Embedded["errors"][0].Message
+	if _, ok := v.Embedded["errors"]; ok {
+		return fmt.Sprintf("[%s] %s (%v)", v.Code, v.Message, v.Embedded["errors"])
 	}
-	return errorMessage
+
+	return fmt.Sprintf("[%s] %s", v.Code, v.Message)
 }
 
 // Link is a hal resource link