@unchainedshop/plugins 4.0.0-rc.15 → 4.0.0-rc.17

package/src/enrollments/licensed.ts

@@ -21,11 +21,12 @@ const LicensedEnrollments: IEnrollmentAdapter = {
   },
 
   actions: (params) => {
+    const { enrollment } = params;
     return {
       ...EnrollmentAdapter.actions(params),
 
       isValidForActivation: async () => {
-        const periods = params.enrollment?.periods || [];
+        const periods = enrollment?.periods || [];
         return periods.findIndex(rangeMatcher()) !== -1;
       },
 
@@ -36,8 +37,20 @@ const LicensedEnrollments: IEnrollmentAdapter = {
       configurationForOrder: async (context) => {
         const { period } = context;
         const beginningOfPeriod = period.start.getTime() <= new Date().getTime();
+
+        if (!enrollment) throw new Error('Enrollment missing in context');
         if (beginningOfPeriod) {
-          return context;
+          return {
+            period,
+            orderContext: {},
+            orderPositionTemplates: [
+              {
+                quantity: 1,
+                productId: enrollment.productId,
+                originalProductId: enrollment.productId,
+              },
+            ],
+          };
         }
         return null;
       },

package/src/files/gridfs/adapter.ts

@@ -36,7 +36,7 @@ export const GridFSAdapter: IFileAdapter<
   ...FileAdapter,
   async createDownloadURL(file, expiry) {
     // If public, just return the stored path from the db
-    if (!file?.meta?.isPrivate) return file?.url;
+    if (!file?.meta?.isPrivate) return file?.url || null;
 
     const expiryTimestamp =
       expiry ||

package/src/files/gridfs/handler-express.ts

@@ -10,7 +10,7 @@ import { getFileAdapter } from '@unchainedshop/core-files';
 
 const { ROOT_URL } = process.env;
 
-const logger = createLogger('unchained:plugins:gridfs');
+const logger = createLogger('unchained:gridfs');
 
 const gridfsHandler = async (
   req: express.Request & {
@@ -34,8 +34,7 @@ const gridfsHandler = async (
     res.setHeader('Access-Control-Allow-Origin', '*');
 
     if (req.method === 'OPTIONS') {
-      res.statusCode = 200;
-      res.end();
+      res.status(200).end();
       return;
     }
 
@@ -45,9 +44,14 @@ const gridfsHandler = async (
       const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
+
+        if (!file) {
+          res.status(404).send('File not found');
+          return;
+        }
+
         if (file.expires === null) {
-          res.statusCode = 400;
-          res.end('File already linked');
+          res.status(400).send('File already linked');
           return;
         }
         // If the type is octet-stream, prefer mimetype lookup from the filename
@@ -77,12 +81,10 @@ const gridfsHandler = async (
         const { length } = writeStream;
         await services.files.linkFile({ fileId, size: length, type });
 
-        res.statusCode = 200;
-        res.end();
+        res.status(200).end();
         return;
       }
-      res.statusCode = 403;
-      res.end();
+      res.status(403).end();
       return;
     }
 
@@ -94,22 +96,19 @@ const gridfsHandler = async (
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
-          res.statusCode = 403;
-          res.end('Access restricted: Expired.');
+          res.status(403).send('Access restricted: Expired.');
           return;
         }
 
         const fileUploadAdapter = getFileAdapter();
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
-        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
-          res.statusCode = 403;
-          res.end('Access restricted: Invalid signature.');
+        if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+          res.status(403).send('Access restricted: Invalid signature.');
           return;
         }
       } else if (!fileDocument) {
-        res.statusCode = 404;
-        res.end();
+        res.status(404).end();
         return;
       }
       if (file?.metadata?.['content-type']) {
@@ -122,21 +121,17 @@ const gridfsHandler = async (
       const readStream = await modules.gridfsFileUploads.createReadStream(directoryName, fileId);
       readStream.pipe(res, { end: false });
       await finished(readStream);
-      res.statusCode = 200;
-      res.end();
+      res.status(200).end();
       return;
     }
-    res.statusCode = 404;
-    res.end();
+    res.status(404).end();
   } catch (e) {
     if (e.code === 'ENOENT') {
       logger.warn(e);
-      res.statusCode = 404;
-      res.end(e.message);
+      res.status(404).send();
     } else {
       logger.warn(e);
-      res.statusCode = 503;
-      res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+      res.status(503).send({ name: e.name, code: e.code, message: e.message });
     }
   }
 };

package/src/files/gridfs/handler-fastify.ts

@@ -8,7 +8,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { getFileAdapter } from '@unchainedshop/core-files';
 
-const logger = createLogger('unchained:plugins:gridfs');
+const logger = createLogger('unchained:gridfs');
 
 const gridfsHandler: RouteHandlerMethod = async (
   req: FastifyRequest & {
@@ -39,9 +39,25 @@ const gridfsHandler: RouteHandlerMethod = async (
       const fileId = await buildHashedFilename(directoryName, fileName, expiryDate);
       if ((await sign(directoryName, fileId, expiryDate.getTime())) === signature) {
         const file = await modules.files.findFile({ fileId });
+
+        if (!file) {
+          reply.status(404);
+          logger.error('File not found', { fileId });
+          return reply.send({
+            success: false,
+            message: 'File not found',
+            name: 'FILE_NOT_FOUND',
+          });
+        }
+
         if (file.expires === null) {
           reply.status(400);
-          return reply.send('File already linked');
+          logger.error('File already linked', { fileId });
+          return reply.send({
+            success: false,
+            message: 'File already linked',
+            name: 'FILE_ALREADY_LINKED',
+          });
         }
         // If the type is octet-stream, prefer mimetype lookup from the filename
         // Else prefer the content-type header
@@ -72,11 +88,20 @@ const gridfsHandler: RouteHandlerMethod = async (
         await services.files.linkFile({ fileId, size: length, type });
 
         reply.status(200);
-        return reply.send();
+        return reply.send({
+          success: true,
+          fileId,
+          size: length,
+          type,
+        });
       }
-
+      logger.error('Invalid signature', { fileId, expiryDate });
       reply.status(403);
-      return reply.send();
+      return reply.send({
+        success: false,
+        message: 'Access restricted: Invalid signature.',
+        name: 'INVALID_SIGNATURE',
+      });
     }
 
     if (req.method === 'GET') {
@@ -87,18 +112,29 @@ const gridfsHandler: RouteHandlerMethod = async (
       if (fileDocument?.meta?.isPrivate) {
         const expiry = parseInt(expiryTimestamp as string, 10);
         if (expiry <= Date.now()) {
+          logger.error('URL Expired', { fileId, expiry });
           reply.status(403);
-          return reply.send('Access restricted: Expired.');
+          return reply.send({
+            success: false,
+            message: 'Access restricted: URL expired.',
+            name: 'URL_EXPIRED',
+          });
         }
 
         const fileUploadAdapter = getFileAdapter();
         const signedUrl = await fileUploadAdapter.createDownloadURL(fileDocument, expiry);
 
-        if (new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
+        if (!signedUrl || new URL(signedUrl, 'file://').searchParams.get('s') !== signature) {
           reply.status(403);
-          return reply.send('Access restricted: Invalid signature.');
+          logger.error('Invalid signature', { fileId, expiry });
+          return reply.send({
+            success: false,
+            message: 'Access restricted: Invalid signature.',
+            name: 'INVALID_SIGNATURE',
+          });
         }
       } else if (!fileDocument) {
+        logger.error('File not found', { fileId });
         reply.status(404);
         return reply.send();
       }
@@ -119,14 +155,14 @@ const gridfsHandler: RouteHandlerMethod = async (
     reply.status(404);
     return reply.send();
   } catch (e) {
+    logger.error(e);
+
     if (e.code === 'ENOENT') {
-      logger.warn(e);
       reply.status(404);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send();
     } else {
-      logger.warn(e);
       reply.status(504);
-      return reply.send({ name: e.name, code: e.code, message: e.message });
+      return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
     }
   }
 };

package/src/files/minio/handler-express.ts

@@ -1,6 +1,6 @@
 import { createLogger } from '@unchainedshop/logger';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 
@@ -21,17 +21,14 @@ const minioHandler = async (req, res) => {
         const [fileId] = object.key.split('.');
         const { services } = req.unchainedContext;
         await services.files.linkFile({ fileId, type, size });
-        res.writeHead(200);
-        res.end();
+        res.status(200).end();
         return;
       }
     }
-    res.writeHead(404);
-    res.end();
+    res.status(404).end();
   } catch (e) {
     logger.error(e);
-    res.writeHead(503);
-    res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    res.status(503).send({ name: e.name, code: e.code, message: e.message });
   }
 };
 

package/src/files/minio/handler-fastify.ts

@@ -2,7 +2,7 @@ import { Context } from '@unchainedshop/api';
 import { createLogger } from '@unchainedshop/logger';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const { MINIO_WEBHOOK_AUTH_TOKEN } = process.env;
 
@@ -37,7 +37,7 @@ const minioHandler: RouteHandlerMethod = async (
   } catch (e) {
     logger.error(e);
     res.status(503);
-    return res.send(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+    return res.send({ name: e.name, code: e.code, message: e.message });
   }
 };
 

package/src/files/minio/index.ts

@@ -14,7 +14,7 @@ import { AssumeRoleProvider } from 'minio/dist/esm/AssumeRoleProvider.mjs';
 import { expiryOffsetInMs } from '@unchainedshop/file-upload/lib/put-expiration.js';
 import { createLogger } from '@unchainedshop/logger';
 
-const logger = createLogger('unchained:plugins:minio');
+const logger = createLogger('unchained:minio');
 
 const {
   MINIO_ACCESS_KEY,
@@ -28,7 +28,7 @@ const {
   AMAZON_S3_SESSION_TOKEN,
 } = process.env;
 
-let client: Client;
+let client: Client | null = null;
 
 export async function connectToMinio() {
   if (!MINIO_ENDPOINT || !MINIO_BUCKET_NAME) {
@@ -56,8 +56,8 @@ export async function connectToMinio() {
     if (MINIO_STS_ENDPOINT) {
       const ap = new AssumeRoleProvider({
         stsEndpoint: MINIO_STS_ENDPOINT,
-        accessKey: MINIO_ACCESS_KEY,
-        secretKey: MINIO_SECRET_KEY,
+        accessKey: MINIO_ACCESS_KEY!,
+        secretKey: MINIO_SECRET_KEY!,
       });
       // eslint-disable-next-line
       // @ts-ignore
@@ -76,17 +76,17 @@ const generateMinioPath = (directoryName: string, fileName: string) => {
 };
 
 const generateMinioUrl = (directoryName: string, hashedFilename: string) => {
-  return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME}/${generateMinioPath(directoryName, hashedFilename)}`;
+  return `${MINIO_ENDPOINT}/${MINIO_BUCKET_NAME!}/${generateMinioPath(directoryName, hashedFilename)}`;
 };
 
 connectToMinio().then(function setClient(c) {
-  client = c;
+  client = c || client;
 });
 
 const getObjectStats = async (fileName: string) => {
   if (!client) throw new Error('Minio not connected, check env variables');
 
-  return client.statObject(MINIO_BUCKET_NAME, fileName);
+  return client.statObject(MINIO_BUCKET_NAME!, fileName);
 };
 
 const bufferToStream = (buffer: any) => {
@@ -116,7 +116,7 @@ export const MinioAdapter: IFileAdapter = {
     const _id = await buildHashedFilename(directoryName, fileName, expiryDate);
 
     const url = await client.presignedPutObject(
-      MINIO_BUCKET_NAME,
+      MINIO_BUCKET_NAME!,
       generateMinioPath(directoryName, _id),
       expiryOffsetInMs() / 1000,
     );
@@ -139,7 +139,7 @@ export const MinioAdapter: IFileAdapter = {
       return `${path}/${_id}`;
     });
 
-    await client.removeObjects(MINIO_BUCKET_NAME, fileIds);
+    await client.removeObjects(MINIO_BUCKET_NAME!, fileIds);
   },
 
   async uploadFileFromStream(directoryName: string, rawFile: any) {
@@ -164,7 +164,7 @@ export const MinioAdapter: IFileAdapter = {
     };
 
     await client.putObject(
-      MINIO_BUCKET_NAME,
+      MINIO_BUCKET_NAME!,
       generateMinioPath(directoryName, _id),
       stream,
       undefined,
@@ -200,7 +200,7 @@ export const MinioAdapter: IFileAdapter = {
     };
 
     await client.putObject(
-      MINIO_BUCKET_NAME,
+      MINIO_BUCKET_NAME!,
       generateMinioPath(directoryName, hashedFilename),
       readable,
       undefined,
@@ -222,7 +222,7 @@ export const MinioAdapter: IFileAdapter = {
   async createDownloadStream(file) {
     if (!client) throw new Error('Minio not connected, check env variables');
 
-    const stream = await client.getObject(MINIO_BUCKET_NAME, generateMinioPath(file.path, file._id));
+    const stream = await client.getObject(MINIO_BUCKET_NAME!, generateMinioPath(file.path, file._id));
     return stream;
   },
 };

package/src/filters/local-search.ts

@@ -5,7 +5,7 @@ import { FilterDirector, FilterAdapter, IFilterAdapter } from '@unchainedshop/co
 import { createLogger } from '@unchainedshop/logger';
 import { isDocumentDBCompatModeEnabled } from '@unchainedshop/mongodb';
 
-const logger = createLogger('unchained:core-filters:local-search');
+const logger = createLogger('unchained:local-search');
 
 const LocalSearch: IFilterAdapter = {
   ...FilterAdapter,

package/src/payment/apple-iap/adapter.ts

@@ -3,7 +3,7 @@ import { createLogger } from '@unchainedshop/logger';
 import { AppleTransactionsModule } from './module.js';
 import { verifyReceipt } from './verify-receipt.js';
 
-const logger = createLogger('unchained:core-payment:apple-iap');
+const logger = createLogger('unchained:apple-iap');
 
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 
@@ -42,7 +42,7 @@ const AppleIAP: IPaymentAdapter = {
       },
 
       async sign() {
-        throw new Error('Apple IAP does not support payment signing');
+        throw new Error('Payment signing not supported');
       },
 
       async validate() {
@@ -60,7 +60,7 @@ const AppleIAP: IPaymentAdapter = {
         const { status, latest_receipt_info: latestReceiptInfo } = response;
 
         if (status === 0) {
-          logger.debug('Apple IAP Plugin: Receipt validated and updated for the user');
+          logger.debug('Receipt validated and updated for the user');
           const latestTransaction = latestReceiptInfo[latestReceiptInfo.length - 1];
           return {
             token: latestTransaction.web_order_line_item_id,
@@ -68,7 +68,7 @@ const AppleIAP: IPaymentAdapter = {
           };
         }
 
-        logger.warn('Apple IAP Plugin: Receipt invalid', {
+        logger.warn('Receipt invalid', {
           status: response.status,
         });
         return null;
@@ -79,9 +79,11 @@ const AppleIAP: IPaymentAdapter = {
         const { transactionIdentifier } = meta || {};
 
         if (!transactionIdentifier) {
-          throw new Error('Apple IAP Plugin: You have to set the transaction id on the order payment');
+          throw new Error('You have to set the transaction id on the order payment');
         }
 
+        if (!order) throw new Error('Order not found');
+
         const receiptResponse =
           receiptData &&
           (await verifyReceipt({
@@ -90,7 +92,7 @@ const AppleIAP: IPaymentAdapter = {
           }));
 
         if (receiptResponse && receiptResponse.status !== 0) {
-          throw new Error('Apple IAP Plugin: Receipt invalid');
+          throw new Error('Receipt invalid');
         }
 
         const transactions =
@@ -99,9 +101,7 @@ const AppleIAP: IPaymentAdapter = {
           (transaction) => transaction?.transaction_id === transactionIdentifier,
         );
         if (!matchedTransaction) {
-          throw new Error(
-            `Apple IAP Plugin: Cannot match transaction with identifier ${transactionIdentifier}`,
-          );
+          throw new Error(`Cannot match transaction with identifier ${transactionIdentifier}`);
         }
 
         const orderPositions = await modules.orders.positions.findOrderPositions({
@@ -117,7 +117,7 @@ const AppleIAP: IPaymentAdapter = {
         );
 
         if (items.length !== 1) {
-          throw new Error('Apple IAP Plugin: You can only checkout 1 unique product at once');
+          throw new Error('You can only checkout 1 unique product at once');
         }
 
         const [[productId, quantity]] = items;
@@ -126,14 +126,12 @@ const AppleIAP: IPaymentAdapter = {
           parseInt(matchedTransaction.quantity, 10) === quantity &&
           matchedTransaction.product_id === productId;
 
-        if (!isMatchesTransaction)
-          throw new Error('Apple IAP Plugin: Product in order does not match transaction');
+        if (!isMatchesTransaction) throw new Error('Product in order does not match transaction');
 
         const alreadyProcessedTransaction =
           await modules.appleTransactions.findTransactionById(transactionIdentifier);
 
-        if (alreadyProcessedTransaction)
-          throw new Error('Apple IAP Plugin: Transaction already processed');
+        if (alreadyProcessedTransaction) throw new Error('Transaction already processed');
 
         // All good
         await modules.appleTransactions.createTransaction({

package/src/payment/apple-iap/db/AppleTransactionsCollection.ts

@@ -2,7 +2,7 @@ import { mongodb } from '@unchainedshop/mongodb';
 import { TimestampFields } from '@unchainedshop/mongodb';
 
 export type AppleTransaction = {
-  _id?: string;
+  _id: string;
   matchedTransaction: any;
   orderId: string;
 } & TimestampFields;

package/src/payment/apple-iap/handler-express.ts

@@ -3,7 +3,7 @@ import { EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { createLogger } from '@unchainedshop/logger';
 import { fixPeriods } from './fix-periods.js';
 
-const logger = createLogger('unchained:core-payment:apple-iap:handler');
+const logger = createLogger('unchained:apple-iap:handler');
 
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 
@@ -43,10 +43,16 @@ export const appleIAPHandler = async (req, res) => {
             receiptData: responseBody?.unified_receipt?.latest_receipt,
           },
         });
+
+        if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
         const orderId = order._id;
         const enrollment = await modules.enrollments.findEnrollment({
           orderId,
         });
+
+        if (!enrollment) throw new Error('Could not find any matching enrollment');
+
         await fixPeriods(
           {
             transactionId: latestTransaction.original_transaction_id,
@@ -72,9 +78,12 @@ export const appleIAPHandler = async (req, res) => {
         const originalOrder = await modules.orders.findOrder({
           orderId: originalOrderPayment.orderId,
         });
-        const enrollment = await modules.enrollments.findEnrollment({
-          orderId: originalOrder._id,
-        });
+        const enrollment =
+          originalOrder &&
+          (await modules.enrollments.findEnrollment({
+            orderId: originalOrder._id,
+          }));
+        if (!enrollment?.payment) throw new Error('Could not find a valid enrollment payment method');
 
         await services.orders.registerPaymentCredentials(enrollment.payment.paymentProviderId, {
           transactionContext: {
@@ -88,7 +97,7 @@ export const appleIAPHandler = async (req, res) => {
             transactionId: latestTransaction.original_transaction_id,
             transactions,
             enrollmentId: enrollment._id,
-            orderId: originalOrder._id,
+            orderId: originalOrder!._id,
           },
           resolvedContext,
         );
@@ -117,18 +126,15 @@ export const appleIAPHandler = async (req, res) => {
         logger.info(`Apple IAP Webhook: Updated enrollment from Apple`);
       }
 
-      res.writeHead(200);
-      res.end();
+      res.status(200).end();
       return;
     } catch (e) {
       logger.warn(`Apple IAP Webhook: ${e.message}`, e);
-      res.writeHead(503);
-      res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+      res.status(503).send({ name: e.name, code: e.code, message: e.message });
       return;
     }
   }
-  res.writeHead(404);
-  res.end();
+  res.status(404).end();
 };
 
 export default appleIAPHandler;

package/src/payment/apple-iap/handler-fastify.ts

@@ -5,7 +5,7 @@ import { fixPeriods } from './fix-periods.js';
 import { FastifyRequest, RouteHandlerMethod } from 'fastify';
 import { AppleTransactionsModule } from './module.js';
 
-const logger = createLogger('unchained:core-payment:apple-iap:handler');
+const logger = createLogger('unchained:apple-iap:handler');
 
 const { APPLE_IAP_SHARED_SECRET } = process.env;
 
@@ -51,10 +51,16 @@ export const appleIAPHandler: RouteHandlerMethod = async (
           receiptData: responseBody?.unified_receipt?.latest_receipt,
         },
       });
+
+      if (!order) throw new Error(`Order with id ${orderPayment.orderId} not found`);
+
       const orderId = order._id;
       const enrollment = await modules.enrollments.findEnrollment({
         orderId,
       });
+
+      if (!enrollment) throw new Error('Enrollent not found');
+
       await fixPeriods(
         {
           transactionId: latestTransaction.original_transaction_id,
@@ -65,7 +71,7 @@ export const appleIAPHandler: RouteHandlerMethod = async (
         resolvedContext,
       );
 
-      logger.info(`Apple IAP Webhook: Confirmed checkout for order ${order.orderNumber}`, {
+      logger.info(`Webhook confirmed checkout for order ${order.orderNumber}`, {
         orderId: order._id,
       });
     } else {
@@ -80,9 +86,13 @@ export const appleIAPHandler: RouteHandlerMethod = async (
       const originalOrder = await modules.orders.findOrder({
         orderId: originalOrderPayment.orderId,
       });
-      const enrollment = await modules.enrollments.findEnrollment({
-        orderId: originalOrder._id,
-      });
+      const enrollment =
+        originalOrder &&
+        (await modules.enrollments.findEnrollment({
+          orderId: originalOrder._id,
+        }));
+
+      if (!enrollment?.payment) throw new Error('Could not find a valid enrollment payment method');
 
       await services.orders.registerPaymentCredentials(enrollment.payment.paymentProviderId, {
         transactionContext: {
@@ -96,13 +106,13 @@ export const appleIAPHandler: RouteHandlerMethod = async (
           transactionId: latestTransaction.original_transaction_id,
           transactions,
           enrollmentId: enrollment._id,
-          orderId: originalOrder._id,
+          orderId: originalOrder!._id,
         },
         resolvedContext,
       );
 
       logger.info(
-        `Apple IAP Webhook: Processed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`,
+        `Webhook rocessed notification for ${latestTransaction.original_transaction_id} and type ${responseBody.notification_type}`,
       );
 
       if (responseBody.notification_type === AppleNotificationTypes.DID_RECOVER) {
@@ -128,9 +138,9 @@ export const appleIAPHandler: RouteHandlerMethod = async (
     reply.status(200);
     return reply.send();
   } catch (e) {
-    logger.warn(`Apple IAP Webhook: ${e.message}`, e);
+    logger.error(e);
     reply.status(503);
-    return reply.send({ name: e.name, code: e.code, message: e.message });
+    return reply.send({ success: false, name: e.name, code: e.code, message: e.message });
   }
 };