From 4b4f01ae82d455f054707a0b1c67e6599bbb561b Mon Sep 17 00:00:00 2001 From: Jeffy Mathew Date: Thu, 14 Nov 2024 13:40:16 +0100 Subject: [PATCH] Revert "[TT-13422] Do not allow empty string in upstream auth configuration strings" (#6702) Reverts TykTechnologies/tyk#6699 temporary revert with common change for AuthSource (cherry picked from commit f0fcb3f59104ce571d24f1e4354c8bbfc8eba9f3) --- apidef/oas/schema/x-tyk-api-gateway.json | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/apidef/oas/schema/x-tyk-api-gateway.json b/apidef/oas/schema/x-tyk-api-gateway.json index 2efd81bc2ec..77dca6c608d 100644 --- a/apidef/oas/schema/x-tyk-api-gateway.json +++ b/apidef/oas/schema/x-tyk-api-gateway.json @@ -96,7 +96,7 @@ "type": "boolean" }, "name": { - "$ref": "#/definitions/X-Tyk-NonEmptyString" + "type": "string" } }, "required": [ @@ -2023,7 +2023,7 @@ "type": "boolean" }, "header": { - "$ref": "#/definitions/X-Tyk-AuthSource" + "$ref": "#/definitions/X-Tyk-UpstreamAuthSource" }, "username": { "$ref": "#/definitions/X-Tyk-NonEmptyString" @@ -2077,7 +2077,7 @@ ] }, "header": { - "$ref": "#/definitions/X-Tyk-AuthSource" + "$ref": "#/definitions/X-Tyk-UpstreamAuthSource" }, "extraMetadata": { "type": [ @@ -2117,7 +2117,7 @@ "$ref": "#/definitions/X-Tyk-NonEmptyString" }, "header": { - "$ref": "#/definitions/X-Tyk-AuthSource" + "$ref": "#/definitions/X-Tyk-UpstreamAuthSource" }, "extraMetadata": { "type": [ @@ -2143,6 +2143,17 @@ "X-Tyk-NonEmptyString": { "type": "string", "pattern": "\\S+" + }, + "X-Tyk-UpstreamAuthSource": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean" + }, + "name": { + "type": "string" + } + } } } } \ No newline at end of file