Merge branch 'develop' into develop

kevinmichaelbowersox · May 23, 2022 · 7e50db4 · 7e50db4
2 parents e876213 + dff4f11
commit 7e50db4
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Change Log - oav
 
+## 04/20/2022 2.12.2
+
+- LiveValidator - Get real schema and data while error's schema has allOf property
+
 ## 04/20/2022 2.12.1
 
 - Fix bug about copyfiles command during build

diff --git a/lib/swaggerValidator/ajvSchemaValidator.ts b/lib/swaggerValidator/ajvSchemaValidator.ts
@@ -272,8 +272,13 @@ const ReValidateIfNeed = (
 };
 
 const shouldSkipError = (error: ErrorObject, cxt: SchemaValidateContext) => {
-  const { schema, parentSchema: parentSch, params, keyword, data } = error;
+  const { parentSchema: parentSch, params, keyword } = error;
   const parentSchema = parentSch as Schema;
+  // If schema has allof property, we can get schema in "_realschema", so is data
+  const schema = Object.keys(error).includes("_realSchema")
+    ? (error as any)._realSchema
+    : error.schema;
+  const data = Object.keys(error).includes("_realData") ? (error as any)._realData : error.data;
 
   if (schema?._skipError || parentSchema._skipError) {
     return true;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oav",
-  "version": "2.12.1",
+  "version": "2.12.2",
   "author": {
     "name": "Microsoft Corporation",
     "email": "[email protected]",

diff --git a/test/liveValidation/payloads/dateTime.json b/test/liveValidation/payloads/dateTime.json
@@ -74,7 +74,9 @@
         "validationEnvironment": false,
         "ring": null,
         "registrationInfo": {
+          "timeType": "RemindDueDate",
           "expirationTime": "2024-02-29T02:33:35",
+          "remindTime": "2024-01-29T02:33:35",
           "token": "a",
           "registrationTokenOperation": "Update"
         },

diff --git a/...Virtualization/desktopvirtualization.json → ...urce-manager/Microsoft.DateTime/test.json b/...Virtualization/desktopvirtualization.json → ...urce-manager/Microsoft.DateTime/test.json
@@ -474,10 +474,34 @@
         }
       }
     },
+    "RemindDueDate": {
+      "description": "Remind the due date of registration.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/RegistrationInfo"
+        }
+      ],
+      "properties": {
+        "remindTime": {
+          "format": "date-time",
+          "type": "string",
+          "description": "Remind time of registration due date."
+        }
+      },
+      "x-ms-discriminator-value": "RemindDueDate"
+    },
     "RegistrationInfo": {
       "description": "Represents a RegistrationInfo definition.",
       "type": "object",
+      "required": [
+        "timeType"
+      ],
       "properties": {
+        "timeType": {
+          "description": "Type of time.",
+          "type": "string"
+        },
         "expirationTime": {
           "format": "date-time",
           "type": "string",
@@ -501,7 +525,8 @@
           "description": "The type of resetting the token.",
           "x-nullable": false
         }
-      }
+      },
+      "discriminator": "timeType"
     },
     "MigrationRequestProperties": {
       "type": "object",

diff --git a/test/liveValidatorTests.ts b/test/liveValidatorTests.ts
@@ -1037,7 +1037,7 @@ describe("Live Validator", () => {
         isPathCaseSensitive: false,
         useRelativeSourceLocationUrl: true,
         swaggerPathsPattern: [
-          "specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/*.json",
+          "specification/date-time/resource-manager/Microsoft.DateTime/test.json",
         ],
         git: {
           shouldClone: false,