@unchainedshop/api 3.0.0-alpha6 → 3.0.0-rc1

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

@@ -1,11 +1,13 @@
+import { WarehousingContext, WarehousingDirector } from '@unchainedshop/core';
 import {
   Product,
   ProductContractConfiguration,
   ProductContractStandard,
 } from '@unchainedshop/core-products';
-import { WarehousingContext, WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { Context } from '@unchainedshop/api';
+import { WarehousingProvider } from '@unchainedshop/core-warehousing';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
+
+import { Context } from '../../../context.js';
 import { PlanProduct } from './product-plan-types.js';
 import { checkAction } from '../../../acl.js';
 import { actions } from '../../../roles/index.js';
@@ -44,7 +46,7 @@ export const TokenizedProduct = {
       quantity?: number;
     }>
   > {
-    const { modules } = requestContext;
+    const { modules, services } = requestContext;
     const { referenceDate } = params;
 
     const deliveryProviders = await modules.delivery.findProviders({});
@@ -52,13 +54,10 @@ export const TokenizedProduct = {
     return deliveryProviders.reduce(async (oldResult, deliveryProvider) => {
       const result = await oldResult;
 
-      const warehousingProviders = await modules.warehousing.findSupported(
-        {
-          product: obj,
-          deliveryProvider,
-        },
-        requestContext,
-      );
+      const warehousingProviders = await services.orders.supportedWarehousingProviders({
+        product: obj,
+        deliveryProvider,
+      });
 
       const mappedWarehousingProviders = await Promise.all(
         warehousingProviders.map(async (warehousingProvider) => {
@@ -68,11 +67,12 @@ export const TokenizedProduct = {
             referenceDate,
           };
 
-          const stock = await modules.warehousing.estimatedStock(
+          const director = await WarehousingDirector.actions(
             warehousingProvider,
             warehousingContext,
             requestContext,
           );
+          const stock = await director.estimatedStock();
 
           return {
             warehousingProvider,

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

@@ -5,7 +5,7 @@ import { SortOption } from '@unchainedshop/utils';
 import { AssortmentPathLink } from '@unchainedshop/core-assortments';
 import { ProductMedia } from '@unchainedshop/core-products';
 import { ProductReview } from '@unchainedshop/core-products';
-import { Context } from '../../../types.js';
+import { Context } from '../../../context.js';
 
 export const Product = {
   __resolveType: (product: ProductType): string => {
@@ -37,12 +37,18 @@ export const Product = {
       offset: number;
       tags?: Array<string>;
     },
-    { modules }: Context,
+    { loaders, modules }: Context,
   ): Promise<Array<ProductMedia>> {
-    return modules.products.media.findProductMedias({
-      productId: product._id,
-      ...params,
-    });
+    if (params.offset || params.tags) {
+      return modules.products.media.findProductMedias({
+        productId: product._id,
+        ...params,
+      });
+    }
+    return (await loaders.productMediasLoader.load({ productId: product._id })).slice(
+      params.offset,
+      params.offset + params.limit,
+    );
   },
 
   async reviews(

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

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { Product, ProductAssignment, ProductConfiguration } from '@unchainedshop/core-products';
 
 export type AssignmentHelperType<T> = (

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

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { Product, ProductConfiguration } from '@unchainedshop/core-products';
 import { ProductVariation } from '@unchainedshop/core-products';
 

package/src/resolvers/type/product/product-variation-option-types.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import { ProductVariationText } from '@unchainedshop/core-products';
 
 export type OptionHelperType<P, T> = (

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

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../../context.js';
 import {
   ProductVariation as ProductVariationType,
   ProductVariationText,

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

@@ -0,0 +1,69 @@
+import { Context } from '../../context.js';
+import { SearchConfiguration } from '@unchainedshop/core-filters';
+
+type SearchResultData = {
+  searchConfiguration: SearchConfiguration & { productSelector: any };
+  totalProductIds: Array<string>;
+  aggregatedTotalProductIds: Array<string>;
+  aggregatedFilteredProductIds: Array<string>;
+};
+
+export const ProductSearchResult = {
+  productsCount: async (
+    { searchConfiguration, aggregatedTotalProductIds }: SearchResultData,
+    _: never,
+    context: Context,
+  ) => {
+    if (aggregatedTotalProductIds?.length < 1) return 0;
+
+    const { modules } = context;
+    return modules.products.search.countFilteredProducts({
+      productSelector: searchConfiguration.productSelector,
+      productIds: aggregatedTotalProductIds,
+    });
+  },
+
+  filteredProductsCount: async (
+    { searchConfiguration, aggregatedFilteredProductIds }: SearchResultData,
+    _: never,
+    context: Context,
+  ) => {
+    if (aggregatedFilteredProductIds?.length < 1) return 0;
+
+    const { modules } = context;
+    return modules.products.search.countFilteredProducts({
+      productSelector: searchConfiguration.productSelector,
+      productIds: aggregatedFilteredProductIds,
+    });
+  },
+
+  products: async (
+    { searchConfiguration, aggregatedFilteredProductIds }: SearchResultData,
+    { offset, limit },
+    context: Context,
+  ) => {
+    if (aggregatedFilteredProductIds?.length < 1) return [];
+
+    const { modules } = context;
+    return modules.products.search.findFilteredProducts({
+      limit,
+      offset,
+      productIds: aggregatedFilteredProductIds,
+      productSelector: searchConfiguration.productSelector,
+      sort: searchConfiguration.sortStage,
+    });
+  },
+
+  async filters({ searchConfiguration, totalProductIds }: SearchResultData, _: never, context: Context) {
+    const { modules, services } = context;
+    const relevantProductIds = await modules.products.findProductIds({
+      productSelector: searchConfiguration.productSelector,
+      productIds: totalProductIds,
+      includeDrafts: searchConfiguration.searchQuery.includeInactive,
+    });
+    return services.filters.loadFilters(searchConfiguration.searchQuery, {
+      productIds: relevantProductIds,
+      forceLiveCollection: searchConfiguration.forceLiveCollection,
+    });
+  },
+};

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

@@ -1,5 +1,5 @@
 import { Quotation as QuotationType } from '@unchainedshop/core-quotations';
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../context.js';
 import { User } from '@unchainedshop/core-users';
 import { Product } from '@unchainedshop/core-products';
 import { Country } from '@unchainedshop/core-countries';

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

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../context.js';
 import { Country } from '@unchainedshop/core-countries';
 import { Language } from '@unchainedshop/core-languages';
 import { checkAction } from '../../acl.js';

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

@@ -1,10 +1,10 @@
-import crypto from 'crypto';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';
 import { Product } from '@unchainedshop/core-products';
 import { WarehousingProvider } from '@unchainedshop/core-warehousing';
+import { sha256 } from '@unchainedshop/utils';
 
 export const Stock = {
-  _id: (params: {
+  _id: async (params: {
     product: Product;
     deliveryProvider: DeliveryProvider;
     warehousingProvider: WarehousingProvider;
@@ -12,17 +12,14 @@ export const Stock = {
     country: string;
     userId?: string;
   }) =>
-    crypto
-      .createHash('sha256')
-      .update(
-        [
-          params.product._id,
-          params.deliveryProvider._id,
-          params.warehousingProvider._id,
-          params.referenceDate,
-          params.country,
-          params.userId || 'ANONYMOUS',
-        ].join(''),
-      )
-      .digest('hex'),
+    await sha256(
+      [
+        params.product._id,
+        params.deliveryProvider._id,
+        params.warehousingProvider._id,
+        params.referenceDate,
+        params.country,
+        params.userId || 'ANONYMOUS',
+      ].join(''),
+    ),
 };

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

@@ -1,8 +1,9 @@
-import { Context } from '@unchainedshop/api';
-import { TokenStatus, TokenSurrogate } from '@unchainedshop/core-warehousing';
+import { Context } from '../../context.js';
+import { TokenSurrogate, TokenStatus, WarehousingProviderType } from '@unchainedshop/core-warehousing';
 import { WorkStatus } from '@unchainedshop/core-worker';
 import { checkAction } from '../../acl.js';
 import { actions } from '../../roles/index.js';
+import { WarehousingDirector } from '@unchainedshop/core';
 
 export const Token = {
   product: async (token: TokenSurrogate, params: never, { modules }: Context) => {
@@ -33,28 +34,38 @@ export const Token = {
   ) => {
     const { modules } = context;
     const product = await modules.products.findProduct({ productId: token.productId });
-    const ercMetadata = await modules.warehousing.tokenMetadata(
-      token.chainTokenId,
+
+    const virtualProviders = await context.modules.warehousing.findProviders({
+      type: WarehousingProviderType.VIRTUAL,
+    });
+
+    return WarehousingDirector.tokenMetadata(
+      virtualProviders,
       {
-        token,
         product,
-        locale: new Intl.Locale(forceLocale),
+        token,
+        locale: forceLocale ? new Intl.Locale(forceLocale) : context.localeContext,
+        quantity: token?.quantity || 1,
         referenceDate: new Date(),
       },
       context,
     );
-
-    return ercMetadata;
   },
 
   isInvalidateable: async (token: TokenSurrogate, _params: never, context: Context) => {
     const { modules } = context;
     const product = await modules.products.findProduct({ productId: token.productId });
-    const isInvalidateable = await modules.warehousing.isInvalidateable(
-      token.chainTokenId,
+
+    const virtualProviders = await context.modules.warehousing.findProviders({
+      type: WarehousingProviderType.VIRTUAL,
+    });
+
+    const isInvalidateable = await WarehousingDirector.isInvalidateable(
+      virtualProviders,
       {
         token,
         product,
+        quantity: token?.quantity || 1,
         referenceDate: new Date(),
       },
       context,

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

@@ -1,4 +1,4 @@
-import type { Bookmark } from '@unchainedshop/core-bookmarks';
+import { Bookmark } from '@unchainedshop/core-bookmarks';
 import { SortOption } from '@unchainedshop/utils';
 import { Enrollment, EnrollmentStatus } from '@unchainedshop/core-enrollments';
 import { File } from '@unchainedshop/core-files';
@@ -19,9 +19,9 @@ import { Roles, permissions } from '@unchainedshop/roles';
 import { ProductReview } from '@unchainedshop/core-products';
 import { checkAction, checkTypeResolver } from '../../acl.js';
 import { actions } from '../../roles/index.js';
-import { Context } from '../../types.js';
-import type { Contact } from '@unchainedshop/mongodb';
-import type { Country } from '@unchainedshop/core-countries';
+import { Context } from '../../context.js';
+import { Contact } from '@unchainedshop/mongodb';
+import { Country } from '@unchainedshop/core-countries';
 
 type HelperType<P, T> = (user: UserType, params: P, context: Context) => Promise<T>;
 
@@ -168,7 +168,14 @@ export const User: UserHelperTypes = {
 
   async tokens(user, params, context) {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.modules.warehousing.findTokensForUser(user);
+    const walletAddresses =
+      user.services?.web3?.flatMap((service) => {
+        return service.verified ? [service.address] : [];
+      }) || [];
+    return context.modules.warehousing.findTokensForUser({
+      userId: user._id,
+      walletAddresses,
+    });
   },
 
   async country(user, params, context) {

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

@@ -1,9 +1,6 @@
-import {
-  WarehousingError,
-  WarehousingInterface,
-  WarehousingProvider as WarehousingProviderType,
-} from '@unchainedshop/core-warehousing';
-import { Context } from '../../types.js';
+import { WarehousingDirector, WarehousingError, WarehousingInterface } from '@unchainedshop/core';
+import { WarehousingProvider as WarehousingProviderType } from '@unchainedshop/core-warehousing';
+import { Context } from '../../context.js';
 
 export type HelperType<P, T> = (provider: WarehousingProviderType, params: P, context: Context) => T;
 
@@ -14,17 +11,23 @@ export interface WarehousingProviderHelperTypes {
 }
 
 export const WarehousingProvider: WarehousingProviderHelperTypes = {
-  interface(obj, _, context) {
-    const Interface = context.modules.warehousing.findInterface(obj);
-    if (!Interface) return null;
-    return Interface;
+  interface(obj) {
+    const Adapter = WarehousingDirector.getAdapter(obj.adapterKey);
+    if (!Adapter) return null;
+    return {
+      _id: Adapter.key,
+      label: Adapter.label,
+      version: Adapter.version,
+    };
   },
 
   async configurationError(obj, _, context) {
-    return context.modules.warehousing.configurationError(obj, context);
+    const actions = await WarehousingDirector.actions(obj, {}, context);
+    return actions.configurationError();
   },
 
   async isActive(obj, _, context) {
-    return context.modules.warehousing.isActive(obj, context);
+    const actions = await WarehousingDirector.actions(obj, {}, context);
+    return actions.isActive();
   },
 };

package/src/resolvers/type/webauthn-credentials-types.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../../context.js';
 import { WebAuthnCredentials as WebAuthnCredentialsTypes } from '@unchainedshop/core-users';
 
 type HelperType<P, T> = (

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

@@ -1,4 +1,5 @@
-import { Context } from '@unchainedshop/api';
+import { WorkerDirector } from '@unchainedshop/core';
+import { Context } from '../../context.js';
 import { Work as WorkType } from '@unchainedshop/core-worker';
 import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
 
@@ -18,8 +19,11 @@ export const Work: WorkHelperTypes = {
     return modules.worker.status(obj);
   },
 
-  type: (obj, _, { modules }) => {
-    return modules.worker.type(obj);
+  type: (obj) => {
+    if (WorkerDirector.getActivePluginTypes().includes(obj.type)) {
+      return obj.type;
+    }
+    return 'UNKNOWN';
   },
 
   original: async (obj, _, { modules }) => {

package/src/roles/all.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../context.js';
 
 export const all = (role, actions) => {
   const isInLoginMutationResponse = (root) => {
@@ -23,13 +23,19 @@ export const all = (role, actions) => {
 
     if (isOwnedByUser) return true;
 
-    const accessKeyHeader = context.getHeader('x-token-accesskey') as string;
+    const accessKeyHeader = context.getHeader('x-token-accesskey');
     const accessKey = await context.modules.warehousing.buildAccessKeyForToken(tokenId);
     if (accessKeyHeader === accessKey) return true;
 
     return false;
   };
 
+  const isFilePublic = async (file) => {
+    // Non private files or no files always resolve to true
+    if (!file?.meta?.isPrivate) return true;
+    return false;
+  };
+
   role.allow(actions.viewEvent, () => false);
   role.allow(actions.viewEvents, () => false);
   role.allow(actions.viewUser, () => false);
@@ -93,6 +99,7 @@ export const all = (role, actions) => {
   role.allow(actions.viewEnrollment, () => false);
   role.allow(actions.viewTokens, () => false);
   role.allow(actions.viewStatistics, () => false);
+  role.allow(actions.uploadUserAvatar, () => false);
 
   // special case: when doing a login mutation, the user is not logged in technically yet,
   // but should be able to see user data of the user that is about to be logged in
@@ -109,6 +116,9 @@ export const all = (role, actions) => {
   role.allow(actions.updateToken, isOwnedToken);
   role.allow(actions.viewToken, isOwnedToken);
 
+  // special case: access to file downloads should work when meta.isPrivate is not set
+  role.allow(actions.downloadFile, isFilePublic);
+
   // only allow if query is not demanding for drafts or inactive item lists
   role.allow(actions.viewProducts, (root, { includeDrafts }) => !includeDrafts);
   role.allow(actions.viewAssortments, (root, { includeInactive }) => !includeInactive);

package/src/roles/index.ts

@@ -113,6 +113,9 @@ const actions: Record<string, string> = [
   'heartbeat',
   'confirmMediaUpload',
   'viewStatistics',
+  'removeUser',
+  'downloadFile',
+  'uploadUserAvatar',
 ].reduce((oldValue, actionValue) => {
   const newValue = oldValue;
   newValue[actionValue] = actionValue;

package/src/roles/loggedIn.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/api';
+import { Context } from '../context.js';
 import { User } from '@unchainedshop/core-users';
 
 export const loggedIn = (role: any, actions: Record<string, string>) => {
@@ -15,6 +15,14 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
     // user wants to access himself
     return true;
   };
+  const canUpdateAvatar = (_, params: { userId?: string } = {}, context: Context) => {
+    const isVerified = context?.user?.emails.some(({ verified }) => verified);
+    if (!isVerified) return false;
+    if (params?.userId) {
+      return params?.userId === context?.userId;
+    }
+    return true;
+  };
 
   const isOwnedEmailAddress = (obj: any, params: { email?: string }, { user }: Context) => {
     return user?.emails?.some(
@@ -193,6 +201,18 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
     return credentials.userId === userId;
   };
 
+  const isFileAccessible = async (file, _, context) => {
+    const user = context?.user;
+
+    // Non private files or no files always resolve to true
+    if (!file?.meta?.isPrivate) return true;
+
+    // If private file, only return true if owned
+    if (file?.meta?.userId === user?._id) return true;
+
+    return false;
+  };
+
   role.allow(actions.viewUser, isMyself);
   role.allow(actions.viewUserRoles, isMyself);
   role.allow(actions.viewUserOrders, isMyself);
@@ -202,6 +222,7 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
   role.allow(actions.viewUserProductReviews, isMyself);
   role.allow(actions.viewUserTokens, isMyself);
   role.allow(actions.updateUser, isMyself);
+  role.allow(actions.removeUser, isMyself);
   role.allow(actions.sendEmail, isOwnedEmailAddress);
   role.allow(actions.viewOrder, isOwnedOrder);
   role.allow(actions.updateOrder, isOwnedOrder);
@@ -225,4 +246,6 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
   role.allow(actions.registerPaymentCredentials, () => true);
   role.allow(actions.managePaymentCredentials, isOwnedPaymentCredential);
   role.allow(actions.confirmMediaUpload, () => true);
+  role.allow(actions.downloadFile, isFileAccessible);
+  role.allow(actions.uploadUserAvatar, canUpdateAvatar);
 };

package/src/schema/mutation.ts

@@ -304,7 +304,12 @@ export default [
       """
       Remove any user or logged in user if userId is not provided
       """
-      removeUser(userId: ID): User!
+      removeUser(userId: ID, removeUserReviews: Boolean): User!
+
+      """
+      Remove product reviews of a user
+      """
+      removeUserProductReviews(userId: ID!): Boolean!
 
       """
       Enroll a new user, setting enroll to true will let the user choose his password (e-mail gets sent)

package/src/schema/query.ts

@@ -15,12 +15,19 @@ export default [
         includeGuests: Boolean = false
         queryString: String
         sort: [SortOptionInput!]
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
       ): [User!]!
 
       """
       Get total number of users in the system that match query
       """
-      usersCount(includeGuests: Boolean = false, queryString: String): Int!
+      usersCount(
+        includeGuests: Boolean = false
+        queryString: String
+        emailVerified: Boolean
+        lastLogin: DateFilterInput
+      ): Int!
 
       """
       Specific user data if userId provided, else returns currently logged in
@@ -475,15 +482,15 @@ export default [
       """
       Returns aggregated report of all the events that occurred in the system
       """
-      eventStatistics(types: [String!], from: Timestamp, to: Timestamp): [EventStatistics!]!
+      eventStatistics(types: [String!], dateRange: DateFilterInput): [EventStatistics!]!
       """
       Returns aggregated report of all the orders that occurred in the system
       """
-      orderStatistics(from: Timestamp, to: Timestamp): OrderStatistics!
+      orderStatistics(dateRange: DateFilterInput): OrderStatistics!
       """
       Returns aggregated report of all the worker jobs that occurred in the system
       """
-      workStatistics(types: [String!], from: Timestamp, to: Timestamp): [WorkStatistics!]!
+      workStatistics(types: [String!], dateRange: DateFilterInput): [WorkStatistics!]!
     }
   `,
 ];

package/src/schema/types/assortment.ts

@@ -10,7 +10,7 @@ export default [
     type AssortmentMedia @cacheControl(maxAge: 180) {
       _id: ID!
       tags: [LowerCaseString!]
-      file: Media!
+      file: Media
       sortKey: Int!
       texts(forceLocale: String): AssortmentMediaTexts
     }

package/src/schema/types/media.ts

@@ -5,7 +5,7 @@ export default [
       name: String!
       type: String!
       size: Int!
-      url(version: String = "original", baseUrl: String): String!
+      url(version: String = "original", baseUrl: String): String
     }
   `,
 ];

package/src/schema/types/product/product.ts

@@ -33,7 +33,7 @@ export default [
     type ProductMedia @cacheControl(maxAge: 180) {
       _id: ID!
       tags: [LowerCaseString!]
-      file: Media!
+      file: Media
       sortKey: Int!
       texts(forceLocale: String): ProductMediaTexts
     }

package/tsconfig.json

@@ -1,9 +1,9 @@
 {
   "extends": "../shared/base.tsconfig.json",
   "compilerOptions": {
-    "rootDir": "src",
-    "outDir": "lib"
+    "declarationDir": "./lib",
+    "rootDir": "./src",
+    "outDir": "./lib"
   },
-  "exclude": ["**/*.test.ts", "**/*.test.js", "tests"],
-  "include": ["./src"]
+  "exclude": ["**/*.test.ts", "**/*.test.js", "tests", "lib"]
 }