From 3e5e3f6f23716916e82206097a3a7f4311b377bf Mon Sep 17 00:00:00 2001
From: lghiur <laurentiu.ghiur@gmail.com>
Date: Wed, 6 Nov 2024 11:29:22 +0200
Subject: [PATCH] [TT-13375] Improved Upstream Auth validation rules

---
 apidef/oas/schema/x-tyk-api-gateway.json | 30 ++++++++++++++++++------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/apidef/oas/schema/x-tyk-api-gateway.json b/apidef/oas/schema/x-tyk-api-gateway.json
index 2e3801e9b7a..f99f7fb6a05 100644
--- a/apidef/oas/schema/x-tyk-api-gateway.json
+++ b/apidef/oas/schema/x-tyk-api-gateway.json
@@ -2022,8 +2022,8 @@
         "enabled": {
           "type": "boolean"
         },
-        "headerName": {
-          "type": "string"
+        "header": {
+          "$ref": "#/definitions/X-Tyk-AuthSource"
         },
         "username": {
           "type": "string"
@@ -2033,7 +2033,9 @@
         }
       },
       "required": [
-        "enabled"
+        "enabled",
+        "username",
+        "password"
       ]
     },
     "X-Tyk-UpstreamOAuth": {
@@ -2043,7 +2045,10 @@
           "type": "boolean"
         },
         "allowedAuthorizeTypes": {
-          "type": ["array", "null"],
+          "type": [
+            "array",
+            "null"
+          ],
           "items": {
             "type": "string",
             "enum": [
@@ -2075,7 +2080,10 @@
               "$ref": "#/definitions/X-Tyk-AuthSource"
             },
             "extraMetadata": {
-              "type": "array"
+              "type": [
+                "array",
+                "null"
+              ]
             }
           },
           "required": [
@@ -2112,7 +2120,10 @@
               "$ref": "#/definitions/X-Tyk-AuthSource"
             },
             "extraMetadata": {
-              "type": "array"
+              "type": [
+                "array",
+                "null"
+              ]
             }
           },
           "required": [
@@ -2123,7 +2134,12 @@
             "password"
           ]
         }
-      }
+      },
+      "required": [
+        "enabled",
+        "allowedAuthorizeTypes"
+      ]
     }
+    
   }
 }
\ No newline at end of file