From e7f5de82c0d014374a4f673d849d66c2c7c8afe3 Mon Sep 17 00:00:00 2001
From: Celian GARCIA <celian.garcia@amadeus.com>
Date: Thu, 14 Mar 2024 18:07:07 +0100
Subject: [PATCH] feat: return oidc.Error in case of call token failure

---
 pkg/client/client.go | 21 +++------------------
 pkg/http/http.go     |  9 ++++++++-
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkg/client/client.go b/pkg/client/client.go
index 8b60264..78b412a 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -2,7 +2,6 @@ package client
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -251,25 +250,11 @@ func CallDeviceAccessTokenEndpoint(ctx context.Context, request *DeviceAccessTok
 		req.SetBasicAuth(request.ClientID, request.ClientSecret)
 	}
 
-	httpResp, err := caller.HttpClient().Do(req)
-	if err != nil {
+	resp := new(oidc.AccessTokenResponse)
+	if err := httphelper.HttpRequest(caller.HttpClient(), req, &resp); err != nil {
 		return nil, err
 	}
-	defer httpResp.Body.Close()
-
-	resp := new(struct {
-		*oidc.AccessTokenResponse
-		*oidc.Error
-	})
-	if err = json.NewDecoder(httpResp.Body).Decode(resp); err != nil {
-		return nil, err
-	}
-
-	if httpResp.StatusCode == http.StatusOK {
-		return resp.AccessTokenResponse, nil
-	}
-
-	return nil, resp.Error
+	return resp, nil
 }
 
 func PollDeviceAccessTokenEndpoint(ctx context.Context, interval time.Duration, request *DeviceAccessTokenRequest, caller TokenEndpointCaller) (*oidc.AccessTokenResponse, error) {
diff --git a/pkg/http/http.go b/pkg/http/http.go
index fd196b0..33c5f15 100644
--- a/pkg/http/http.go
+++ b/pkg/http/http.go
@@ -10,6 +10,8 @@ import (
 	"net/url"
 	"strings"
 	"time"
+
+	"github.com/zitadel/oidc/v3/pkg/oidc"
 )
 
 var DefaultHTTPClient = &http.Client{
@@ -66,7 +68,12 @@ func HttpRequest(client *http.Client, req *http.Request, response any) error {
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("http status not ok: %s %s", resp.Status, body)
+		var oidcErr oidc.Error
+		err = json.Unmarshal(body, &oidcErr)
+		if err != nil || oidcErr.ErrorType == "" {
+			return fmt.Errorf("http status not ok: %s %s", resp.Status, body)
+		}
+		return &oidcErr
 	}
 
 	err = json.Unmarshal(body, response)