@unchainedshop/api 2.12.2 → 2.13.1

package/lib/schema/mutation.js

@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid

package/lib/user-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-context.d.ts","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAc7D,eAAO,MAAM,cAAc,QACpB,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,OACnC,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,oBAAoB,CAkE9B,CAAC"}
+{"version":3,"file":"user-context.d.ts","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAiC7D,eAAO,MAAM,cAAc,QACpB,eAAe,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,OACnC,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,oBAAoB,CAsD9B,CAAC"}

package/lib/user-context.js

@@ -3,26 +3,27 @@ function isString(input) {
     return typeof input === 'string' && Object.prototype.toString.call(input) === '[object String]';
 }
 const { UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, NODE_ENV, } = process.env;
-export const getUserContext = async (req, res, unchainedAPI) => {
-    // there is a possible current user connected!
+function setLoginToken(res, token, expires) {
     const cookieName = UNCHAINED_COOKIE_NAME;
     const domain = UNCHAINED_COOKIE_DOMAIN;
     const path = UNCHAINED_COOKIE_PATH;
+    if (!domain)
+        return;
+    const authCookie = cookie.serialize(cookieName, token || null, {
+        domain,
+        httpOnly: true,
+        path,
+        expires: token && expires ? expires : undefined,
+        maxAge: token ? undefined : -1,
+        sameSite: 'lax',
+        secure: NODE_ENV === 'production',
+    });
+    res.setHeader('Set-Cookie', authCookie);
+}
+export const getUserContext = async (req, res, unchainedAPI) => {
+    // there is a possible current user connected!
+    const cookieName = UNCHAINED_COOKIE_NAME;
     let loginToken = req.cookies?.[cookieName];
-    function setLoginToken(token, expires) {
-        if (!domain)
-            return;
-        const authCookie = cookie.serialize(cookieName, token || null, {
-            domain,
-            httpOnly: true,
-            path,
-            expires: token ? expires : undefined,
-            maxAge: token ? undefined : -1,
-            sameSite: 'lax',
-            secure: NODE_ENV === 'production',
-        });
-        res.setHeader('Set-Cookie', authCookie);
-    }
     if (req.headers.authorization) {
         const [type, token] = req.headers.authorization.split(' ');
         if (type === 'Bearer') {
@@ -57,6 +58,9 @@ export const getUserContext = async (req, res, unchainedAPI) => {
                 };
             }
         }
+        // If there is no user with this token or the token is expires/invalid,
+        // we should remove that cookie from the client
+        setLoginToken(res, null);
         return { loginToken: loginToken, setLoginToken };
     }
     return { setLoginToken };

package/lib/user-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user-context.js","sourceRoot":"","sources":["../src/user-context.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.12.2",
+  "version": "2.13.1",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -40,35 +40,35 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@apollo/server": "^4.10.4",
+    "@apollo/server": "^4.10.5",
     "cookie": "~0.6"
   },
   "optionalDependencies": {
     "express": "~4"
   },
   "dependencies": {
-    "@metamask/eth-sig-util": "^7.0.2",
-    "@unchainedshop/core": "^2.12.2",
-    "@unchainedshop/events": "^2.12.2",
-    "@unchainedshop/logger": "^2.12.2",
-    "@unchainedshop/roles": "^2.12.2",
-    "@unchainedshop/utils": "^2.12.2",
+    "@metamask/eth-sig-util": "^7.0.3",
+    "@unchainedshop/core": "^2.13.0",
+    "@unchainedshop/events": "^2.13.0",
+    "@unchainedshop/logger": "^2.13.0",
+    "@unchainedshop/roles": "^2.13.0",
+    "@unchainedshop/utils": "^2.13.0",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
     "graphql-upload": "^16.0.2",
     "locale": "0.1.0",
     "lodash.isnumber": "3.0.3",
-    "lru-cache": "^11.0.0"
+    "memoizee": "^0.4.17"
   },
   "devDependencies": {
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.14.10",
-    "@unchainedshop/types": "^2.12.2",
+    "@types/node": "^20.14.12",
+    "@unchainedshop/types": "^2.13.0",
     "express": "^4.19.2",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.2",
-    "typescript": "^5.5.3"
+    "ts-jest": "^29.2.3",
+    "typescript": "^5.5.4"
   }
 }

package/src/express/createBulkImportMiddleware.ts

@@ -30,6 +30,7 @@ export default async function bulkImportMiddleware(req, res) {
 
     const input: any = {
       createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
+      updateShouldUpsertIfIDNotExists: !!req.query?.updateShouldUpsertIfIDNotExists,
       skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
       remoteAddress: context.remoteAddress,
     };

package/src/locale-context.ts

@@ -6,73 +6,77 @@ import { log, LogLevel } from '@unchainedshop/logger';
 import {
   resolveBestCountry,
   resolveBestSupported,
+  resolveBestCurrency,
   resolveUserRemoteAddress,
   systemLocale,
 } from '@unchainedshop/utils';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
-import * as lruCache from 'lru-cache';
+import memoizee from 'memoizee';
 
 const { Locales } = localePkg;
 
 const { NODE_ENV } = process.env;
 
-const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second
+export const resolveDefaultContext = memoizee(
+  async ({ acceptLang, acceptCountry }, unchainedAPI) => {
+    const languages = await unchainedAPI.modules.languages.findLanguages(
+      { includeInactive: false },
+      { projection: { isoCode: 1, isActive: 1 } },
+    );
 
-const localeContextCache = new lruCache.LRUCache({
-  max: 500,
-  ttl,
-});
+    const countries = await unchainedAPI.modules.countries.findCountries(
+      { includeInactive: false },
+      { projection: { isoCode: 1, isActive: 1 } },
+    );
 
-export const getLocaleContext = async (
-  req: IncomingMessage,
-  res: OutgoingMessage,
-  unchainedAPI: UnchainedCore,
-): Promise<UnchainedLocaleContext> => {
-  const cacheKey = `${req.headers['accept-language']}:${req.headers['x-shop-country']}`;
-  const cachedContext = localeContextCache.get(cacheKey) as UnchainedLocaleContext;
+    const currencies = await unchainedAPI.modules.currencies.findCurrencies({ includeInactive: false });
 
-  const userAgent = req.headers['user-agent'];
-  const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+    const supportedLocaleStrings = languages.reduce((accumulator, language) => {
+      const added = countries.map((country) => {
+        return `${language.isoCode}-${country.isoCode}`;
+      });
+      return accumulator.concat(added);
+    }, []);
 
-  if (cachedContext) return { remoteAddress, remotePort, userAgent, ...cachedContext };
+    const supportedLocales = new Locales(supportedLocaleStrings, systemLocale.code);
 
-  // return the parsed locale by bcp47 and
-  // return the best resolved normalized locale by locale according to system-wide configuration
-  // else fallback to base language & base country
+    const localeContext = resolveBestSupported(acceptLang, supportedLocales);
+    const countryContext = resolveBestCountry(localeContext.country, acceptCountry, countries);
 
-  const languages = await unchainedAPI.modules.languages.findLanguages(
-    { includeInactive: false },
-    { projection: { isoCode: 1, isActive: 1 } },
-  );
-
-  const countries = await unchainedAPI.modules.countries.findCountries(
-    { includeInactive: false },
-    { projection: { isoCode: 1, isActive: 1 } },
-  );
+    const countryObject = countries.find((country) => country.isoCode === countryContext);
+    const currencyContext = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
 
-  const supportedLocaleStrings = languages.reduce((accumulator, language) => {
-    const added = countries.map((country) => {
-      return `${language.isoCode}-${country.isoCode}`;
+    log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext} ${currencyContext}`, {
+      level: LogLevel.Debug,
     });
-    return accumulator.concat(added);
-  }, []);
 
-  const supportedLocales = new Locales(supportedLocaleStrings, systemLocale.code);
+    const newContext: UnchainedLocaleContext = {
+      localeContext,
+      countryContext,
+      currencyContext,
+    };
 
-  const localeContext = resolveBestSupported(req.headers['accept-language'], supportedLocales);
-  const countryContext = resolveBestCountry(
-    localeContext.country,
-    req.headers['x-shop-country'],
-    countries,
-  );
-  log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext}`, {
-    level: LogLevel.Debug,
-  });
-  const newContext: UnchainedLocaleContext = {
-    localeContext,
-    countryContext,
-  };
-  localeContextCache.set(cacheKey, newContext);
+    return newContext;
+  },
+  {
+    maxAge: NODE_ENV === 'production' ? 1000 * 60 : 100, // minute or 100ms
+    promise: true,
+    normalizer(args) {
+      return `${args[0].acceptLang}-${args[0].acceptCountry}`;
+    },
+  },
+);
 
-  return { remoteAddress, remotePort, userAgent, ...newContext };
+export const getLocaleContext = async (
+  req: IncomingMessage,
+  res: OutgoingMessage,
+  unchainedAPI: UnchainedCore,
+): Promise<UnchainedLocaleContext> => {
+  const userAgent = req.headers['user-agent'];
+  const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+  const context = await resolveDefaultContext(
+    { acceptLang: req.headers['accept-language'], acceptCountry: req.headers['x-shop-country'] },
+    unchainedAPI,
+  );
+  return { remoteAddress, remotePort, userAgent, ...context };
 };

package/src/resolvers/mutations/accounts/logout.ts

@@ -21,7 +21,7 @@ export default async function logout(root: Root, { token }: { token: string }, c
       ...loggedOut.error,
     });
   } else {
-    setLoginToken(null);
+    setLoginToken(context.res, null);
   }
 
   return { success: loggedOut.success };

package/src/resolvers/mutations/accounts/logoutAllSessions.ts

@@ -20,7 +20,7 @@ export default async function logoutAllSessions(root: Root, _: any, context: Con
       ...loggedOut.error,
     });
   } else {
-    setLoginToken(null);
+    setLoginToken(context.res, null);
   }
 
   return { success: loggedOut.success };

package/src/resolvers/mutations/countries/updateCountry.ts

@@ -5,7 +5,7 @@ import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function updateCountry(
   root: Root,
-  { country, countryId }: { country: Country; countryId: string },
+  { country, countryId }: { country: Country & { defaultCurrencyId: string }; countryId: string },
   { userId, modules }: Context,
 ) {
   log(`mutation updateCountry ${countryId}`, { userId });
@@ -15,7 +15,12 @@ export default async function updateCountry(
   if (!(await modules.countries.countryExists({ countryId })))
     throw new CountryNotFoundError({ countryId });
 
-  await modules.countries.update(countryId, country);
+  const currencyObject = await modules.currencies.findCurrency({
+    currencyId: country.defaultCurrencyId,
+  });
+  const defaultCurrencyCode = country?.defaultCurrencyCode || currencyObject?.isoCode;
+
+  await modules.countries.update(countryId, { ...country, defaultCurrencyCode });
 
   return modules.countries.findCountry({ countryId });
 }

package/src/resolvers/mutations/enrollments/createEnrollment.ts

@@ -13,7 +13,7 @@ export default async function createEnrollment(
   { contact, plan, billingAddress, payment, delivery, meta },
   context: Context,
 ) {
-  const { countryContext, modules, userId } = context;
+  const { countryContext, currencyContext, modules, userId } = context;
 
   log('mutation createEnrollment', { userId });
 
@@ -40,6 +40,7 @@ export default async function createEnrollment(
       configuration,
       contact,
       countryCode: countryContext,
+      currencyCode: currencyContext,
       delivery,
       meta,
       payment,

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

@@ -9,6 +9,7 @@ export default async function confirmOrder(
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
   },
   context: Context,
 ) {

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

@@ -9,6 +9,7 @@ export default async function rejectOrder(
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
   },
   context: Context,
 ) {
@@ -16,6 +17,7 @@ export default async function rejectOrder(
   const { orderId, ...transactionContext } = params;
 
   log('mutation rejectOrder', { orderId, userId });
+
   if (!orderId) throw new InvalidIdError({ orderId });
 
   const order = await modules.orders.findOrder({ orderId });

package/src/resolvers/type/country-types.ts

@@ -13,9 +13,9 @@ export interface CountryHelperTypes {
 
 export const Country: CountryHelperTypes = {
   defaultCurrency: async (country, _, { modules }) => {
-    if (country.defaultCurrencyId) {
+    if (country.defaultCurrencyCode) {
       return modules.currencies.findCurrency({
-        currencyId: country.defaultCurrencyId,
+        isoCode: country.defaultCurrencyCode,
       });
     }
     return null;

package/src/resolvers/type/delivery-provider-types.ts

@@ -59,17 +59,9 @@ export const DeliveryProvider: DeliveryProviderHelperTypes = {
     { currency: currencyCode, orderId, useNetPrice, context: providerContext },
     requestContext,
   ) {
-    const { modules, services, countryContext: country, user } = requestContext;
+    const { modules, countryContext: country, user } = requestContext;
     const order = await modules.orders.findOrder({ orderId });
-
-    const currency =
-      currencyCode ||
-      (await services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: country,
-        },
-        requestContext,
-      ));
+    const currency = currencyCode || requestContext.currencyContext;
 
     const pricingDirector = await DeliveryPricingDirector.actions(
       {

package/src/resolvers/type/login-method-response-types.ts

@@ -10,8 +10,8 @@ export const LoginMethodResponse = {
 
     return user;
   },
-  token({ token, tokenExpires }, _, { setLoginToken }: Context) {
-    setLoginToken(token, tokenExpires);
+  token({ token, tokenExpires }, _, { res, setLoginToken }: Context) {
+    setLoginToken(res, token, tokenExpires);
     return token;
   },
 };

package/src/resolvers/type/payment/payment-provider-types.ts

@@ -59,17 +59,10 @@ export const PaymentProvider: PaymentProviderHelperTypes = {
     { currency: currencyCode, orderId, useNetPrice, context: providerContext },
     requestContext,
   ) {
-    const { modules, services, countryContext: country, user } = requestContext;
+    const { modules, countryContext: country, user } = requestContext;
     const order = await modules.orders.findOrder({ orderId });
 
-    const currency =
-      currencyCode ||
-      (await services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: country,
-        },
-        requestContext,
-      ));
+    const currency = currencyCode || requestContext.currencyContext;
 
     const pricingDirector = await PaymentPricingDirector.actions(
       {

package/src/resolvers/type/product/product-configurable-types.ts

@@ -58,14 +58,7 @@ export const ConfigurableProduct = {
     requestContext: Context,
   ): Promise<ProductPriceRange> {
     const { countryContext, modules } = requestContext;
-    const currencyCode =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currencyCode = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.catalogPriceRange(product, {
       quantity,
       vectors,
@@ -111,14 +104,8 @@ export const ConfigurableProduct = {
     requestContext: Context,
   ): Promise<ProductPriceRange> {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
+
     return modules.products.prices.simulatedPriceRange(
       product,
       {

package/src/resolvers/type/product/product-plan-types.ts

@@ -11,17 +11,10 @@ export const PlanProduct = {
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { modules, countryContext } = requestContext;
-    const currencyCode =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.price(product, {
       country: countryContext,
-      currency: currencyCode,
+      currency,
       quantity,
     });
   },
@@ -36,14 +29,8 @@ export const PlanProduct = {
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
+
     return modules.products.prices.userPrice(
       obj,
       { quantity, userId: requestContext.userId, currency, country: countryContext, useNetPrice },
@@ -63,14 +50,7 @@ export const PlanProduct = {
     }>
   > {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.catalogPricesLeveled(obj, { currency, country: countryContext });
   },
 

package/src/schema/inputTypes.ts

@@ -44,7 +44,8 @@ export default [
     input UpdateCountryInput {
       isoCode: String!
       isActive: Boolean
-      defaultCurrencyId: String
+      defaultCurrencyCode: String
+      defaultCurrencyId: String @deprecated(reason: "Use defaultCurrencyCode instead")
     }
 
     input CreateCurrencyInput {

package/src/schema/mutation.ts

@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid

package/src/user-context.ts

@@ -14,6 +14,25 @@ const {
   NODE_ENV,
 } = process.env;
 
+function setLoginToken(res: OutgoingMessage, token: string | null, expires?: Date) {
+  const cookieName = UNCHAINED_COOKIE_NAME;
+  const domain = UNCHAINED_COOKIE_DOMAIN;
+  const path = UNCHAINED_COOKIE_PATH;
+
+  if (!domain) return;
+
+  const authCookie = cookie.serialize(cookieName, token || null, {
+    domain,
+    httpOnly: true,
+    path,
+    expires: token && expires ? expires : undefined,
+    maxAge: token ? undefined : -1,
+    sameSite: 'lax',
+    secure: NODE_ENV === 'production',
+  });
+  res.setHeader('Set-Cookie', authCookie);
+}
+
 export const getUserContext = async (
   req: IncomingMessage & { cookies?: any },
   res: OutgoingMessage,
@@ -21,25 +40,8 @@ export const getUserContext = async (
 ): Promise<UnchainedUserContext> => {
   // there is a possible current user connected!
   const cookieName = UNCHAINED_COOKIE_NAME;
-  const domain = UNCHAINED_COOKIE_DOMAIN;
-  const path = UNCHAINED_COOKIE_PATH;
-
   let loginToken = req.cookies?.[cookieName];
 
-  function setLoginToken(token: string, expires: Date) {
-    if (!domain) return;
-    const authCookie = cookie.serialize(cookieName, token || null, {
-      domain,
-      httpOnly: true,
-      path,
-      expires: token ? expires : undefined,
-      maxAge: token ? undefined : -1,
-      sameSite: 'lax',
-      secure: NODE_ENV === 'production',
-    });
-    res.setHeader('Set-Cookie', authCookie);
-  }
-
   if (req.headers.authorization) {
     const [type, token] = req.headers.authorization.split(' ');
     if (type === 'Bearer') {
@@ -80,6 +82,11 @@ export const getUserContext = async (
         };
       }
     }
+
+    // If there is no user with this token or the token is expires/invalid,
+    // we should remove that cookie from the client
+    setLoginToken(res, null);
+
     return { loginToken: loginToken as string, setLoginToken };
   }