@nmshd/transport 1.1.6 → 1.1.10

package/lib-web/nmshd.transport.js

@@ -15,11 +15,11 @@ exports.buildInformation = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 exports.buildInformation = {
-    version: "1.1.6",
-    build: "18",
-    date: "2022-01-18T13:52:13+00:00",
-    commit: "c09b6d27bdbb5c6a8e4ef80024e5f10a36379b92",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.1.1","axios":"^0.25.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.3.0","qs":"^6.10.3","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
+    version: "1.1.10",
+    build: "22",
+    date: "2022-02-21T10:57:30+00:00",
+    commit: "c5a9ae56d5ed7ce0dd69a16080babe841ceed26d",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.1","@js-soft/ts-utils":"1.1.1","axios":"^0.26.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.3.0","qs":"^6.10.3","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -4103,51 +4103,45 @@ class ChallengeController extends TransportController_1.TransportController {
         this.authClient = new ChallengeAuthClient_1.ChallengeAuthClient(this.config, this.parent.authenticator);
         return this;
     }
-    async verifyChallengeLocally(challenge, signedChallenge) {
-        if (!challenge.createdBy) {
-            return;
-        }
+    async validateChallengeLocally(challenge, signedChallenge) {
+        if (!challenge.createdBy)
+            return { isValid: false };
         const relationship = await this.parent.relationships.getActiveRelationshipToIdentity(challenge.createdBy);
         if (!relationship) {
             throw core_1.TransportErrors.general.recordNotFound(Relationship_1.Relationship, challenge.createdBy.toString());
         }
         const challengeBuffer = crypto_1.CoreBuffer.fromUtf8(signedChallenge.challenge);
-        let verified = false;
+        let isValid = false;
         switch (challenge.type) {
             case Challenge_1.ChallengeType.Identity:
-                verified = await this.parent.relationships.verifyIdentity(relationship, challengeBuffer, signedChallenge.signature);
+                isValid = await this.parent.relationships.verifyIdentity(relationship, challengeBuffer, signedChallenge.signature);
                 break;
             case Challenge_1.ChallengeType.Device:
                 throw core_1.TransportErrors.general.notImplemented().logWith(this._log);
             case Challenge_1.ChallengeType.Relationship:
-                verified = await this.parent.relationships.verify(relationship, challengeBuffer, signedChallenge.signature);
+                isValid = await this.parent.relationships.verify(relationship, challengeBuffer, signedChallenge.signature);
                 break;
         }
-        if (!verified) {
-            return;
-        }
-        return relationship;
+        if (!isValid)
+            return { isValid: false };
+        return { isValid: true, correspondingRelationship: relationship };
     }
-    async checkChallenge(signedChallenge, requiredType) {
+    async validateChallenge(signedChallenge, requiredType) {
         const challenge = await Challenge_1.Challenge.deserialize(signedChallenge.challenge);
-        if (requiredType && challenge.type !== requiredType) {
-            return;
-        }
-        if (challenge.expiresAt.isExpired()) {
-            return;
-        }
-        const [relationship, response] = await Promise.all([
-            this.verifyChallengeLocally(challenge, signedChallenge),
-            this.authClient.getChallenge(challenge.id.toString())
-        ]);
-        if (!relationship ||
-            (challenge.createdBy && response.value.createdBy !== challenge.createdBy.toString()) ||
+        if (requiredType && challenge.type !== requiredType)
+            return { isValid: false };
+        if (challenge.expiresAt.isExpired())
+            return { isValid: false };
+        const backboneChallengeResponse = await this.authClient.getChallenge(challenge.id.toString());
+        if (backboneChallengeResponse.isError)
+            return { isValid: false };
+        if ((challenge.createdBy && backboneChallengeResponse.value.createdBy !== challenge.createdBy.toString()) ||
             // TODO: JSSNMSHDD-2472 (Reenable check once the backbone returns with same timestamp)
             // response.expiresAt !== challenge.expiresAt.toString() ||
-            response.value.id !== challenge.id.toString()) {
-            return;
+            backboneChallengeResponse.value.id !== challenge.id.toString()) {
+            return { isValid: false };
         }
-        return relationship;
+        return await this.validateChallengeLocally(challenge, signedChallenge);
     }
     async createAccountCreationChallenge(identity) {
         const backboneResponse = (await this.client.createChallenge()).value;
@@ -5252,29 +5246,12 @@ class FileController extends TransportController_1.TransportController {
         if (ids.length < 1) {
             return [];
         }
+        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
+        const resultItems = (await this.client.getFiles({ ids })).value;
         const promises = [];
-        for (const id of ids) {
-            const result = await this.client.getFile(id);
-            if (result.isError) {
-                if (result.error.code === "error.transport.recordNotFound" ||
-                    result.error.code === "error.transport.request.notFound" ||
-                    result.error.code === "error.platform.recordNotFound") {
-                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
-                    continue;
-                }
-                throw result.error;
-            }
-            const resultItem = result.value;
-            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem));
-        }
-        /*
-        // TODO: Optimize once backbone handling is clarified
-        const resultItems = (await this.client.getFiles({ ids })).value
-        const promises = []
         for await (const resultItem of resultItems) {
-            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem))
+            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem));
         }
-        */
         return await Promise.all(promises);
     }
     async updateCacheOfExistingFileInDb(id, response) {
@@ -7160,29 +7137,12 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         if (ids.length < 1) {
             return [];
         }
+        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
+        const resultItems = (await this.client.getRelationshipTemplates({ ids })).value;
         const promises = [];
-        for (const id of ids) {
-            const result = await this.client.getRelationshipTemplate(id);
-            if (result.isError) {
-                if (result.error.code === "error.transport.recordNotFound" ||
-                    result.error.code === "error.transport.request.notFound" ||
-                    result.error.code === "error.platform.recordNotFound") {
-                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
-                    continue;
-                }
-                throw result.error;
-            }
-            const resultItem = result.value;
-            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem));
-        }
-        /*
-        // TODO: Optimize once backbone handling is clarified
-        const resultItems = (await this.client.getRelationshipTemplates({ ids })).value
-        const promises = []
         for await (const resultItem of resultItems) {
-            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem))
+            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem));
         }
-        */
         return await Promise.all(promises);
     }
     async fetchCaches(ids) {
@@ -11067,30 +11027,14 @@ class TokenController extends TransportController_1.TransportController {
         if (ids.length < 1) {
             return [];
         }
+        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
+        const resultItems = (await this.client.getTokens({ ids })).value;
         const promises = [];
-        for (const id of ids) {
-            const result = await this.client.getToken(id);
-            if (result.isError) {
-                if (result.error.code === "error.transport.recordNotFound" ||
-                    result.error.code === "error.transport.request.notFound" ||
-                    result.error.code === "error.platform.recordNotFound") {
-                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
-                    continue;
-                }
-                throw result.error;
-            }
-            const resultItem = result.value;
-            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem));
-        }
-        /*
-        // TODO: Optimize once backbone handling is clarified
-        const resultItems = (await this.client.getTokens({ ids })).value
-        const promises = []
         for await (const resultItem of resultItems) {
-            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem))
+            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem));
         }
-        */
-        return await Promise.all(promises);
+        const isToken = (item) => !!item;
+        return (await Promise.all(promises)).filter(isToken);
     }
     async fetchCaches(ids) {
         if (ids.length === 0)
@@ -11106,7 +11050,8 @@ class TokenController extends TransportController_1.TransportController {
     async updateCacheOfExistingTokenInDb(id, response) {
         const tokenDoc = await this.tokens.read(id);
         if (!tokenDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
+            core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
+            return;
         }
         const token = await Token_1.Token.from(tokenDoc);
         await this.updateCacheOfToken(token, response);
@@ -11149,7 +11094,16 @@ class TokenController extends TransportController_1.TransportController {
     async loadPeerToken(id, secretKey, ephemeral) {
         const tokenDoc = await this.tokens.read(id.toString());
         if (tokenDoc) {
-            return await this.updateCacheOfExistingTokenInDb(id.toString());
+            let token = await Token_1.Token.from(tokenDoc);
+            if (token.cache) {
+                return token;
+            }
+            token = await this.updateCacheOfExistingTokenInDb(id.toString());
+            if (!token) {
+                // This should not happen, we only update the cache if we found the tokenDoc
+                throw new Error(`Tried to update a token (with ID: '${id.toString()}') that doesn't exist in the local database.`);
+            }
+            return token;
         }
         const token = await Token_1.Token.from({
             id: id,
@@ -12081,7 +12035,7 @@ class SimpleLogger {
             if (arg instanceof Error) {
                 return (_a = arg.stack) !== null && _a !== void 0 ? _a : `${arg.name}: ${arg.message}`;
             }
-            return json_stringify_safe_1.default(arg);
+            return (0, json_stringify_safe_1.default)(arg);
         })
             .join("\n");
         return { msg: message };
@@ -13151,10 +13105,6 @@ Axios.prototype.request = function request(configOrUrl, config) {
     config = configOrUrl || {};
   }
 
-  if (!config.url) {
-    throw new Error('Provided config url is not valid');
-  }
-
   config = mergeConfig(this.defaults, config);
 
   // Set config.method
@@ -13237,9 +13187,6 @@ Axios.prototype.request = function request(configOrUrl, config) {
 };
 
 Axios.prototype.getUri = function getUri(config) {
-  if (!config.url) {
-    throw new Error('Provided config url is not valid');
-  }
   config = mergeConfig(this.defaults, config);
   return buildURL(config.url, config.params, config.paramsSerializer).replace(/^\?/, '');
 };
@@ -13880,7 +13827,7 @@ module.exports = defaults;
 /***/ ((module) => {
 
 module.exports = {
-  "version": "0.25.0"
+  "version": "0.26.0"
 };
 
 /***/ }),