Corrected adding HTTP service

sicpa-dlab · Aug 22, 2022 · 8f6140c · 8f6140c
1 parent 677eaa0
commit 8f6140c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 25 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,7 +2,7 @@
   "name": "@sicpa-dlab/aries-framework-core",
   "main": "build/index",
   "types": "build/index",
-  "version": "0.1.52",
+  "version": "0.1.53",
   "files": [
     "build"
   ],

diff --git a/packages/core/src/modules/dids/services/DidService.ts b/packages/core/src/modules/dids/services/DidService.ts
@@ -134,40 +134,37 @@ export class DidService {
       .addAuthentication(getEd25519VerificationMethod({ controller: '', id: '', key: params.ed25519Key }))
       .addKeyAgreement(getX25519VerificationMethod({ controller: '', id: '', key: params.x25519Key }))
 
-    for (const transport of params.transports) {
-      if (transport === Transports.HTTP || transport === Transports.HTTPS) {
-        if (params.needMediation) {
-          mediator = await this.mediationRecipientService.findDefaultMediator()
-          if (mediator && mediator.endpoint && params.needMediation) {
-            didDocumentBuilder.addService(
-              new DidCommV2Service({
-                id: transport,
-                serviceEndpoint: mediator.endpoint,
-                routingKeys: mediator.routingKeys,
-              })
-            )
-          }
-        } else if (params.endpoint) {
+    if (params.transports.includes(Transports.HTTP) || params.transports.includes(Transports.HTTPS)) {
+      if (params.needMediation) {
+        mediator = await this.mediationRecipientService.findDefaultMediator()
+        if (mediator && mediator.endpoint && params.needMediation) {
           didDocumentBuilder.addService(
             new DidCommV2Service({
-              id: transport,
-              serviceEndpoint: params.endpoint,
-              routingKeys: [],
+              id: Transports.HTTP,
+              serviceEndpoint: mediator.endpoint,
+              routingKeys: mediator.routingKeys,
             })
           )
         }
-      }
-
-      if (transport === Transports.NFC) {
-        didDocumentBuilder.addService(new DidCommV2Service({ id: Transports.NFC, serviceEndpoint: Transports.NFC }))
-      }
-      if (transport === Transports.Nearby) {
+      } else if (params.endpoint) {
         didDocumentBuilder.addService(
-          new DidCommV2Service({ id: Transports.Nearby, serviceEndpoint: Transports.Nearby })
+          new DidCommV2Service({
+            id: Transports.HTTP,
+            serviceEndpoint: params.endpoint,
+            routingKeys: [],
+          })
         )
       }
     }
 
+    if (params.transports.includes(Transports.NFC)) {
+      didDocumentBuilder.addService(new DidCommV2Service({ id: Transports.NFC, serviceEndpoint: Transports.NFC }))
+    }
+
+    if (params.transports.includes(Transports.Nearby)) {
+      didDocumentBuilder.addService(new DidCommV2Service({ id: Transports.Nearby, serviceEndpoint: Transports.Nearby }))
+    }
+
     const didDocument = didDocumentBuilder.build()
     const didPeer =
       didDocument.service.length > 0