Remove pointer map used to get AuthProperties (#87)

* Remove pointer map used to get AuthProperties

Fixes #86

Signed-off-by: Calvin McLean <calvinlmc@gmail.com>

* Improve testing for Unmarshal AuthProperties

Signed-off-by: Calvin McLean <calvinlmc@gmail.com>

Signed-off-by: Calvin McLean <calvinlmc@gmail.com>

Author: calvinmclean

model/auth.go

@@ -70,11 +70,16 @@ const (
 	GrantTypeTokenExchange GrantType = "tokenExchange"
 )
 
-// authTypesMapping map to support JSON unmarshalling when guessing the auth scheme
-var authTypesMapping = map[AuthType]AuthProperties{
-	AuthTypeBasic:  &BasicAuthProperties{},
-	AuthTypeBearer: &BearerAuthProperties{},
-	AuthTypeOAuth2: &OAuth2AuthProperties{},
+func getAuthProperties(authType AuthType) (AuthProperties, bool) {
+	switch authType {
+	case AuthTypeBasic:
+		return &BasicAuthProperties{}, true
+	case AuthTypeBearer:
+		return &BearerAuthProperties{}, true
+	case AuthTypeOAuth2:
+		return &OAuth2AuthProperties{}, true
+	}
+	return nil, false
 }
 
 // Auth ...
@@ -150,11 +155,12 @@ func (a *Auth) UnmarshalJSON(data []byte) error {
 	if len(a.Scheme) == 0 {
 		a.Scheme = AuthTypeBasic
 	}
-	if _, ok := authTypesMapping[a.Scheme]; !ok {
-		return fmt.Errorf("authentication scheme %s not supported", authTypesMapping["type"])
+	authProperties, ok := getAuthProperties(a.Scheme)
+	if !ok {
+		return fmt.Errorf("authentication scheme %s not supported", a.Scheme)
 	}
+
 	// we take the type we want to unmarshal based on the scheme
-	authProperties := authTypesMapping[a.Scheme]
 	if err := unmarshalKey("properties", auth, authProperties); err != nil {
 		return err
 	}

model/auth_test.go

@@ -15,6 +15,7 @@
 package model
 
 import (
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -92,3 +93,70 @@ func TestAuthDefinitionsStructLevelValidation(t *testing.T) {
 		})
 	}
 }
+
+func TestUnmarshalJSONMultipleAuthProperties(t *testing.T) {
+	t.Run("BearerAuthProperties", func(t *testing.T) {
+		a1JSON := `{
+		"name": "a1",
+		"scheme": "bearer",
+		"properties": {
+			"token": "token1"
+		}
+	}`
+		a2JSON := `{
+		"name": "a2",
+		"scheme": "bearer",
+		"properties": {
+			"token": "token2"
+		}
+	}`
+
+		var a1 Auth
+		err := json.Unmarshal([]byte(a1JSON), &a1)
+		assert.NoError(t, err)
+
+		var a2 Auth
+		err = json.Unmarshal([]byte(a2JSON), &a2)
+		assert.NoError(t, err)
+
+		a1Properties := a1.Properties.(*BearerAuthProperties)
+		a2Properties := a2.Properties.(*BearerAuthProperties)
+
+		assert.Equal(t, "token1", a1Properties.Token)
+		assert.Equal(t, "token2", a2Properties.Token)
+		assert.NotEqual(t, a1Properties, a2Properties)
+	})
+
+	t.Run("OAuth2AuthProperties", func(t *testing.T) {
+		a1JSON := `{
+	"name": "a1",
+	"scheme": "oauth2",
+	"properties": {
+		"clientSecret": "secret1"
+	}
+}`
+
+		a2JSON := `{
+	"name": "a2",
+	"scheme": "oauth2",
+	"properties": {
+		"clientSecret": "secret2"
+	}
+}`
+
+		var a1 Auth
+		err := json.Unmarshal([]byte(a1JSON), &a1)
+		assert.NoError(t, err)
+
+		var a2 Auth
+		err = json.Unmarshal([]byte(a2JSON), &a2)
+		assert.NoError(t, err)
+
+		a1Properties := a1.Properties.(*OAuth2AuthProperties)
+		a2Properties := a2.Properties.(*OAuth2AuthProperties)
+
+		assert.Equal(t, "secret1", a1Properties.ClientSecret)
+		assert.Equal(t, "secret2", a2Properties.ClientSecret)
+		assert.NotEqual(t, a1Properties, a2Properties)
+	})
+}