Fix DeviceAuth not populating RetrieveError

Author: andig

deviceauth.go

@@ -116,10 +116,29 @@ func retrieveDeviceAuth(ctx context.Context, c *Config, v url.Values) (*DeviceAu
 		return nil, fmt.Errorf("oauth2: cannot auth device: %v", err)
 	}
 	if code := r.StatusCode; code < 200 || code > 299 {
-		return nil, &RetrieveError{
+		retrieveError := &RetrieveError{
 			Response: r,
 			Body:     body,
 		}
+
+		content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
+		switch content {
+		case "application/x-www-form-urlencoded", "text/plain":
+			// some endpoints return a query string
+			vals, err := url.ParseQuery(string(body))
+			if err != nil {
+				return nil, fmt.Errorf("oauth2: cannot parse response: %v", err)
+			}
+			retrieveError.ErrorCode = vals.Get("error")
+			retrieveError.ErrorDescription = vals.Get("error_description")
+			retrieveError.ErrorURI = vals.Get("error_uri")
+		default:
+			if err = json.Unmarshal(body, &retrieveError); err != nil {
+				return nil, fmt.Errorf("oauth2: cannot parse json: %v", err)
+			}
+		}
+
+		return nil, err
 	}
 
 	da := &DeviceAuthResponse{}