@evershop/evershop 2.0.0 → 2.1.0

package/dist/modules/cms/services/uploadFile.js

@@ -5,6 +5,7 @@ import { buildUrl } from '../../../lib/router/buildUrl.js';
 import { getConfig } from '../../../lib/util/getConfig.js';
 import { getValueSync } from '../../../lib/util/registry.js';
 /**
+ * Upload files to the specified destination path.
  * @param {Array} files an array of files in the format of {name: String, data: Buffer}
  * @param {String} destinationPath the destination path
  */
@@ -34,7 +35,7 @@ const localUploader = {
             .writeFile(path.join(destination, file.filename), file.buffer)
             .then(() => ({
             name: file.filename,
-            type: file.minetype,
+            mimetype: file.mimetype,
             size: file.size,
             url: buildUrl('staticAsset', [
                 path

package/dist/modules/cms/services/uploadFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../../src/modules/cms/services/uploadFile.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE;IACzD;;;OAGG;IACH,MAAM,YAAY,GAAG,YAAY,CAC/B,cAAc,EACd,aAAa,EACb;QACE,MAAM,EAAE,SAAS,CAAC,qBAAqB,CAAC;KACzC,EACD,CAAC,KAAK,EAAE,EAAE;IACR,oDAAoD;IACpD,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAC9C,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAClE,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE;QACvC,+FAA+F;QAC/F,uDAAuD;QACvD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC1D,qDAAqD;QACrD,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,sCAAsC;QACtC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACjB,EAAE;aACC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;aAC7D,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACX,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE;gBAC3B,IAAI;qBACD,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC;qBACpC,KAAK,CAAC,IAAI,CAAC;qBACX,IAAI,CAAC,GAAG,CAAC;qBACT,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aACtB,CAAC;SACH,CAAC,CAAC,CACN,CACF,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC"}
+{"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../../src/modules/cms/services/uploadFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,aAAa,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAS7D;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,KAA4B,EAC5B,eAAuB,EACE,EAAE;IAC3B;;;OAGG;IACH,MAAM,YAAY,GAAG,YAAY,CAC/B,cAAc,EACd,aAAa,EACb;QACE,MAAM,EAAE,SAAS,CAAC,qBAAqB,CAAC;KACzC,EACD,CAAC,KAAK,EAAE,EAAE;IACR,oDAAoD;IACpD,KAAK,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,UAAU,CAC9C,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;IAClE,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG;IACpB,MAAM,EAAE,KAAK,EACX,KAA4B,EAC5B,eAAuB,EACE,EAAE;QAC3B,+FAA+F;QAC/F,uDAAuD;QACvD,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAAC;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAC1D,qDAAqD;QACrD,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,sCAAsC;QACtC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACjB,EAAE;aACC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;aAC7D,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;YACX,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,EAAE,QAAQ,CAAC,aAAa,EAAE;gBAC3B,IAAI;qBACD,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC;qBACpC,KAAK,CAAC,IAAI,CAAC;qBACX,IAAI,CAAC,GAAG,CAAC;qBACT,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aACtB,CAAC;SACH,CAAC,CAAC,CACN,CACF,CAAC;QACF,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC"}

package/dist/modules/cms/services/widget/widgetDataSchema.json

@@ -2,27 +2,51 @@
   "type": "object",
   "properties": {
     "name": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1,
+      "errorMessage": {
+        "type": "Widget name must be a string",
+        "minLength": "Widget name is required and cannot be empty"
+      }
     },
     "status": {
       "type": ["string", "integer"],
-      "enum": ["0", "1", 0, 1]
+      "enum": ["0", "1", 0, 1],
+      "errorMessage": {
+        "type": "Status must be a string or number",
+        "enum": "Status must be either 0, 1, '0', or '1'"
+      }
     },
     "area": {
       "type": "array",
       "items": {
-        "type": "string"
+        "type": "string",
+        "errorMessage": {
+          "type": "Area item must be a string"
+        }
+      },
+      "errorMessage": {
+        "type": "Area must be an array"
       }
     },
     "route": {
       "type": "array",
       "items": {
-        "type": "string"
+        "type": "string",
+        "errorMessage": {
+          "type": "Route item must be a string"
+        }
+      },
+      "errorMessage": {
+        "type": "Route must be an array"
       }
     },
     "settings": {
       "type": "object",
-      "additionalProperties": true
+      "additionalProperties": true,
+      "errorMessage": {
+        "type": "Settings must be an object"
+      }
     }
   },
   "additionalProperties": true

package/dist/modules/cod/bootstrap.js

@@ -5,8 +5,8 @@ import { registerPaymentMethod } from '../checkout/services/getAvailablePaymentM
 export default async () => {
     registerPaymentMethod({
         init: async () => ({
-            methodCode: 'cod',
-            methodName: await getSetting('codDisplayName', 'Cash on Delivery')
+            code: 'cod',
+            name: await getSetting('codDisplayName', 'Cash on Delivery')
         }),
         validator: async () => {
             const codConfig = getConfig('system.cod', {});

package/dist/modules/cod/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/cod/bootstrap.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,eAAe,KAAK,IAAI,EAAE;IACxB,qBAAqB,CAAC;QACpB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACjB,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,MAAM,UAAU,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;SACnE,CAAC;QACF,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC9C,IAAI,SAAS,CAAC;YACd,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACrB,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/modules/cod/bootstrap.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2CAA2C,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAC;AAE1F,eAAe,KAAK,IAAI,EAAE;IACxB,qBAAqB,CAAC;QACpB,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;YACjB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,MAAM,UAAU,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;SAC7D,CAAC;QACF,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC9C,IAAI,SAAS,CAAC;YACd,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBACrB,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,SAAS,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/modules/cod/pages/admin/orderEdit/CaptureButton.js

@@ -1,5 +1,5 @@
-import { Card } from '@components/admin/cms/Card';
-import Button from '@components/common/form/Button';
+import { Card } from '@components/admin/Card';
+import Button from '@components/common/Button';
 import RenderIfTrue from '@components/common/RenderIfTrue';
 import axios from 'axios';
 import PropTypes from 'prop-types';

package/dist/modules/cod/pages/admin/orderEdit/CaptureButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"CaptureButton.js","sourceRoot":"","sources":["../../../../../../src/modules/cod/pages/admin/orderEdit/CaptureButton.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,MAAM,MAAM,gCAAgC,CAAC;AACpD,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,UAAU,EACV,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,EAC9C;IACC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,oCAAoC;QACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,UAAU,EACV,EAAE,QAAQ,EAAE,IAAI,EAAE,EAClB,EAAE,cAAc,EAAE,KAAK,EAAE,CAC1B,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,kBAAkB;YAClB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QACD,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,YAAY,IACX,SAAS,EAAE,aAAa,CAAC,IAAI,KAAK,SAAS,IAAI,aAAa,KAAK,KAAK;QAEtE,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,kBAAkB;gBAC/B,oBAAC,MAAM,IAAC,KAAK,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAI,CAChE,CACO,CACF,CAChB,CAAC;AACJ,CAAC;AAED,aAAa,CAAC,SAAS,GAAG;IACxB,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACvC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;QACrB,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC;YAC7B,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;SAClC,CAAC,CAAC,UAAU;QACb,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;QACjC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;KAC3C,CAAC,CAAC,UAAU;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAC"}
+{"version":3,"file":"CaptureButton.js","sourceRoot":"","sources":["../../../../../../src/modules/cod/pages/admin/orderEdit/CaptureButton.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,YAAY,MAAM,iCAAiC,CAAC;AAC3D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EACpC,UAAU,EACV,KAAK,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,EAC9C;IACC,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,oCAAoC;QACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,IAAI,CAC/B,UAAU,EACV,EAAE,QAAQ,EAAE,IAAI,EAAE,EAClB,EAAE,cAAc,EAAE,KAAK,EAAE,CAC1B,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACzB,kBAAkB;YAClB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3C,CAAC;QACD,YAAY,CAAC,KAAK,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,YAAY,IACX,SAAS,EAAE,aAAa,CAAC,IAAI,KAAK,SAAS,IAAI,aAAa,KAAK,KAAK;QAEtE,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,kBAAkB;gBAC/B,oBAAC,MAAM,IAAC,KAAK,EAAC,SAAS,EAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,GAAI,CAChE,CACO,CACF,CAChB,CAAC;AACJ,CAAC;AAED,aAAa,CAAC,SAAS,GAAG;IACxB,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;IACvC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC;QACrB,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC;YAC7B,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;SAClC,CAAC,CAAC,UAAU;QACb,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;QACjC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,UAAU;KAC3C,CAAC,CAAC,UAAU;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,qBAAqB;IAC7B,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAC"}

package/dist/modules/cod/pages/admin/paymentSetting/CODSetting.d.ts

@@ -1,18 +1,14 @@
-declare function CODPayment({ setting: { codPaymentStatus, codDisplayName } }: {
+import React from 'react';
+interface CODPaymentProps {
     setting: {
-        codPaymentStatus: any;
-        codDisplayName: any;
+        codPaymentStatus: true | false | 0 | 1;
+        codDisplayName: string;
     };
-}): React.JSX.Element;
-declare namespace CODPayment {
-    namespace propTypes {
-        let setting: any;
-    }
-}
-export default CODPayment;
-export namespace layout {
-    let areaId: string;
-    let sortOrder: number;
 }
-export const query: "\n  query Query {\n    setting {\n      codPaymentStatus\n      codDisplayName\n    }\n  }\n";
-import React from 'react';
+export default function CODPayment({ setting: { codPaymentStatus, codDisplayName } }: CODPaymentProps): React.JSX.Element;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};
+export declare const query = "\n  query Query {\n    setting {\n      codPaymentStatus\n      codDisplayName\n    }\n  }\n";
+export {};

package/dist/modules/cod/pages/admin/paymentSetting/CODSetting.js

@@ -1,29 +1,22 @@
-import { Card } from '@components/admin/cms/Card';
-import { Field } from '@components/common/form/Field';
-import { Toggle } from '@components/common/form/fields/Toggle';
-import PropTypes from 'prop-types';
+import { Card } from '@components/admin/Card.js';
+import { InputField } from '@components/common/form/InputField.js';
+import { ToggleField } from '@components/common/form/ToggleField.js';
 import React from 'react';
 export default function CODPayment({ setting: { codPaymentStatus, codDisplayName } }) {
     return (React.createElement(Card, { title: "Cash On Delivery Payment" },
         React.createElement(Card.Session, null,
-            React.createElement("div", { className: "grid grid-cols-3 gap-8" },
+            React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Enable?")),
                 React.createElement("div", { className: "col-span-2" },
-                    React.createElement(Toggle, { name: "codPaymentStatus", value: codPaymentStatus })))),
+                    React.createElement(ToggleField, { name: "codPaymentStatus", defaultValue: codPaymentStatus, trueValue: 1, falseValue: 0 })))),
         React.createElement(Card.Session, null,
-            React.createElement("div", { className: "grid grid-cols-3 gap-8" },
+            React.createElement("div", { className: "grid grid-cols-3 gap-5" },
                 React.createElement("div", { className: "col-span-1 items-center flex" },
                     React.createElement("h4", null, "Dislay Name")),
                 React.createElement("div", { className: "col-span-2" },
-                    React.createElement(Field, { type: "text", name: "codDisplayName", placeholder: "Display Name", value: codDisplayName }))))));
+                    React.createElement(InputField, { name: "codDisplayName", placeholder: "Display Name", defaultValue: codDisplayName }))))));
 }
-CODPayment.propTypes = {
-    setting: PropTypes.shape({
-        codPaymentStatus: PropTypes.number,
-        codDisplayName: PropTypes.string
-    }).isRequired
-};
 export const layout = {
     areaId: 'paymentSetting',
     sortOrder: 20

package/dist/modules/cod/pages/admin/paymentSetting/CODSetting.js.map

@@ -1 +1 @@
-{"version":3,"file":"CODSetting.js","sourceRoot":"","sources":["../../../../../../src/modules/cod/pages/admin/paymentSetting/CODSetting.jsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAClD,OAAO,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,SAAS,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,OAAO,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAC9C;IACC,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,0BAA0B;QACpC,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,6BAAK,SAAS,EAAC,8BAA8B;oBAC3C,0CAAgB,CACZ;gBACN,6BAAK,SAAS,EAAC,YAAY;oBACzB,oBAAC,MAAM,IAAC,IAAI,EAAC,kBAAkB,EAAC,KAAK,EAAE,gBAAgB,GAAI,CACvD,CACF,CACO;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,6BAAK,SAAS,EAAC,8BAA8B;oBAC3C,8CAAoB,CAChB;gBACN,6BAAK,SAAS,EAAC,YAAY;oBACzB,oBAAC,KAAK,IACJ,IAAI,EAAC,MAAM,EACX,IAAI,EAAC,gBAAgB,EACrB,WAAW,EAAC,cAAc,EAC1B,KAAK,EAAE,cAAc,GACrB,CACE,CACF,CACO,CACV,CACR,CAAC;AACJ,CAAC;AAED,UAAU,CAAC,SAAS,GAAG;IACrB,OAAO,EAAE,SAAS,CAAC,KAAK,CAAC;QACvB,gBAAgB,EAAE,SAAS,CAAC,MAAM;QAClC,cAAc,EAAE,SAAS,CAAC,MAAM;KACjC,CAAC,CAAC,UAAU;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,gBAAgB;IACxB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;CAOpB,CAAC"}
+{"version":3,"file":"CODSetting.js","sourceRoot":"","sources":["../../../../../../src/modules/cod/pages/admin/paymentSetting/CODSetting.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,OAAO,EAAE,EAAE,gBAAgB,EAAE,cAAc,EAAE,EAC7B;IAChB,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAC,0BAA0B;QACpC,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,6BAAK,SAAS,EAAC,8BAA8B;oBAC3C,0CAAgB,CACZ;gBACN,6BAAK,SAAS,EAAC,YAAY;oBACzB,oBAAC,WAAW,IACV,IAAI,EAAC,kBAAkB,EACvB,YAAY,EAAE,gBAAgB,EAC9B,SAAS,EAAE,CAAC,EACZ,UAAU,EAAE,CAAC,GACb,CACE,CACF,CACO;QACf,oBAAC,IAAI,CAAC,OAAO;YACX,6BAAK,SAAS,EAAC,wBAAwB;gBACrC,6BAAK,SAAS,EAAC,8BAA8B;oBAC3C,8CAAoB,CAChB;gBACN,6BAAK,SAAS,EAAC,YAAY;oBACzB,oBAAC,UAAU,IACT,IAAI,EAAC,gBAAgB,EACrB,WAAW,EAAC,cAAc,EAC1B,YAAY,EAAE,cAAc,GAC5B,CACE,CACF,CACO,CACV,CACR,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,gBAAgB;IACxB,SAAS,EAAE,EAAE;CACd,CAAC;AAEF,MAAM,CAAC,MAAM,KAAK,GAAG;;;;;;;CAOpB,CAAC"}

package/dist/modules/cod/pages/frontStore/checkout/CashOnDelivery.d.ts

@@ -1,20 +1,12 @@
-export function COD({ orderId, checkoutSuccessUrl }: {
-    orderId: any;
-    checkoutSuccessUrl: any;
-}): null;
-export namespace COD {
-    namespace propTypes {
-        let orderId: any;
-        let checkoutSuccessUrl: any;
-    }
-    namespace defaultProps {
-        let orderId_1: undefined;
-        export { orderId_1 as orderId };
-    }
+interface CashOnDeliveryMethodProps {
+    setting: {
+        codDisplayName: string;
+    };
 }
-export default function CashOnDeliveryMethod(): React.JSX.Element;
-export namespace layout {
-    let areaId: string;
-    let sortOrder: number;
-}
-import React from 'react';
+export default function CashOnDeliveryMethod({ setting }: CashOnDeliveryMethodProps): null;
+export declare const layout: {
+    areaId: string;
+    sortOrder: number;
+};
+export declare const query = "\n  query Query {\n    setting {\n      codDisplayName\n    }\n  }\n";
+export {};

package/dist/modules/cod/pages/frontStore/checkout/CashOnDelivery.js

@@ -1,70 +1,59 @@
-import { useCheckout, useCheckoutDispatch } from '@components/common/context/checkout';
-import CODLogo from '@components/frontStore/cod/CODLogo';
-import PropTypes from 'prop-types';
+import { useCheckout, useCheckoutDispatch } from '@components/frontStore/checkout/CheckoutContext.js';
+import { _ } from '@evershop/evershop/lib/locale/translate/_';
 import React, { useEffect } from 'react';
-export function COD({ orderId, checkoutSuccessUrl }) {
-    React.useEffect(() => {
-        if (orderId) {
-            // Redirect customer to checkout success page
-            window.location.href = `${checkoutSuccessUrl}/${orderId}`;
-        }
-    }, [orderId]);
-    return null;
+function CODLogo({ width = 100, height = 30 }) {
+    return (React.createElement("img", { width: width, height: height, src: "data:image/png;base64,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", alt: "Cash On Delivery", role: "presentation" }));
 }
-COD.propTypes = {
-    orderId: PropTypes.string,
-    checkoutSuccessUrl: PropTypes.string.isRequired
-};
-COD.defaultProps = {
-    orderId: undefined
-};
-export default function CashOnDeliveryMethod() {
-    const checkout = useCheckout();
-    const { steps, paymentMethods, setPaymentMethods, orderPlaced, orderId, checkoutSuccessUrl } = checkout;
-    const { placeOrder } = useCheckoutDispatch();
-    // Get the selected payment method
-    const selectedPaymentMethod = paymentMethods
-        ? paymentMethods.find((paymentMethod) => paymentMethod.selected)
-        : undefined;
+export default function CashOnDeliveryMethod({ setting }) {
+    const { checkoutSuccessUrl, orderPlaced, orderId, checkoutData } = useCheckout();
+    const { registerPaymentComponent } = useCheckoutDispatch();
     useEffect(() => {
-        const selectedPaymentMethod = paymentMethods.find((paymentMethod) => paymentMethod.selected);
-        if (steps.every((step) => step.isCompleted) &&
-            selectedPaymentMethod.code === 'cod') {
-            placeOrder();
+        if (orderPlaced && checkoutData.paymentMethod === 'cod') {
+            // Redirect to the checkout success page
+            window.location.href = `${checkoutSuccessUrl}/${orderId}`;
         }
-    }, [steps]);
-    return (React.createElement("div", null,
-        React.createElement("div", { className: "flex justify-start items-center gap-4" },
-            (!selectedPaymentMethod || selectedPaymentMethod.code !== 'cod') && (React.createElement("a", { href: "#", onClick: (e) => {
+    }, [orderPlaced, checkoutSuccessUrl, orderId]);
+    useEffect(() => {
+        registerPaymentComponent('cod', {
+            nameRenderer: () => (React.createElement("div", { className: "flex items-center justify-between" },
+                React.createElement("span", null, setting.codDisplayName),
+                React.createElement(CODLogo, null))),
+            formRenderer: () => (React.createElement("div", { className: "flex justify-center text-gray-500" },
+                React.createElement("div", { className: "w-2/3 text-center p-5" }, _('Conveniently pay with cash at your doorstep when your order is delivered.')))),
+            checkoutButtonRenderer: () => {
+                const { checkout } = useCheckoutDispatch();
+                const { loadingStates, orderPlaced } = useCheckout();
+                const handleClick = async (e) => {
                     e.preventDefault();
-                    setPaymentMethods((previous) => previous.map((paymentMethod) => {
-                        if (paymentMethod.code === 'cod') {
-                            return {
-                                ...paymentMethod,
-                                selected: true
-                            };
-                        }
-                        else {
-                            return {
-                                ...paymentMethod,
-                                selected: false
-                            };
-                        }
-                    }));
-                } },
-                React.createElement("svg", { xmlns: "http://www.w3.org/2000/svg", width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" },
-                    React.createElement("circle", { cx: "12", cy: "12", r: "10" })))),
-            selectedPaymentMethod && selectedPaymentMethod.code === 'cod' && (React.createElement("div", null,
-                React.createElement("svg", { xmlns: "http://www.w3.org/2000/svg", width: "18", height: "18", viewBox: "0 0 24 24", fill: "none", stroke: "#2c6ecb", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round" },
-                    React.createElement("path", { d: "M22 11.08V12a10 10 0 1 1-5.93-9.14" }),
-                    React.createElement("polyline", { points: "22 4 12 14.01 9 11.01" })))),
-            React.createElement("div", null,
-                React.createElement(CODLogo, { width: 100 }))),
-        React.createElement("div", null, selectedPaymentMethod && selectedPaymentMethod.code === 'cod' && (React.createElement("div", null,
-            React.createElement(COD, { orderPlaced: orderPlaced, orderId: orderId, checkoutSuccessUrl: checkoutSuccessUrl }))))));
+                    await checkout();
+                };
+                const isDisabled = loadingStates.placingOrder || orderPlaced;
+                return (React.createElement("button", { type: "button", onClick: handleClick, disabled: isDisabled, className: "w-full bg-green-600 text-white py-4 px-6 rounded-lg font-semibold text-lg shadow-lg hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 transition-colors duration-200 disabled:opacity-50 disabled:cursor-not-allowed disabled:bg-green-600" },
+                    React.createElement("span", { className: "flex items-center justify-center space-x-2" }, loadingStates.placingOrder ? (React.createElement(React.Fragment, null,
+                        React.createElement("svg", { className: "animate-spin -ml-1 mr-3 h-5 w-5 text-white", xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 24 24" },
+                            React.createElement("circle", { className: "opacity-25", cx: "12", cy: "12", r: "10", stroke: "currentColor", strokeWidth: "4" }),
+                            React.createElement("path", { className: "opacity-75", fill: "currentColor", d: "M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z" })),
+                        React.createElement("span", null, _('Placing Order...')))) : orderPlaced ? (React.createElement(React.Fragment, null,
+                        React.createElement("svg", { className: "w-5 h-5", fill: "currentColor", viewBox: "0 0 24 24" },
+                            React.createElement("path", { d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z" })),
+                        React.createElement("span", null, _('Order Placed')))) : (React.createElement(React.Fragment, null,
+                        React.createElement("span", null, _('Place Order')),
+                        React.createElement("svg", { className: "w-5 h-5", fill: "currentColor", viewBox: "0 0 24 24" },
+                            React.createElement("path", { d: "M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z" })))))));
+            }
+        });
+    }, [registerPaymentComponent, setting.codDisplayName]);
+    return null;
 }
 export const layout = {
-    areaId: 'checkoutPaymentMethodcod',
+    areaId: 'checkoutForm',
     sortOrder: 10
 };
+export const query = `
+  query Query {
+    setting {
+      codDisplayName
+    }
+  }
+`;
 //# sourceMappingURL=CashOnDelivery.js.map

package/dist/modules/cod/pages/frontStore/checkout/CashOnDelivery.js.map

@@ -1 +1 @@
-{"version":3,"file":"CashOnDelivery.js","sourceRoot":"","sources":["../../../../../../src/modules/cod/pages/frontStore/checkout/CashOnDelivery.jsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CashOnDelivery.js","sourceRoot":"","sources":["../../../../../../src/modules/cod/pages/frontStore/checkout/CashOnDelivery.tsx"],"names":[],"mappings":"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"}

package/dist/modules/customer/api/getCustomerToken/[context]bodyParser[auth].d.ts

@@ -0,0 +1,2 @@
+declare const _default: (request: any, response: any, next: any) => void;
+export default _default;

package/dist/modules/customer/api/getCustomerToken/[context]bodyParser[auth].js

@@ -0,0 +1,5 @@
+import bodyParser from 'body-parser';
+export default (request, response, next) => {
+    bodyParser.json({ inflate: false })(request, response, next);
+};
+//# sourceMappingURL=%5Bcontext%5DbodyParser%5Bauth%5D.js.map

package/dist/modules/customer/api/getCustomerToken/[context]bodyParser[auth].js.map

@@ -0,0 +1 @@
+{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/customer/api/getCustomerToken/[context]bodyParser[auth].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}

package/dist/modules/customer/api/getCustomerToken/generateToken.d.ts

@@ -0,0 +1,4 @@
+import { EvershopRequest } from '../../../../types/request.js';
+import { EvershopResponse } from '../../../../types/response.js';
+declare const _default: (request: EvershopRequest, response: EvershopResponse, next: any) => Promise<void>;
+export default _default;

package/dist/modules/customer/api/getCustomerToken/generateToken.js

@@ -0,0 +1,39 @@
+import { INTERNAL_SERVER_ERROR, INVALID_PAYLOAD, OK } from '../../../../lib/util/httpStatus.js';
+import { generateToken, generateRefreshToken, TOKEN_TYPES } from '../../../../lib/util/jwt.js';
+export default async (request, response, next) => {
+    try {
+        const message = 'Invalid email or password';
+        const { body } = request;
+        const { email, password } = body;
+        await request.loginCustomerWithEmail(email, password, (error) => {
+            if (error) {
+                response.status(INTERNAL_SERVER_ERROR);
+                response.json({
+                    error: {
+                        status: INTERNAL_SERVER_ERROR,
+                        message
+                    }
+                });
+                return;
+            }
+        });
+        response.status(OK);
+        const accessToken = generateToken({ customer: request.locals.customer }, TOKEN_TYPES.CUSTOMER);
+        const refreshToken = generateRefreshToken({ customer: request.locals.customer }, TOKEN_TYPES.CUSTOMER);
+        response.json({
+            data: {
+                accessToken,
+                refreshToken
+            }
+        });
+    }
+    catch (error) {
+        response.status(INVALID_PAYLOAD).json({
+            error: {
+                message: error.message,
+                status: INVALID_PAYLOAD
+            }
+        });
+    }
+};
+//# sourceMappingURL=generateToken.js.map

package/dist/modules/customer/api/getCustomerToken/generateToken.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateToken.js","sourceRoot":"","sources":["../../../../../src/modules/customer/api/getCustomerToken/generateToken.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,EAAE,EACH,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAIrC,eAAe,KAAK,EAClB,OAAwB,EACxB,QAA0B,EAC1B,IAAI,EACJ,EAAE;IACF,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,2BAA2B,CAAC;QAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;QACzB,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACjC,MAAM,OAAO,CAAC,sBAAsB,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;YAC9D,IAAI,KAAK,EAAE,CAAC;gBACV,QAAQ,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;gBACvC,QAAQ,CAAC,IAAI,CAAC;oBACZ,KAAK,EAAE;wBACL,MAAM,EAAE,qBAAqB;wBAC7B,OAAO;qBACR;iBACF,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;QACH,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACpB,MAAM,WAAW,GAAG,aAAa,CAC/B,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAA2B,EAAE,EACxD,WAAW,CAAC,QAAQ,CACrB,CAAC;QACF,MAAM,YAAY,GAAG,oBAAoB,CACvC,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,QAA2B,EAAE,EACxD,WAAW,CAAC,QAAQ,CACrB,CAAC;QACF,QAAQ,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE;gBACJ,WAAW;gBACX,YAAY;aACb;SACF,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;YACpC,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM,EAAE,eAAe;aACxB;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/customer/api/getCustomerToken/payloadSchema.json

@@ -0,0 +1,24 @@
+{
+  "type": "object",
+  "properties": {
+    "email": {
+      "type": "string",
+      "errorMessage": {
+        "type": "Email must be a string"
+      }
+    },
+    "password": {
+      "type": "string",
+      "errorMessage": {
+        "type": "Password must be a string"
+      }
+    }
+  },
+  "required": ["email", "password"],
+  "errorMessage": {
+    "required": {
+      "email": "Email is required",
+      "password": "Password is required"
+    }
+  }
+}

package/dist/modules/customer/api/getCustomerToken/route.json

@@ -0,0 +1,5 @@
+{
+  "methods": ["POST"],
+  "path": "/customer/tokens",
+  "access": "public"
+}

package/dist/modules/customer/api/global/[context]getCurrentCustomer[auth].js

@@ -4,6 +4,7 @@ import sessionStorage from 'connect-pg-simple';
 import session from 'express-session';
 import { pool } from '../../../../lib/postgres/connection.js';
 import { getFrontStoreSessionCookieName } from '../../../auth/services/getFrontStoreSessionCookieName.js';
+import { setContextValue } from '../../../graphql/services/contextHelper.js';
 /**
  * This is the session based authentication middleware.
  * We do not implement session middleware on API routes,
@@ -42,6 +43,7 @@ export default async (request, response, next) => {
                         // Delete the password field
                         delete currentCustomer.password;
                         request.locals.customer = currentCustomer;
+                        setContextValue(request, 'customer', currentCustomer);
                     }
                 }
                 // We also keep the session id in the request.
@@ -53,6 +55,9 @@ export default async (request, response, next) => {
             // Do nothing, the customer is not logged in
         }
     }
+    else {
+        setContextValue(request, 'customer', currentCustomer);
+    }
     next();
 };
 //# sourceMappingURL=%5Bcontext%5DgetCurrentCustomer%5Bauth%5D.js.map

package/dist/modules/customer/api/global/[context]getCurrentCustomer[auth].js.map

@@ -1 +1 @@
-{"version":3,"file":"[context]getCurrentCustomer[auth].js","sourceRoot":"","sources":["../../../../../src/modules/customer/api/global/[context]getCurrentCustomer[auth].js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0DAA0D,CAAC;AAE1G;;;;;;;;GAQG;AACH,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,yCAAyC;IACzC,0FAA0F;IAC1F,IAAI,eAAe,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACnD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,2BAA2B;YAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;YACtC,MAAM,2BAA2B,GAAG,8BAA8B,EAAE,CAAC;YACrE,2CAA2C;YAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;YACvD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC5C,IAAI;iBACL,CAAC,CAAC;gBACH,yCAAyC;gBACzC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC7D,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC;gBACxD,IAAI,mBAAmB,EAAE,CAAC;oBACxB,kCAAkC;oBAClC,eAAe,GAAG,MAAM,MAAM,EAAE;yBAC7B,IAAI,CAAC,UAAU,CAAC;yBAChB,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,mBAAmB,CAAC,UAAU,CAAC;yBACzD,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;yBACrB,IAAI,CAAC,IAAI,CAAC,CAAC;oBAEd,IAAI,eAAe,EAAE,CAAC;wBACpB,4BAA4B;wBAC5B,OAAO,eAAe,CAAC,QAAQ,CAAC;wBAChC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,eAAe,CAAC;oBAC5C,CAAC;gBACH,CAAC;gBACD,8CAA8C;gBAC9C,iDAAiD;gBACjD,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,4CAA4C;QAC9C,CAAC;IACH,CAAC;IACD,IAAI,EAAE,CAAC;AACT,CAAC,CAAC"}
+{"version":3,"file":"[context]getCurrentCustomer[auth].js","sourceRoot":"","sources":["../../../../../src/modules/customer/api/global/[context]getCurrentCustomer[auth].js"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAC9D,OAAO,EAAE,8BAA8B,EAAE,MAAM,0DAA0D,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E;;;;;;;;GAQG;AACH,eAAe,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC/C,yCAAyC;IACzC,0FAA0F;IAC1F,IAAI,eAAe,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IACnD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,2BAA2B;YAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;YACtC,MAAM,2BAA2B,GAAG,8BAA8B,EAAE,CAAC;YACrE,2CAA2C;YAC3C,MAAM,SAAS,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC;YACvD,IAAI,SAAS,EAAE,CAAC;gBACd,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;oBAC5C,IAAI;iBACL,CAAC,CAAC;gBACH,yCAAyC;gBACzC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC7D,MAAM,mBAAmB,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC;gBACxD,IAAI,mBAAmB,EAAE,CAAC;oBACxB,kCAAkC;oBAClC,eAAe,GAAG,MAAM,MAAM,EAAE;yBAC7B,IAAI,CAAC,UAAU,CAAC;yBAChB,KAAK,CAAC,aAAa,EAAE,GAAG,EAAE,mBAAmB,CAAC,UAAU,CAAC;yBACzD,GAAG,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;yBACrB,IAAI,CAAC,IAAI,CAAC,CAAC;oBAEd,IAAI,eAAe,EAAE,CAAC;wBACpB,4BAA4B;wBAC5B,OAAO,eAAe,CAAC,QAAQ,CAAC;wBAChC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,eAAe,CAAC;wBAC1C,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;oBACxD,CAAC;gBACH,CAAC;gBACD,8CAA8C;gBAC9C,iDAAiD;gBACjD,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;YACvC,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,4CAA4C;QAC9C,CAAC;IACH,CAAC;SAAM,CAAC;QACN,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,EAAE,CAAC;AACT,CAAC,CAAC"}

package/dist/modules/customer/api/global/[context]jwtCustomerAuth[getCurrentCustomer].d.ts

@@ -0,0 +1,3 @@
+import { EvershopRequest } from '../../../../types/request.js';
+declare const _default: (request: EvershopRequest, response: any, next: any) => any;
+export default _default;

package/dist/modules/customer/api/global/[context]jwtCustomerAuth[getCurrentCustomer].js

@@ -0,0 +1,34 @@
+import { UNAUTHORIZED } from '../../../../lib/util/httpStatus.js';
+import { decodeToken, TOKEN_TYPES, verifyToken } from '../../../../lib/util/jwt.js';
+export default (request, response, next) => {
+    try {
+        // Get token from Authorization header
+        const authHeader = request.headers.authorization;
+        if (!authHeader || !authHeader.startsWith('Bearer ')) {
+            return next();
+        }
+        const token = authHeader.substring(7);
+        const decodedWithoutVerification = decodeToken(token);
+        if (!decodedWithoutVerification ||
+            decodedWithoutVerification.tokenType !== TOKEN_TYPES.CUSTOMER) {
+            // If token type is not customer, skip processing
+            return next();
+        }
+        // Verify token
+        const decoded = verifyToken(token, TOKEN_TYPES.CUSTOMER);
+        // Attach user info to request
+        request.locals = request.locals || {};
+        request.locals.customer = decoded.customer;
+        return next();
+    }
+    catch (error) {
+        response.status(UNAUTHORIZED);
+        return response.json({
+            error: {
+                status: UNAUTHORIZED,
+                message: error.message || 'Invalid token'
+            }
+        });
+    }
+};
+//# sourceMappingURL=%5Bcontext%5DjwtCustomerAuth%5BgetCurrentCustomer%5D.js.map

package/dist/modules/customer/api/global/[context]jwtCustomerAuth[getCurrentCustomer].js.map

@@ -0,0 +1 @@
+{"version":3,"file":"[context]jwtCustomerAuth[getCurrentCustomer].js","sourceRoot":"","sources":["../../../../../src/modules/customer/api/global/[context]jwtCustomerAuth[getCurrentCustomer].ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EACL,WAAW,EACX,WAAW,EACX,WAAW,EACZ,MAAM,6BAA6B,CAAC;AAGrC,eAAe,CAAC,OAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IAC1D,IAAI,CAAC;QACH,sCAAsC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;QACjD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,0BAA0B,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;QACtD,IACE,CAAC,0BAA0B;YAC3B,0BAA0B,CAAC,SAAS,KAAK,WAAW,CAAC,QAAQ,EAC7D,CAAC;YACD,iDAAiD;YACjD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,eAAe;QACf,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;QACzD,8BAA8B;QAC9B,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;QACtC,OAAO,CAAC,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAE3C,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC9B,OAAO,QAAQ,CAAC,IAAI,CAAC;YACnB,KAAK,EAAE;gBACL,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,eAAe;aAC1C;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC"}

package/dist/modules/customer/api/refreshCustomerToken/[context]bodyParser[auth].d.ts

@@ -0,0 +1,2 @@
+declare const _default: (request: any, response: any, next: any) => void;
+export default _default;

package/dist/modules/customer/api/refreshCustomerToken/[context]bodyParser[auth].js

@@ -0,0 +1,5 @@
+import bodyParser from 'body-parser';
+export default (request, response, next) => {
+    bodyParser.json({ inflate: false })(request, response, next);
+};
+//# sourceMappingURL=%5Bcontext%5DbodyParser%5Bauth%5D.js.map

package/dist/modules/customer/api/refreshCustomerToken/[context]bodyParser[auth].js.map

@@ -0,0 +1 @@
+{"version":3,"file":"[context]bodyParser[auth].js","sourceRoot":"","sources":["../../../../../src/modules/customer/api/refreshCustomerToken/[context]bodyParser[auth].ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;IACzC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC"}