Revert "[TT-5588] [OAS] gateway apiKey import generates unnecessary object (#…"

This reverts commit 8b4fa8e.

Author: radkrawczyk

apidef/oas/security.go

@@ -30,7 +30,7 @@ type Token struct {
 	Enabled bool `bson:"enabled" json:"enabled"` // required
 
 	// AuthSources contains the configuration for authentication sources.
-	AuthSources `bson:",inline" json:"-"`
+	AuthSources `bson:",inline" json:",inline"`
 
 	// EnableClientCertificate allows to create dynamic keys based on certificates.
 	//

apidef/oas/security_test.go

@@ -1,7 +1,6 @@
 package oas
 
 import (
-	"encoding/json"
 	"sort"
 	"testing"
 
@@ -277,20 +276,6 @@ func TestOAS_Token(t *testing.T) {
 	convertedOAS.fillToken(api)
 
 	assert.Equal(t, oas, convertedOAS)
-
-	// Make sure AuthSources are not serialized into json.
-	token.Query = &AuthSource{Enabled: true}
-	token.Header = &AuthSource{Enabled: true}
-	token.Cookie = &AuthSource{Enabled: true}
-	bytes, err := json.Marshal(token)
-	assert.NoError(t, err)
-
-	var unmarshalledToken Token
-	err = json.Unmarshal(bytes, &unmarshalledToken)
-	assert.NoError(t, err)
-	assert.Nil(t, unmarshalledToken.Query)
-	assert.Nil(t, unmarshalledToken.Header)
-	assert.Nil(t, unmarshalledToken.Cookie)
 }
 
 func TestOAS_Token_MultipleSecuritySchemes(t *testing.T) {