fix: out-of-band service type

Signed-off-by: Timo Glastra <[email protected]>
didx-xyz · Feb 24, 2022 · aa79b84 · aa79b84
1 parent 8ae07b9
commit aa79b84
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/aries_cloudcontroller/model/invitation_message.py b/aries_cloudcontroller/model/invitation_message.py
@@ -32,7 +32,7 @@ class InvitationMessage(BaseModel):
     requestsattach: Optional[List[AttachDecorator]] = Field(
         None, alias="requests~attach"
     )
-    services: Optional[List[Dict]] = None
+    services: Optional[List[Union[Dict, str]]] = None
 
     def __init__(
         self,
@@ -42,7 +42,7 @@ def __init__(
         handshake_protocols: Optional[List[str]] = None,
         label: Optional[str] = None,
         requestsattach: Optional[List[AttachDecorator]] = None,
-        services: Optional[List[Dict]] = None,
+        services: Optional[List[Union[Dict, str]]] = None,
         **kwargs,
     ):
         super().__init__(

diff --git a/generator/data/openapi.patch b/generator/data/openapi.patch
@@ -1,5 +1,5 @@
 diff --git a/generator/data/openapi.yml b/generator/data/openapi.yml
-index 29a1393..c86cd31 100644
+index 29a1393..7fea529 100644
 --- a/generator/data/openapi.yml
 +++ b/generator/data/openapi.yml
 @@ -710,7 +710,9 @@ paths:
@@ -157,7 +157,22 @@ index 29a1393..c86cd31 100644
            example: 1640995199
      IndyRevRegDef:
        type: object
-@@ -7652,6 +7646,8 @@ components:
+@@ -6705,9 +6699,11 @@ components:
+             type: string
+           - did:sov:WgWxqztrNooG92RXvxSTWv
+           items:
+-            type: object
+-            description: Either a DIDComm service object (as per RFC0067) or a DID
+-              string.
++            oneOf:
++              - type: object
++                description: Either a DIDComm service object (as per RFC0067) or a DID
++                  string.
++              - type: string
+     InvitationRecord:
+       type: object
+       properties:
+@@ -7652,6 +7648,8 @@ components:
            example: 0
      RevRegResult:
        type: object
@@ -166,15 +181,15 @@ index 29a1393..c86cd31 100644
        properties:
          result:
            $ref: '#/components/schemas/IssuerRevRegRecord'
-@@ -7819,6 +7815,7 @@ components:
+@@ -7819,6 +7817,7 @@ components:
      SchemaSendResult:
        required:
        - schema_id
 +      - schema
        type: object
        properties:
          schema:
-@@ -7969,10 +7966,7 @@ components:
+@@ -7969,10 +7968,7 @@ components:
          mechanism:
            type: string
          time:
@@ -185,31 +200,31 @@ index 29a1393..c86cd31 100644
            example: 1640995199
      TAAInfo:
        type: object
-@@ -8127,6 +8121,7 @@ components:
+@@ -8127,6 +8123,7 @@ components:
            example: 2021-12-31 23:59:59+00:00
      TxnOrCredentialDefinitionSendResult:
        type: object
 +      additionalProperties: false
        properties:
          sent:
            $ref: '#/components/schemas/CredentialDefinitionSendResult'
-@@ -8137,6 +8132,7 @@ components:
+@@ -8137,6 +8134,7 @@ components:
            - $ref: '#/components/schemas/TransactionRecord'
      TxnOrPublishRevocationsResult:
        type: object
 +      additionalProperties: false
        properties:
          sent:
            $ref: '#/components/schemas/PublishRevocations'
-@@ -8147,6 +8143,7 @@ components:
+@@ -8147,6 +8145,7 @@ components:
            - $ref: '#/components/schemas/TransactionRecord'
      TxnOrRevRegResult:
        type: object
 +      additionalProperties: false
        properties:
          sent:
            $ref: '#/components/schemas/RevRegResult'
-@@ -8157,6 +8154,7 @@ components:
+@@ -8157,6 +8156,7 @@ components:
            - $ref: '#/components/schemas/TransactionRecord'
      TxnOrSchemaSendResult:
        type: object

diff --git a/generator/data/openapi.yml b/generator/data/openapi.yml
@@ -6699,9 +6699,11 @@ components:
             type: string
           - did:sov:WgWxqztrNooG92RXvxSTWv
           items:
-            type: object
-            description: Either a DIDComm service object (as per RFC0067) or a DID
-              string.
+            oneOf:
+              - type: object
+                description: Either a DIDComm service object (as per RFC0067) or a DID
+                  string.
+              - type: string
     InvitationRecord:
       type: object
       properties:

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@ def parse_requirements(filename: str):
 if __name__ == "__main__":
     setup(
         name=PACKAGE_NAME,
-        version="0.5.1",
+        version="0.5.2b1",
         description="A simple python package for controlling an aries agent through the admin-api interface",
         long_description=long_description,
         long_description_content_type="text/markdown",