wip: filtering error logging in service handlers

#304
MatrixAI · Jun 2, 2022 · aba5c97 · aba5c97
1 parent 8a230fc
commit aba5c97
Show file tree

Hide file tree

Showing 45 changed files with 444 additions and 216 deletions.
diff --git a/src/client/service/gestaltsActionsSetByIdentity.ts b/src/client/service/gestaltsActionsSetByIdentity.ts
@@ -68,10 +68,12 @@ function gestaltsActionsSetByIdentity({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      clientUtils.logServerError(logger, e, [
-        gestaltsErrors.ErrorGestaltsGraphIdentityIdMissing,
-        gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
-      ]);
+      clientUtils.logServerError(logger, e, {
+        ErrorGestaltsGraphIdentityIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphIdentityIdMissing,
+        ErrorGestaltsGraphNodeIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/gestaltsActionsSetByNode.ts b/src/client/service/gestaltsActionsSetByNode.ts
@@ -54,9 +54,10 @@ function gestaltsActionsSetByNode({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      clientUtils.logServerError(logger, e, [
-        gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
-      ]);
+      clientUtils.logServerError(logger, e, {
+        ErrorGestaltsGraphNodeIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/gestaltsActionsUnsetByIdentity.ts b/src/client/service/gestaltsActionsUnsetByIdentity.ts
@@ -68,10 +68,12 @@ function gestaltsActionsUnsetByIdentity({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      clientUtils.logServerError(logger, e, [
-        gestaltsErrors.ErrorGestaltsGraphIdentityIdMissing,
-        gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
-      ]);
+      clientUtils.logServerError(logger, e, {
+        ErrorGestaltsGraphIdentityIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphIdentityIdMissing,
+        ErrorGestaltsGraphNodeIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/gestaltsActionsUnsetByNode.ts b/src/client/service/gestaltsActionsUnsetByNode.ts
@@ -54,9 +54,10 @@ function gestaltsActionsUnsetByNode({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      clientUtils.logServerError(logger, e, [
-        gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
-      ]);
+      clientUtils.logServerError(logger, e, {
+        ErrorGestaltsGraphNodeIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/gestaltsGestaltTrustByIdentity.ts b/src/client/service/gestaltsGestaltTrustByIdentity.ts
@@ -84,10 +84,12 @@ function gestaltsGestaltTrustByIdentity({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      clientUtils.logServerError(logger, e, [
-        gestaltsErrors.ErrorGestaltsGraphIdentityIdMissing,
-        gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
-      ]);
+      clientUtils.logServerError(logger, e, {
+        ErrorGestaltsGraphIdentityIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphIdentityIdMissing,
+        ErrorGestaltsGraphNodeIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/gestaltsGestaltTrustByNode.ts b/src/client/service/gestaltsGestaltTrustByNode.ts
@@ -9,9 +9,11 @@ import type Logger from '@matrixai/logger';
 import { validateSync } from '../../validation';
 import { matchSync } from '../../utils';
 import * as grpcUtils from '../../grpc/utils';
+import * as gestaltsErrors from '../../gestalts/errors';
 import * as validationUtils from '../../validation/utils';
 import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import * as nodesUtils from '../../nodes/utils';
+import * as clientUtils from '../utils';
 
 function gestaltsGestaltTrustByNode({
   authenticate,
@@ -69,7 +71,10 @@ function gestaltsGestaltTrustByNode({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e, {
+        ErrorGestaltsGraphNodeIdMissing:
+          gestaltsErrors.ErrorGestaltsGraphNodeIdMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/identitiesAuthenticate.ts b/src/client/service/identitiesAuthenticate.ts
@@ -9,6 +9,7 @@ import { validateSync } from '../../validation';
 import * as validationUtils from '../../validation/utils';
 import { matchSync, never } from '../../utils';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 function identitiesAuthenticate({
   authenticate,
@@ -74,7 +75,9 @@ function identitiesAuthenticate({
       return;
     } catch (e) {
       await genWritable.throw(e);
-      logger.error(e);
+      clientUtils.logServerError(logger, e, {
+        ErrorProviderMissing: identitiesErrors.ErrorProviderMissing,
+      });
       return;
     }
   };

diff --git a/src/client/service/identitiesAuthenticatedGet.ts b/src/client/service/identitiesAuthenticatedGet.ts
@@ -8,6 +8,7 @@ import { matchSync } from '../../utils';
 import * as grpcUtils from '../../grpc/utils';
 import * as validationUtils from '../../validation/utils';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 function identitiesAuthenticatedGet({
   authenticate,
@@ -63,7 +64,7 @@ function identitiesAuthenticatedGet({
       return;
     } catch (e) {
       await genWritable.throw(e);
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/identitiesClaim.ts b/src/client/service/identitiesClaim.ts
@@ -14,6 +14,7 @@ import { validateSync } from '../../validation';
 import * as validationUtils from '../../validation/utils';
 import { matchSync } from '../../utils';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 /**
  * Augments the keynode with a new identity.
@@ -92,7 +93,11 @@ function identitiesClaim({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e, {
+        ErrorProviderMissing: identitiesErrors.ErrorProviderMissing,
+        ErrorProviderUnauthenticated:
+          identitiesErrors.ErrorProviderUnauthenticated,
+      });
       return;
     }
   };

diff --git a/src/client/service/identitiesInfoConnectedGet.ts b/src/client/service/identitiesInfoConnectedGet.ts
@@ -13,6 +13,7 @@ import * as grpcUtils from '../../grpc/utils';
 import * as validationUtils from '../../validation/utils';
 import * as identitiesErrors from '../../identities/errors';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 function identitiesInfoConnectedGet({
   authenticate,
@@ -119,7 +120,11 @@ function identitiesInfoConnectedGet({
       return;
     } catch (e) {
       await genWritable.throw(e);
-      logger.error(e);
+      clientUtils.logServerError(logger, e, {
+        ErrorProviderMissing: identitiesErrors.ErrorProviderMissing,
+        ErrorProviderUnauthenticated:
+          identitiesErrors.ErrorProviderUnauthenticated,
+      });
       return;
     }
   };

diff --git a/src/client/service/identitiesInfoGet.ts b/src/client/service/identitiesInfoGet.ts
@@ -14,6 +14,7 @@ import * as validationUtils from '../../validation/utils';
 import * as identitiesUtils from '../../identities/utils';
 import * as identitiesErrors from '../../identities/errors';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 function identitiesInfoGet({
   authenticate,
@@ -112,7 +113,11 @@ function identitiesInfoGet({
       return;
     } catch (e) {
       await genWritable.throw(e);
-      logger.error(e);
+      clientUtils.logServerError(logger, e, {
+        ErrorProviderMissing: identitiesErrors.ErrorProviderMissing,
+        ErrorProviderUnauthenticated:
+          identitiesErrors.ErrorProviderUnauthenticated,
+      });
       return;
     }
   };

diff --git a/src/client/service/identitiesProvidersList.ts b/src/client/service/identitiesProvidersList.ts
@@ -5,6 +5,7 @@ import type * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 function identitiesProvidersList({
   authenticate,
@@ -29,7 +30,7 @@ function identitiesProvidersList({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/identitiesTokenDelete.ts b/src/client/service/identitiesTokenDelete.ts
@@ -10,6 +10,7 @@ import { validateSync } from '../../validation';
 import * as validationUtils from '../../validation/utils';
 import { matchSync } from '../../utils';
 import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
+import * as clientUtils from '../utils';
 
 function identitiesTokenDelete({
   authenticate,
@@ -56,7 +57,7 @@ function identitiesTokenDelete({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/identitiesTokenGet.ts b/src/client/service/identitiesTokenGet.ts
@@ -9,6 +9,7 @@ import { validateSync } from '../../validation';
 import * as validationUtils from '../../validation/utils';
 import { matchSync } from '../../utils';
 import * as identitiesPB from '../../proto/js/polykey/v1/identities/identities_pb';
+import * as clientUtils from '../utils';
 
 function identitiesTokenGet({
   authenticate,
@@ -56,7 +57,7 @@ function identitiesTokenGet({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/identitiesTokenPut.ts b/src/client/service/identitiesTokenPut.ts
@@ -10,6 +10,7 @@ import { validateSync } from '../../validation';
 import * as validationUtils from '../../validation/utils';
 import { matchSync } from '../../utils';
 import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
+import * as clientUtils from '../utils';
 
 function identitiesTokenPut({
   authenticate,
@@ -66,7 +67,7 @@ function identitiesTokenPut({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysCertsChainGet.ts b/src/client/service/keysCertsChainGet.ts
@@ -5,6 +5,7 @@ import type * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
+import * as clientUtils from '../utils';
 
 function keysCertsChainGet({
   authenticate,
@@ -33,7 +34,7 @@ function keysCertsChainGet({
       return;
     } catch (e) {
       await genWritable.throw(e);
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysCertsGet.ts b/src/client/service/keysCertsGet.ts
@@ -5,6 +5,7 @@ import type * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
+import * as clientUtils from '../utils';
 
 function keysCertsGet({
   authenticate,
@@ -29,7 +30,7 @@ function keysCertsGet({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysDecrypt.ts b/src/client/service/keysDecrypt.ts
@@ -4,6 +4,7 @@ import type KeyManager from '../../keys/KeyManager';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
+import * as clientUtils from '../utils';
 
 function keysDecrypt({
   authenticate,
@@ -30,7 +31,7 @@ function keysDecrypt({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysEncrypt.ts b/src/client/service/keysEncrypt.ts
@@ -4,6 +4,7 @@ import type KeyManager from '../../keys/KeyManager';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
+import * as clientUtils from '../utils';
 
 function keysEncrypt({
   authenticate,
@@ -30,7 +31,7 @@ function keysEncrypt({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysKeyPairRenew.ts b/src/client/service/keysKeyPairRenew.ts
@@ -5,6 +5,7 @@ import type * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
+import * as clientUtils from '../utils';
 
 function keysKeyPairRenew({
   authenticate,
@@ -30,7 +31,7 @@ function keysKeyPairRenew({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysKeyPairReset.ts b/src/client/service/keysKeyPairReset.ts
@@ -5,6 +5,7 @@ import type * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
+import * as clientUtils from '../utils';
 
 function keysKeyPairReset({
   authenticate,
@@ -30,7 +31,7 @@ function keysKeyPairReset({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };

diff --git a/src/client/service/keysKeyPairRoot.ts b/src/client/service/keysKeyPairRoot.ts
@@ -5,6 +5,7 @@ import type * as utilsPB from '../../proto/js/polykey/v1/utils/utils_pb';
 import type Logger from '@matrixai/logger';
 import * as grpcUtils from '../../grpc/utils';
 import * as keysPB from '../../proto/js/polykey/v1/keys/keys_pb';
+import * as clientUtils from '../utils';
 
 function keysKeyPairRoot({
   authenticate,
@@ -30,7 +31,7 @@ function keysKeyPairRoot({
       return;
     } catch (e) {
       callback(grpcUtils.fromError(e));
-      logger.error(e);
+      clientUtils.logServerError(logger, e);
       return;
     }
   };