Merge branch 'main' into next

# Conflicts: # packages/remote-server/src/web-did-doc-router.ts
decentralized-identity · May 30, 2022 · b9ad655 · b9ad655
2 parents 6f53564 + 782f64a
commit b9ad655
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/packages/remote-server/src/web-did-doc-router.ts b/packages/remote-server/src/web-did-doc-router.ts
@@ -54,10 +54,7 @@ export const WebDidDocRouter = (options: WebDidDocRouterOptions): Router => {
       authentication: signingKeyIds,
       assertionMethod: signingKeyIds,
       keyAgreement: keyAgreementKeyIds,
-      service:
-        typeof options?.services === 'undefined'
-          ? identifier.services
-          : [...options.services, ...identifier.services],
+      service: [...(options?.services || []), ...(identifier?.services || [])],
     }
 
     return didDoc