Fixed MFA not reading error; hiding oauth url containing credentials (#…

…49)
apigee · Aug 20, 2020 · 9dd1e39 · 9dd1e39
1 parent a0d08ef
commit 9dd1e39
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/apigee/edge_client.go b/apigee/edge_client.go
@@ -249,7 +249,8 @@ func NewEdgeClient(o *EdgeClientOptions) (*EdgeClient, error) {
 		if e != nil {
 			return nil, e
 		}
-		if o.MgmtURL == defaultBaseURL || c.auth.MFAToken != "" {
+		if o.MgmtURL == defaultBaseURL || o.Auth.MFAToken != "" {
+			c.auth.MFAToken = o.Auth.MFAToken
 			e = c.getOAuthToken()
 			if e != nil {
 				return nil, e
@@ -290,7 +291,12 @@ func (c *EdgeClient) getOAuthToken() error {
 		defer res.Body.Close()
 	}
 	if err := CheckResponse(res); err != nil {
-		return err
+		var errorResponse *ErrorResponse
+		if errors.As(err, &errorResponse) {
+			return fmt.Errorf("%d %v", res.StatusCode, errorResponse.Message)
+		} else {
+			return fmt.Errorf("%d", res.StatusCode)
+		}
 	}
 	body := &OAuthResponse{}
 	if err := json.NewDecoder(res.Body).Decode(body); err != nil {