Merge pull request #4 from OrderMyGear/permanuno/OMG-24783/connect-redirect-false

use redirect=false for ConnectCarrierAccount

Author: permanuno

client/carrier_account.go

@@ -66,12 +66,13 @@ func (c *Client) ConnectCarrierAccount(objectID, redirectUrl, state string) (str
 		return "", errors.New("Empty object ID")
 	}
 
-	url := fmt.Sprintf("/carrier_accounts/%s/signin/initiate?redirect_uri=%s&state=%s", objectID, redirectUrl, state)
+	url := fmt.Sprintf("/carrier_accounts/%s/signin/initiate?redirect_uri=%s&state=%s&redirect=false", objectID, redirectUrl, state)
 
-	headers, err := c.doAndSaveHeaders(http.MethodGet, url, nil, nil)
+	output := &models.ConnectOauth{}
+	err := c.do(http.MethodGet, url, nil, output)
 	if err != nil {
 		return "", err
 	}
 
-	return headers.Get("location"), nil
+	return output.RedirectUri, nil
 }

client/client.go

@@ -59,25 +59,6 @@ func (c *Client) do(method, path string, input, output interface{}) error {
 	return nil
 }
 
-func (c *Client) doAndSaveHeaders(method, path string, input, output interface{}) (http.Header, error) {
-	url := shippoAPIBaseURL + path
-
-	req, err := c.createRequest(method, url, input)
-	if err != nil {
-		return nil, fmt.Errorf("Error creating request object: %s", err.Error())
-	}
-
-	headers, err := c.executeRequestAndSaveHeaders(req, output)
-	if err != nil {
-		if aerr, ok := err.(*errors.APIError); ok {
-			return nil, aerr
-		}
-		return nil, fmt.Errorf("Error executing request: %s", err.Error())
-	}
-
-	return headers, nil
-}
-
 func (c *Client) doList(method, path string, input interface{}, outputCallback listOutputCallback) error {
 	nextURL := shippoAPIBaseURL + path + "?results=25"
 
@@ -214,54 +195,6 @@ func (c *Client) executeRequest(req *http.Request, output interface{}) (err erro
 	}
 }
 
-func (c *Client) executeRequestAndSaveHeaders(req *http.Request, output interface{}) (headers http.Header, err error) {
-	if c.logger != nil {
-		defer func() {
-			if err != nil {
-				c.logPrintf("Client.executeRequest() error: %s", err.Error())
-			}
-		}()
-	}
-
-	httpClient := http.Client{
-		CheckRedirect: func(req *http.Request, via []*http.Request) error {
-			return http.ErrUseLastResponse
-		},
-	}
-
-	res, err := httpClient.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("Error making HTTP request: %s", err.Error())
-	}
-	defer res.Body.Close()
-
-	resData, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, fmt.Errorf("Error reading response body data: %s", err.Error())
-	}
-
-	if c.logger != nil {
-		c.logPrintf("Client.executeRequest() response: status=%q, body=%q", res.Status, string(resData))
-	}
-
-	if res.StatusCode >= 200 && res.StatusCode < 300 {
-		if output != nil && len(resData) > 0 {
-			if err := json.Unmarshal(resData, output); err != nil {
-				return nil, fmt.Errorf("Error unmarshaling response data: %s", err.Error())
-			}
-		}
-
-		return res.Header, nil
-	} else if res.StatusCode == 302 {
-		return res.Header, nil
-	}
-
-	return nil, &errors.APIError{
-		Status:       res.StatusCode,
-		ResponseBody: resData,
-	}
-}
-
 func (c *Client) logPrintf(format string, args ...interface{}) {
 	if c.logger != nil {
 		c.logger.Printf(format, args...)

models/carrier_account.go

@@ -24,3 +24,7 @@ type Authentication struct {
 	Type   string `json:"type"`
 	Status string `json:"status"`
 }
+
+type ConnectOauth struct {
+	RedirectUri string `json:"redirect_uri"`
+}