fix: adds error mapping case for non-json content-type responses

passageidentity · Nov 26, 2024 · 0fb435d · 0fb435d
1 parent 053d095
commit 0fb435d
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 2 deletions.
diff --git a/auth.go b/auth.go
@@ -2,6 +2,7 @@ package passage
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 
@@ -11,8 +12,8 @@ import (
 
 type auth struct {
 	appID        string
-	jwksCacheSet jwk.Set
 	client       *ClientWithResponses
+	jwksCacheSet jwk.Set
 }
 
 func newAuth(appID string, client *ClientWithResponses) (*auth, error) {
@@ -29,8 +30,9 @@ func newAuth(appID string, client *ClientWithResponses) (*auth, error) {
 	}
 
 	auth := auth{
-		jwksCacheSet: jwk.NewCachedSet(cache, url),
+		appID:        appID,
 		client:       client,
+		jwksCacheSet: jwk.NewCachedSet(cache, url),
 	}
 
 	return &auth, nil
@@ -62,6 +64,14 @@ func (a *auth) CreateMagicLink(createMagicLinkBody CreateMagicLinkBody) (*MagicL
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{

diff --git a/passage_error.go b/passage_error.go
@@ -5,6 +5,11 @@ import (
 	"strings"
 )
 
+type httpErrorBody struct {
+	Code  string `json:"code"`
+	Error string `json:"error"`
+}
+
 type PassageError struct {
 	Message    string
 	ErrorCode  string

diff --git a/user.go b/user.go
@@ -2,6 +2,7 @@ package passage
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strings"
 )
@@ -45,6 +46,14 @@ func (u *user) Get(userID string) (*PassageUser, error) {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -97,6 +106,14 @@ func (u *user) GetByIdentifier(identifier string) (*PassageUser, error) {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -129,6 +146,14 @@ func (u *user) Activate(userID string) (*PassageUser, error) {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -161,6 +186,14 @@ func (u *user) Deactivate(userID string) (*PassageUser, error) {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -196,6 +229,14 @@ func (u *user) Update(userID string, options UpdateUserOptions) (*PassageUser, e
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -231,6 +272,14 @@ func (u *user) Create(args CreateUserArgs) (*PassageUser, error) {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -263,6 +312,14 @@ func (u *user) Delete(userID string) error {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return PassageError{
@@ -295,6 +352,14 @@ func (u *user) ListDevices(userID string) ([]WebAuthnDevices, error) {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return nil, err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return nil, PassageError{
@@ -327,6 +392,14 @@ func (u *user) RevokeDevice(userID string, deviceID string) error {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return PassageError{
@@ -359,6 +432,14 @@ func (u *user) RevokeRefreshTokens(userID string) error {
 	case res.JSON500 != nil:
 		message = res.JSON500.Error
 		errorCode = string(res.JSON500.Code)
+	default:
+		var errorBody httpErrorBody
+		if err := json.Unmarshal(res.Body, &errorBody); err != nil {
+			return err
+		}
+
+		message = errorBody.Error
+		errorCode = errorBody.Code
 	}
 
 	return PassageError{