TT-13185, fixed issue with password vs passwordAuthentication

TykTechnologies · Oct 30, 2024 · 84b1255 · 84b1255
1 parent 7b0c8d5
commit 84b1255
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apidef/api_definitions.go b/apidef/api_definitions.go
@@ -816,7 +816,7 @@ type UpstreamOAuth struct {
 	// ClientCredentials holds the client credentials for upstream OAuth2 authentication.
 	ClientCredentials ClientCredentials `bson:"client_credentials" json:"client_credentials"`
 	// PasswordAuthentication holds the configuration for upstream OAauth password authentication flow.
-	PasswordAuthentication PasswordAuthentication `bson:"password_authentication,omitempty" json:"passwordAuthentication,omitempty"`
+	PasswordAuthentication PasswordAuthentication `bson:"password,omitempty" json:"password,omitempty"`
 }
 
 // PasswordAuthentication holds the configuration for upstream OAuth2 password authentication flow.

diff --git a/apidef/oas/schema/x-tyk-api-gateway.json b/apidef/oas/schema/x-tyk-api-gateway.json
@@ -2083,7 +2083,7 @@
             "tokenUrl"
           ]
         },
-        "passwordAuthentication": {
+        "password": {
           "type": "object",
           "properties": {
             "clientId": {

diff --git a/apidef/oas/upstream.go b/apidef/oas/upstream.go
@@ -655,7 +655,7 @@ type UpstreamOAuth struct {
 	// ClientCredentials holds the configuration for OAuth2 Client Credentials flow.
 	ClientCredentials *ClientCredentials `bson:"clientCredentials,omitempty" json:"clientCredentials,omitempty"`
 	// PasswordAuthentication holds the configuration for upstream OAauth password authentication flow.
-	PasswordAuthentication *PasswordAuthentication `bson:"passwordAuthentication,omitempty" json:"passwordAuthentication,omitempty"`
+	PasswordAuthentication *PasswordAuthentication `bson:"password,omitempty" json:"password,omitempty"`
 }
 
 // PasswordAuthentication holds the configuration for upstream OAuth2 password authentication flow.

diff --git a/apidef/schema.go b/apidef/schema.go
@@ -1063,7 +1063,7 @@ const Schema = `{
                 "token_url"
               ]
             },
-            "password_authentication": {
+            "password": {
               "type": "object",
               "properties": {
                 "client_id": {