@unchainedshop/api 4.0.0-rc.16 → 4.0.0-rc.18

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

@@ -13,7 +13,7 @@ export const PlanProduct = {
     product: ProductType,
     { quantity, currencyCode: forcedCurrencyCode }: { quantity?: number; currencyCode?: string },
     requestContext: Context,
-  ): Promise<ProductPrice> {
+  ): Promise<ProductPrice | null> {
     const { modules, countryCode } = requestContext;
     const currencyCode = forcedCurrencyCode || requestContext.currencyCode;
     return modules.products.prices.price(product, {
@@ -37,7 +37,7 @@ export const PlanProduct = {
       configuration?: ProductConfiguration[];
     },
     requestContext: Context,
-  ): Promise<ProductPrice> {
+  ): Promise<ProductPrice | null> {
     const { countryCode, user, services } = requestContext;
     const currencyCode = forcedCurrencyCode || requestContext.currencyCode;
 
@@ -46,7 +46,8 @@ export const PlanProduct = {
       user,
       countryCode,
       currencyCode,
-      quantity,
+      quantity: quantity || 1,
+      discounts: [],
       configuration,
     };
 
@@ -58,7 +59,8 @@ export const PlanProduct = {
       ...unitPrice,
       isNetPrice: useNetPrice,
       isTaxable: pricing.taxSum() > 0,
-      currencyCode: pricing.currencyCode,
+      currencyCode: pricing.currencyCode || requestContext.currencyCode,
+      countryCode: requestContext.countryCode,
     };
   },
 
@@ -78,13 +80,13 @@ export const PlanProduct = {
     return modules.products.prices.catalogPricesLeveled(product, { currencyCode, countryCode });
   },
 
-  salesUnit({ commerce }: ProductType): string {
-    return commerce?.salesUnit;
+  salesUnit({ commerce }: ProductType): string | null {
+    return commerce?.salesUnit || null;
   },
-  salesQuantityPerUnit({ commerce }: ProductType): string {
-    return commerce?.salesQuantityPerUnit;
+  salesQuantityPerUnit({ commerce }: ProductType): string | null {
+    return commerce?.salesQuantityPerUnit || null;
   },
-  defaultOrderQuantity({ commerce }: ProductType): number {
-    return commerce?.defaultOrderQuantity;
+  defaultOrderQuantity({ commerce }: ProductType): number | null {
+    return commerce?.defaultOrderQuantity || null;
   },
 };

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

@@ -28,7 +28,7 @@ export const ProductReview: ProductReviewHelperTypes = {
   },
 
   ownVotes: async (obj, _, { modules, userId }) => {
-    return modules.products.reviews.votes.ownVotes(obj, { userId });
+    return modules.products.reviews.votes.ownVotes(obj, { userId: userId! });
   },
 
   voteCount: (obj, { type }, { modules }) => {

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

@@ -59,7 +59,7 @@ export const SimpleProduct = {
     return warehousing?.sku;
   },
 
-  dimensions({ supply }): ProductSupply {
+  dimensions({ supply }): ProductSupply | null {
     if (!supply) return null;
     const { weightInGram, heightInMillimeters, lengthInMillimeters, widthInMillimeters } = supply;
     return {

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

@@ -14,11 +14,11 @@ import { actions } from '../../../roles/index.js';
 export const TokenizedProduct = {
   ...PlanProduct,
 
-  contractAddress({ tokenization }: Product): string {
-    return tokenization?.contractAddress;
+  contractAddress({ tokenization }: Product): string | null {
+    return tokenization?.contractAddress || null;
   },
 
-  contractConfiguration({ tokenization }: Product): ProductContractConfiguration {
+  contractConfiguration({ tokenization }: Product): ProductContractConfiguration | null {
     if (!tokenization) return null;
     return {
       supply: tokenization.supply,
@@ -27,8 +27,8 @@ export const TokenizedProduct = {
     };
   },
 
-  contractStandard({ tokenization }: Product): ProductContractStandard {
-    return tokenization?.contractStandard;
+  contractStandard({ tokenization }: Product): ProductContractStandard | null {
+    return tokenization?.contractStandard || null;
   },
 
   async simulatedStocks(
@@ -61,6 +61,6 @@ export const TokenizedProduct = {
   },
 };
 
-delete TokenizedProduct.salesUnit;
-delete TokenizedProduct.salesQuantityPerUnit;
-delete TokenizedProduct.defaultOrderQuantity;
+delete (TokenizedProduct as any).salesUnit;
+delete (TokenizedProduct as any).salesQuantityPerUnit;
+delete (TokenizedProduct as any).defaultOrderQuantity;

package/src/resolvers/type/product/product-variation-assignment-vector.ts

@@ -10,8 +10,8 @@ export type AssignmentVectorHelperType<T> = (
 
 export interface ProductVariationAssignmentVectorHelperTypes {
   _id: AssignmentVectorHelperType<string>;
-  option: AssignmentVectorHelperType<Promise<{ _id: string; productVariationOption: string }>>;
-  variation: AssignmentVectorHelperType<Promise<ProductVariation>>;
+  option: AssignmentVectorHelperType<Promise<{ _id: string; productVariationOption: string } | null>>;
+  variation: AssignmentVectorHelperType<Promise<ProductVariation | null>>;
 }
 
 export const ProductVariationAssignmentVector: ProductVariationAssignmentVectorHelperTypes = {

package/src/resolvers/type/product-search-result-types.ts

@@ -59,9 +59,9 @@ export const ProductSearchResult = {
     const relevantProductIds = await modules.products.findProductIds({
       productSelector: searchConfiguration.productSelector,
       productIds: totalProductIds,
-      includeDrafts: searchConfiguration.searchQuery.includeInactive,
+      includeDrafts: searchConfiguration.searchQuery?.includeInactive,
     });
-    return services.filters.loadFilters(searchConfiguration.searchQuery, {
+    return services.filters.loadFilters(searchConfiguration.searchQuery || {}, {
       productIds: relevantProductIds,
       forceLiveCollection: searchConfiguration.forceLiveCollection,
     });

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

@@ -3,10 +3,10 @@ import { Context } from '../../context.js';
 
 export const Quotation = {
   country: async (obj: QuotationType, _: never, { loaders }: Context) =>
-    loaders.countryLoader.load({ isoCode: obj.countryCode }),
+    obj.countryCode ? loaders.countryLoader.load({ isoCode: obj.countryCode }) : null,
 
   currency: async (obj: QuotationType, _: never, { loaders }: Context) =>
-    loaders.currencyLoader.load({ isoCode: obj.currencyCode }),
+    obj.currencyCode ? loaders.currencyLoader.load({ isoCode: obj.currencyCode }) : null,
 
   isExpired: (obj: QuotationType, { referenceDate }: { referenceDate: Date }, { modules }: Context) =>
     modules.quotations.isExpired(obj, { referenceDate }),

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

@@ -27,7 +27,8 @@ export const Shop: ShopHelperTypes = {
   userRoles: async (_root, _params, context) => {
     await checkAction(context, (actions as any).manageUsers);
     return Object.values(allRoles)
-      .map(({ name }) => name)
-      .filter((name) => name.substring(0, 2) !== '__');
+      .map((i) => i?.name)
+      .filter(Boolean)
+      .filter((name: string) => name.substring(0, 2) !== '__') as string[];
   },
 };

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

@@ -44,10 +44,10 @@ export interface UserHelperTypes {
   created: HelperType<any, Date>;
   updated: HelperType<any, Date>;
   deleted: HelperType<any, Date>;
-  avatar: HelperType<{ locale: Intl.Locale }, File>;
+  avatar: HelperType<{ locale: Intl.Locale }, File | null>;
   bookmarks: HelperType<any, Bookmark[]>;
-  cart: HelperType<{ orderNumber?: string }, Order>;
-  country: HelperType<{ locale: Intl.Locale }, Country>;
+  cart: HelperType<{ orderNumber?: string }, Order | null>;
+  country: HelperType<{ locale: Intl.Locale }, Country | null>;
   emails: HelperType<any, string[]>;
   enrollments: HelperType<
     {
@@ -162,6 +162,7 @@ export const User: UserHelperTypes = {
   avatar: async (user, params, context) => {
     await checkAction(context, viewUserPublicInfos, [user, params]);
     const { loaders } = context;
+    if (!user.avatarId) return null;
     return loaders.fileLoader.load({
       fileId: user.avatarId,
     });
@@ -199,7 +200,7 @@ export const User: UserHelperTypes = {
   async country(user, params, context) {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
     const userLocale = context.modules.users.userLocale(user);
-
+    if (!userLocale.region) return null;
     return context.loaders.countryLoader.load({
       isoCode: userLocale.region,
     });

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

@@ -5,8 +5,8 @@ import { Context } from '../../context.js';
 export type HelperType<P, T> = (provider: WarehousingProviderType, params: P, context: Context) => T;
 
 export interface WarehousingProviderHelperTypes {
-  configurationError: HelperType<never, Promise<WarehousingError>>;
-  interface: HelperType<never, WarehousingInterface>;
+  configurationError: HelperType<never, Promise<WarehousingError | null>>;
+  interface: HelperType<never, WarehousingInterface | null>;
   isActive: HelperType<never, Promise<boolean>>;
 }
 

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

@@ -11,7 +11,7 @@ export interface WorkHelperTypes {
   result: HelperType<never, any>;
   input: HelperType<never, any>;
   error: HelperType<never, any>;
-  original: HelperType<never, Promise<WorkType>>;
+  original: HelperType<never, Promise<WorkType | null>>;
 }
 
 export const Work: WorkHelperTypes = {

package/src/roles/all.ts

@@ -11,7 +11,7 @@ export const all = (role, actions) => {
   const isOwnedToken = async (root: any, params: { tokenId: string } | null, context: Context) => {
     const { modules, userId, user } = context;
 
-    const tokenId = params?.tokenId || (root && 'chainTokenId' in root && root._id) || null;
+    const tokenId = params?.tokenId || (root && 'tokenSerialNumber' in root && root._id) || null;
 
     const token = await modules.warehousing.findToken({ tokenId });
     if (!token) return true;
@@ -26,7 +26,7 @@ export const all = (role, actions) => {
 
     const accessKeyHeader = context.getHeader('x-token-accesskey');
     const accessKey = await context.modules.warehousing.buildAccessKeyForToken(tokenId);
-    if (accessKeyHeader === accessKey) return true;
+    if (accessKeyHeader && accessKeyHeader === accessKey) return true;
 
     return false;
   };

package/src/roles/index.ts

@@ -126,11 +126,17 @@ const actions: Record<string, string> = [
   return newValue;
 }, {});
 
-const configureRoles = ({ additionalRoles = {}, additionalActions = [] }) => {
-  additionalActions.forEach((action) => {
+const configureRoles = ({
+  additionalRoles,
+  additionalActions,
+}: {
+  additionalRoles?: Record<string, any>;
+  additionalActions?: string[];
+}) => {
+  additionalActions?.forEach((action) => {
     actions[action] = action;
   });
-  Object.entries(additionalRoles).forEach(([key, val]: [string, any]) => {
+  Object.entries(additionalRoles || {}).forEach(([key, val]: [string, any]) => {
     allRoles[key] = new Role(key);
     val(allRoles[key], actions);
   });

package/src/schema/index.ts

@@ -10,7 +10,7 @@ import { createLogger } from '@unchainedshop/logger';
 
 const logger = createLogger('unchained:api');
 
-export const buildDefaultTypeDefs = ({ actions = [] }) => {
+export const buildDefaultTypeDefs = ({ actions = [] }: { actions: string[] }) => {
   logger.debug(`${actions.length} role actions added to GraphQL schema`, { actions });
 
   const events = getRegisteredEvents() || [];
@@ -20,9 +20,9 @@ export const buildDefaultTypeDefs = ({ actions = [] }) => {
   logger.debug(`${workTypes.length} work types added to GraphQL schema`, { workTypes });
 
   const dynamicTypeDefs = [
-    actions?.length && `extend enum RoleAction { ${actions.join(',')} }`,
-    events?.length && `extend enum EventType { ${events.join(',')} }`,
-    workTypes?.length && `extend enum WorkType { ${workTypes.join(',')} }`,
+    actions?.length ? `extend enum RoleAction { ${actions.join(',')} }` : '',
+    events?.length ? `extend enum EventType { ${events.join(',')} }` : '',
+    workTypes?.length ? `extend enum WorkType { ${workTypes.join(',')} }` : '',
   ].filter(Boolean);
 
   return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, ...dynamicTypeDefs];

package/src/schema/types/warehousing.ts

@@ -58,7 +58,7 @@ export default [
       contractAddress: String
       walletAddress: String
       chainId: String
-      chainTokenId: String
+      tokenSerialNumber: String
       ercMetadata(forceLocale: Locale): JSON
     }
   `,

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

@@ -1,31 +0,0 @@
-function hexToRgb(hex) {
-  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-  return result
-    ? {
-        r: parseInt(result[1], 16),
-        g: parseInt(result[2], 16),
-        b: parseInt(result[3], 16),
-      }
-    : null;
-}
-
-export const Color = {
-  name({ colorName }) {
-    return colorName;
-  },
-  hex({ colorHex }) {
-    return colorHex;
-  },
-  red({ colorHex }) {
-    const result = hexToRgb(colorHex);
-    return result.r || 0;
-  },
-  green({ colorHex }) {
-    const result = hexToRgb(colorHex);
-    return result.g || 0;
-  },
-  blue({ colorHex }) {
-    const result = hexToRgb(colorHex);
-    return result.b || 0;
-  },
-};