Merge pull request #370 from TOMP-WG/dragonfly

Dragonfly
TOMP-WG · May 10, 2021 · bf9d10f · bf9d10f
2 parents 91ce96e + af47fd9
commit bf9d10f
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/TOMP-API.yaml b/TOMP-API.yaml
@@ -4,7 +4,7 @@ info:
   description:
     An API between MaaS providers and transport operators for booking trips and corresponding assets.
     <p>The documentation (examples, process flows and sequence diagrams) can be found at <a href="https://github.com/TOMP-WG/TOMP-API/">github</a>.
-  version: "1.2.0"
+  version: "1.2.1"
   license:
     name: Apache 2.0
     url: "http://www.apache.org/licenses/LICENSE-2.0.html"
@@ -3246,26 +3246,34 @@ components:
           type: string
           example: QR-code
         tokenData:
-          oneOf: 
-            - $ref: "#/components/schemas/tokenDefault"
-            - $ref: "#/components/schemas/tokenDeeplink"
-            - $ref: "#/components/schemas/tokenEKey"
-            - $ref: "#/components/schemas/tokenQR"
-            - $ref: "#/components/schemas/tokenEmpty"
+          $ref: "#/components/schemas/tokenData"
 
     tokenArray:
       type: array
       items:
         $ref: "#/components/schemas/token"
 
+    tokenData:
+      discriminator:
+        propertyName: tokenType
+      additionalProperties: true
+      required:
+        - tokenType
+      properties:
+        tokenType:
+          $ref: '#/components/schemas/assetAccessMethods'
+
     tokenDefault:
-      description: Arbitrary data the TO may pass along the ticket to the client (e.g. a booking code, base64 encoded binary, QR code), later will be one of several types
+      description: Arbitrary data the TO may pass along the ticket to the client
       type: object
-      additionalProperties: true
+      allOf:
+        - $ref: "#/components/schemas/tokenData"
 
     tokenDeeplink:
       type: object
       description: deeplink info
+      allOf:
+        - $ref: "#/components/schemas/tokenData"
       properties:
         url:
           description: the base deeplink url for the MP app. Can be extended by
@@ -3285,10 +3293,12 @@ components:
 
     tokenEKey:
       type: object
-      required:
-      - ekey
-      - lock
       description: Axa EKey information
+      allOf:
+        - $ref: "#/components/schemas/tokenData"
+      required:
+        - ekey
+        - lock
       properties:
         ekey: 
           type: object
@@ -3309,15 +3319,13 @@ components:
               description: how it advertises itself
               type: string
 
-    tokenEmpty:
-      type: object
-      description: For anonymous access information
-
     tokenQR:
       type: object
-      required:
-      - base64
       description: QR information
+      allOf:
+        - $ref: "#/components/schemas/tokenData"
+      required:
+        - base64
       properties:
         base64: 
           description: base 64 QR code