fix: throw more semantic UnknownAuthor on identity not found

tradle · Jan 4, 2018 · d1567fb · d1567fb
1 parent 888d47d
commit d1567fb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/lib/bot/middleware/oniotmessage.js b/lib/bot/middleware/oniotmessage.js
diff --git a/lib/errors.js b/lib/errors.js
diff --git a/lib/identities.js b/lib/identities.js
diff --git a/src/bot/middleware/oniotmessage.ts b/src/bot/middleware/oniotmessage.ts
@@ -99,7 +99,7 @@ export const createErrorHandler = (lambda, opts) => {
       if (error instanceof Errors.TimeTravel) {
         logMsg = 'rejecting message with lower timestamp than previous'
         // @ts-ignore
-      } else if (error instanceof Errors.NotFound) {
+      } else if (error instanceof Errors.NotFound || error instanceof Errors.UnknownAuthor) {
         logMsg = 'rejecting message, either sender or payload identity was not found'
         // @ts-ignore
       } else if (error instanceof Errors.InvalidMessageFormat) {

diff --git a/src/errors.ts b/src/errors.ts
@@ -123,6 +123,7 @@ const errors = {
   NotFound: createError('NotFound'),
   InvalidSignature: createError('InvalidSignature'),
   InvalidAuthor: createError('InvalidAuthor'),
+  UnknownAuthor: createError('UnknownAuthor'),
   InvalidVersion: createError('InvalidVersion'),
   InvalidMessageFormat: createError('InvalidMessageFormat'),
   PutFailed: createError('PutFailed'),

diff --git a/src/identities.ts b/src/identities.ts
@@ -44,10 +44,15 @@ export default class Identities {
 
   public metaByPub = async (pub:string) => {
     this.logger.debug('get identity metadata by pub', pub)
-    return this.pubKeys.get({
-      Key: { pub },
-      ConsistentRead: true
-    })
+    try {
+      return await this.pubKeys.get({
+        Key: { pub },
+        ConsistentRead: true
+      })
+    } catch (err) {
+      Errors.ignore(err, Errors.NotFound)
+      throw new Errors.UnknownAuthor(`with pub: ${pub}`)
+    }
   }
 
   public byPub = async (pub:string):Promise<IIdentity> => {
@@ -60,7 +65,7 @@ export default class Identities {
         error: err.stack
       })
 
-      throw new NotFound('identity with pub: ' + pub)
+      throw new Errors.UnknownAuthor('with pub: ' + pub)
     }
   }