chore: cleaned up error reporting

Author: aryanjassal

src/client/callers/authSignToken.ts

@@ -1,5 +1,5 @@
 import type { HandlerTypes } from '@matrixai/rpc';
-import type AuthSignToken from '../handlers/AgentLockAll.js';
+import type AuthSignToken from '../handlers/AuthSignToken.js';
 import { UnaryCaller } from '@matrixai/rpc';
 
 type CallerTypes = HandlerTypes<AuthSignToken>;

src/client/errors.ts

@@ -53,7 +53,7 @@ class ErrorClientVerificationFailed<T> extends ErrorClientService<T> {
 class ErrorAuthentication<T> extends ErrorPolykey<T> {}
 
 class ErrorAuthenticationInvalidToken<T> extends ErrorAuthentication<T> {
-  static description = 'Incoming token does not match its signature';
+  static description = 'Token is invalid';
   exitCode = sysexits.PROTOCOL;
 }
 

src/client/handlers/AuthSignToken.ts

@@ -12,6 +12,7 @@ import { UnaryHandler } from '@matrixai/rpc';
 import Token from '../../tokens/Token.js';
 import * as clientErrors from '../errors.js';
 import * as nodesUtils from '../../nodes/utils.js';
+import * as tokensUtils from '../../tokens/utils.js';
 
 class AuthSignToken extends UnaryHandler<
   {
@@ -27,12 +28,23 @@ class AuthSignToken extends UnaryHandler<
 
     // Get and verify incoming node
     const inputToken = { payload: input.payload, signatures: input.signatures };
-    const incomingToken = Token.fromEncoded<IdentityRequestData>(inputToken);
+    const incomingToken = Token.fromEncoded<TokenIdentityRequest>(inputToken);
+    const inputPayload = tokensUtils.parseTokenPayload<IdentityRequestData>(
+      inputToken.payload,
+    );
+    if (!('publicKey' in inputPayload)) {
+      throw new clientErrors.ErrorAuthenticationInvalidToken(
+        'Input token does not contain public key',
+      );
+    }
     const incomingPublicKey = Buffer.from(
-      incomingToken.payload.publicKey,
+      inputPayload.publicKey,
+      'base64url',
     ) as PublicKey;
     if (!incomingToken.verifyWithPublicKey(incomingPublicKey)) {
-      throw new clientErrors.ErrorAuthenticationInvalidToken();
+      throw new clientErrors.ErrorAuthenticationInvalidToken(
+        'Incoming token does not match its signature',
+      );
     }
 
     // Create the outgoing token with the incoming token integrated into the

src/network/utils.ts

@@ -477,7 +477,10 @@ function fromError(error: any) {
     // serialising only the error type, message and its stack.
     const wrappedError = new errors.ErrorPolykeyUnexpected(
       `Unexpected error occurred: ${error.name}`,
-      { cause: error },
+      {
+        cause: error,
+        data: { message: 'message' in error ? error.message : undefined },
+      },
     );
     return wrappedError.toJSON();
   }