Fix parent schema discriminator validation by MaggieKimani1 · Pull Request #951 · microsoft/OpenAPI.NET

MaggieKimani1 · Jul 21, 2022

Fixes #402

…the property name in the dicriminator

darrelmiller · Jul 30, 2022

The validation process needs to be recursive. The current check only validates direct children of the schema. The following example still fails.

openapi: 3.0.0
info:
  description: Service to test discriminator
  version: 1.0.0
  title: Test Service
servers:
  - url: 'https://localhost'
paths:
  /test:
    post:
      description: Sample post
      requestBody:
        required: true
        content:
          application/json:
            schema:
              $ref: '#/components/schemas/Parent'
      responses:
        '200':
          description: OK
          content:
            application/json:
              schema:
                $ref: '#/components/schemas/Parent'
components:
  schemas:
    Parent:
      type: object
      oneOf:
         - $ref: '#/components/schemas/ChildA'
         - $ref: '#/components/schemas/ChildB'
      discriminator:
         propertyName: type
    ChildA:
      allOf:
      - $ref: "#/components/schemas/BaseChild"
      - properties:
          AName:
            type: string
        type: object
    ChildB:
      allOf:
      - $ref: "#/components/schemas/BaseChild"
      - properties:
          BName:
           type: string
        type: object
    BaseChild:
      properties:
        type:
         type: string
      type: object

darrelmiller

The checking needs to be made recursive. See the example I included in the overview comments.

MaggieKimani1 · Aug 1, 2022

The checking needs to be made recursive. See the example I included in the overview comments.

Thanks for the correction. Resolving..

src/Microsoft.OpenApi/Validations/Rules/OpenApiSchemaRules.cs

MaggieKimani1 added 3 commits July 21, 2022 17:14

Add logic to check whether the properties of anyOf/oneOf/allOf match …

254b70f

…the property name in the dicriminator

Add test case

96cfc45

Update public Api

2b34d2d

MaggieKimani1 requested review from baywet, darrelmiller, irvinesunday, millicentachieng, peombwa and zengin as code owners July 21, 2022 14:25

Remove whitespace

6af10c2

darrelmiller requested changes Jul 30, 2022

View reviewed changes

Update the validation process to be recursive

5fd6039