@unchainedshop/api 2.6.1 → 2.7.0

package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js

@@ -1,20 +1,30 @@
 import { log } from '@unchainedshop/logger';
 import { PaymentProviderType } from '@unchainedshop/core-payment';
 import { OrderPaymentStatus } from '@unchainedshop/types/orders.payments.js';
-import { InvalidIdError, OrderPaymentConfigurationError, OrderPaymentNotFoundError, OrderPaymentTypeError, OrderWrongPaymentStatusError, } from '../../../errors.js';
+import { OrderPaymentConfigurationError, OrderPaymentNotFoundError, OrderPaymentTypeError, OrderWrongPaymentStatusError, } from '../../../errors.js';
+import { getOrderCart } from '../utils/getOrderCart.js';
 export default async function signPaymentProviderForCheckout(root, params, context) {
     const { modules, userId } = context;
     const { orderPaymentId, transactionContext } = params;
     log(`mutation signPaymentProviderForCheckout ${orderPaymentId}`, {
         userId,
     });
-    if (!orderPaymentId)
-        throw new InvalidIdError({ orderPaymentId });
-    const orderPayment = await modules.orders.payments.findOrderPayment({
-        orderPaymentId,
-    });
-    if (!orderPayment)
-        throw new OrderPaymentNotFoundError({ orderPaymentId });
+    let orderPayment;
+    if (orderPaymentId) {
+        orderPayment = await modules.orders.payments.findOrderPayment({
+            orderPaymentId,
+        });
+        if (!orderPayment)
+            throw new OrderPaymentNotFoundError({ orderPaymentId });
+    }
+    else {
+        const order = await getOrderCart({ user: context.user }, context);
+        orderPayment = await modules.orders.payments.findOrderPayment({
+            orderPaymentId: order.paymentId,
+        });
+        if (!orderPayment)
+            throw new OrderPaymentNotFoundError({ orderPaymentId });
+    }
     const provider = await modules.payment.paymentProviders.findProvider({
         paymentProviderId: orderPayment.paymentProviderId,
     });

package/lib/resolvers/mutations/orders/signPaymentProviderForCheckout.js.map

@@ -1 +1 @@
-{"version":3,"file":"signPaymentProviderForCheckout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EACL,cAAc,EACd,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B,CAC1D,IAAU,EACV,MAA2D,EAC3D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEtD,GAAG,CAAC,2CAA2C,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;QAClE,cAAc;KACf,CAAC,CAAC;IACH,IAAI,CAAC,YAAY;QAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAE3E,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,4BAA4B,CAAC;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CACtD,QAAQ,CAAC,GAAG,EACZ;YACE,MAAM;YACN,YAAY;YACZ,kBAAkB;SACnB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"signPaymentProviderForCheckout.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EACL,8BAA8B,EAC9B,yBAAyB,EACzB,qBAAqB,EACrB,4BAA4B,GAC7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B,CAC1D,IAAU,EACV,MAA2D,EAC3D,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAEtD,GAAG,CAAC,2CAA2C,cAAc,EAAE,EAAE;QAC/D,MAAM;KACP,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC;IAEjB,IAAI,cAAc,EAAE,CAAC;QACnB,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QAClE,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YAC5D,cAAc,EAAE,KAAK,CAAC,SAAS;SAChC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,yBAAyB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC;QACnE,iBAAiB,EAAE,YAAY,CAAC,iBAAiB;KAClD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,CAAC;IAEpC,IAAI,YAAY,KAAK,mBAAmB,CAAC,OAAO;QAC9C,MAAM,IAAI,qBAAqB,CAAC;YAC9B,cAAc;YACd,QAAQ,EAAE,YAAY;YACtB,QAAQ,EAAE,mBAAmB,CAAC,OAAO;SACtC,CAAC,CAAC;IAEL,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;QACvF,MAAM,IAAI,4BAA4B,CAAC;YACrC,MAAM,EAAE,YAAY,CAAC,MAAM;SAC5B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CACtD,QAAQ,CAAC,GAAG,EACZ;YACE,MAAM;YACN,YAAY;YACZ,kBAAkB;SACnB,EACD,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,8BAA8B,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}

package/lib/schema/index.js

@@ -9,9 +9,7 @@ export const buildDefaultTypeDefs = ({ actions = [], events = [], workTypes = []
         actions?.length && `extend enum RoleAction { ${actions.join(',')} }`,
         events?.length && `extend enum EventType { ${events.join(',')} }`,
         workTypes?.length && `extend enum WorkType { ${workTypes.join(',')} }`,
-    ]
-        .filter(Boolean)
-        .join('\n');
-    return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, dynamicTypeDefs];
+    ].filter(Boolean);
+    return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, ...dynamicTypeDefs];
 };
 //# sourceMappingURL=index.js.map

package/lib/schema/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE;IACpF,MAAM,eAAe,GAAG;QACtB,OAAO,EAAE,MAAM,IAAI,4BAA4B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QACpE,MAAM,EAAE,MAAM,IAAI,2BAA2B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QACjE,SAAS,EAAE,MAAM,IAAI,0BAA0B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;KACvE;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,QAAQ,EAAE,eAAe,CAAC,CAAC;AACtG,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,UAAU,MAAM,iBAAiB,CAAC;AACzC,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EAAE,OAAO,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,EAAE,EAAE;IACpF,MAAM,eAAe,GAAG;QACtB,OAAO,EAAE,MAAM,IAAI,4BAA4B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QACpE,MAAM,EAAE,MAAM,IAAI,2BAA2B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QACjE,SAAS,EAAE,MAAM,IAAI,0BAA0B,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;KACvE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAElB,OAAO,CAAC,GAAG,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,EAAE,GAAG,QAAQ,EAAE,GAAG,eAAe,CAAC,CAAC;AACzG,CAAC,CAAC"}

package/lib/schema/mutation.js

@@ -901,7 +901,7 @@ export default [
       """
       Sign a generic order payment
       """
-      signPaymentProviderForCheckout(orderPaymentId: ID!, transactionContext: JSON): String!
+      signPaymentProviderForCheckout(orderPaymentId: ID, transactionContext: JSON): String!
 
       prepareProductMediaUpload(mediaName: String!, productId: ID!): MediaUploadTicket!
       prepareAssortmentMediaUpload(mediaName: String!, assortmentId: ID!): MediaUploadTicket!

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.6.1",
+  "version": "2.7.0",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -41,19 +41,18 @@
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
     "@apollo/server": "^4.10.0",
-    "cookie": "^0.6.0",
-    "graphql": "^16.6.0"
+    "cookie": "^0.6.0"
   },
   "optionalDependencies": {
     "express": "^4.18.2"
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.1",
-    "@unchainedshop/core": "^2.6.1",
-    "@unchainedshop/events": "^2.6.1",
-    "@unchainedshop/logger": "^2.6.1",
-    "@unchainedshop/roles": "^2.6.1",
-    "@unchainedshop/utils": "^2.6.1",
+    "@unchainedshop/core": "^2.7.0",
+    "@unchainedshop/events": "^2.7.0",
+    "@unchainedshop/logger": "^2.7.0",
+    "@unchainedshop/roles": "^2.7.0",
+    "@unchainedshop/utils": "^2.7.0",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.22.4",
@@ -65,10 +64,9 @@
   "devDependencies": {
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.11.10",
-    "@unchainedshop/types": "^2.6.1",
+    "@types/node": "^20.11.17",
+    "@unchainedshop/types": "^2.7.0",
     "express": "^4.18.2",
-    "graphql": "^16.8.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
     "typescript": "^5.3.3"

package/src/resolvers/mutations/orders/signPaymentProviderForCheckout.ts

@@ -3,12 +3,12 @@ import { Context, Root } from '@unchainedshop/types/api.js';
 import { PaymentProviderType } from '@unchainedshop/core-payment';
 import { OrderPaymentStatus } from '@unchainedshop/types/orders.payments.js';
 import {
-  InvalidIdError,
   OrderPaymentConfigurationError,
   OrderPaymentNotFoundError,
   OrderPaymentTypeError,
   OrderWrongPaymentStatusError,
 } from '../../../errors.js';
+import { getOrderCart } from '../utils/getOrderCart.js';
 
 export default async function signPaymentProviderForCheckout(
   root: Root,
@@ -22,12 +22,20 @@ export default async function signPaymentProviderForCheckout(
     userId,
   });
 
-  if (!orderPaymentId) throw new InvalidIdError({ orderPaymentId });
+  let orderPayment;
 
-  const orderPayment = await modules.orders.payments.findOrderPayment({
-    orderPaymentId,
-  });
-  if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
+  if (orderPaymentId) {
+    orderPayment = await modules.orders.payments.findOrderPayment({
+      orderPaymentId,
+    });
+    if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
+  } else {
+    const order = await getOrderCart({ user: context.user }, context);
+    orderPayment = await modules.orders.payments.findOrderPayment({
+      orderPaymentId: order.paymentId,
+    });
+    if (!orderPayment) throw new OrderPaymentNotFoundError({ orderPaymentId });
+  }
 
   const provider = await modules.payment.paymentProviders.findProvider({
     paymentProviderId: orderPayment.paymentProviderId,

package/src/schema/index.ts

@@ -10,9 +10,7 @@ export const buildDefaultTypeDefs = ({ actions = [], events = [], workTypes = []
     actions?.length && `extend enum RoleAction { ${actions.join(',')} }`,
     events?.length && `extend enum EventType { ${events.join(',')} }`,
     workTypes?.length && `extend enum WorkType { ${workTypes.join(',')} }`,
-  ]
-    .filter(Boolean)
-    .join('\n');
+  ].filter(Boolean);
 
-  return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, dynamicTypeDefs];
+  return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, ...dynamicTypeDefs];
 };

package/src/schema/mutation.ts

@@ -901,7 +901,7 @@ export default [
       """
       Sign a generic order payment
       """
-      signPaymentProviderForCheckout(orderPaymentId: ID!, transactionContext: JSON): String!
+      signPaymentProviderForCheckout(orderPaymentId: ID, transactionContext: JSON): String!
 
       prepareProductMediaUpload(mediaName: String!, productId: ID!): MediaUploadTicket!
       prepareAssortmentMediaUpload(mediaName: String!, assortmentId: ID!): MediaUploadTicket!