@unchainedshop/api 2.0.0-beta8 → 2.0.0-rc.1

package/src/resolvers/mutations/worker/finishWork.ts

@@ -23,18 +23,14 @@ export default async function finishWork(
 
   if (!workId) throw new InvalidIdError({ workId });
 
-  const work = await modules.worker.finishWork(
-    workId,
-    {
-      result,
-      error,
-      success,
-      worker,
-      started,
-      finished,
-    },
-    userId,
-  );
+  const work = await modules.worker.finishWork(workId, {
+    result,
+    error,
+    success,
+    worker,
+    started,
+    finished,
+  });
 
   if (!work) throw new WorkNotFoundOrWrongStatus({ workId });
 

package/src/resolvers/mutations/worker/removeWork.ts

@@ -13,7 +13,7 @@ export default async function removeWork(
 
   if (!workId) throw new InvalidIdError({ workId });
 
-  const work = await modules.worker.deleteWork(workId, userId);
+  const work = await modules.worker.deleteWork(workId);
 
   if (!work) throw new WorkNotFoundOrWrongStatus({ workId });
 

package/src/resolvers/queries/products/productCatalogPrices.ts

@@ -13,7 +13,6 @@ export default async function productCatalogPrices(
 
   const product = await loaders.productLoader.load({
     productId,
-    includeDrafts: true,
   });
   if (!product) return null;
 

package/src/resolvers/queries/users/users.ts

@@ -1,5 +1,5 @@
 import { log } from '@unchainedshop/logger';
-import { Context, Root } from '@unchainedshop/types/api';
+import { Context, Root, SortOption } from '@unchainedshop/types/api';
 import { UserQuery } from '@unchainedshop/types/user';
 
 export default async function users(
@@ -7,6 +7,7 @@ export default async function users(
   params: UserQuery & {
     limit?: number;
     offset?: number;
+    sort?: Array<SortOption>;
   },
   { modules, userId }: Context,
 ) {

package/src/resolvers/queries/worker/workQueue.ts

@@ -2,7 +2,7 @@ import { log } from '@unchainedshop/logger';
 import { Root, Context, SortOption } from '@unchainedshop/types/api';
 import { WorkStatus } from '@unchainedshop/types/worker';
 
-export default async function workers(
+export default async function workQueue(
   root: Root,
   {
     limit,

package/src/resolvers/type/assortment/assortment-filter-types.ts

@@ -13,7 +13,6 @@ export const AssortmentFilter: AssortmentFilterHelperTypes = {
   assortment: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-      includeInactive: true,
     });
     return assortment;
   },

package/src/resolvers/type/assortment/assortment-link-types.ts

@@ -12,7 +12,6 @@ export const AssortmentLink: AssortmentLinkHelperTypes = {
   child: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.childAssortmentId,
-      includeInactive: true,
     });
     return assortment;
   },
@@ -20,7 +19,6 @@ export const AssortmentLink: AssortmentLinkHelperTypes = {
   parent: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.parentAssortmentId,
-      includeInactive: true,
     });
     return assortment;
   },

package/src/resolvers/type/assortment/assortment-media-types.ts

@@ -13,11 +13,13 @@ export interface AssortmentMediaHelperTypes {
 }
 
 export const AssortmentMedia: AssortmentMediaHelperTypes = {
+  // TODO: Loader for assortment media texts!
   texts: (obj, { forceLocale }, { modules, localeContext }) =>
     modules.assortments.media.texts.findLocalizedMediaText({
       assortmentMediaId: obj._id,
       locale: forceLocale || localeContext.normalized,
     }),
 
+  // TODO: Loader for files!
   file: (obj, _, { modules }) => modules.files.findFile({ fileId: obj.mediaId }),
 };

package/src/resolvers/type/assortment/assortment-path-link-types.ts

@@ -14,6 +14,7 @@ export interface AssortmentPathLinkHelperTypes {
 
 export const AssortmentPathLink: AssortmentPathLinkHelperTypes = {
   link: async ({ assortmentId, childAssortmentId }, _, { modules }) => {
+    // TODO: Loader
     return modules.assortments.links.findLink({
       parentAssortmentId: assortmentId,
       childAssortmentId,

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

@@ -16,7 +16,6 @@ export const AssortmentProduct: AssortmentProductHelperTypes = {
   assortment: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-      includeInactive: true,
     });
     return assortment;
   },
@@ -24,7 +23,6 @@ export const AssortmentProduct: AssortmentProductHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -62,10 +62,11 @@ export const Assortment: AssortmentHelperTypes = {
   },
 
   childrenCount: async (assortment, { includeInactive = false }, { modules }) => {
-    const assortmentChildrenIds = await modules.assortments.links.findLinks({
+    // TODO: Loader
+    const assortmentChildLinks = await modules.assortments.links.findLinks({
       parentAssortmentId: assortment._id,
     });
-    const assortmentIds = assortmentChildrenIds.map(({ childAssortmentId }) => childAssortmentId);
+    const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
 
     const selector: Query = {
       assortmentIds,
@@ -77,6 +78,7 @@ export const Assortment: AssortmentHelperTypes = {
   },
 
   filterAssignments: async (obj, _, { modules }) => {
+    // TODO: Loader & move default sort to module
     return modules.assortments.filters.findFilters(
       {
         assortmentId: obj._id,
@@ -87,7 +89,8 @@ export const Assortment: AssortmentHelperTypes = {
     );
   },
 
-  linkedAssortments: async (obj, _, { modules }) => {
+  async linkedAssortments(obj, _, { modules }) {
+    // TODO: Loader
     return modules.assortments.links.findLinks({
       assortmentId: obj._id,
     });
@@ -100,7 +103,8 @@ export const Assortment: AssortmentHelperTypes = {
     });
   },
 
-  productAssignments: async (obj, _, { modules }) => {
+  async productAssignments(obj, _, { modules }) {
+    // TODO: Loader & move default sort to core module
     return modules.assortments.products.findProducts(
       {
         assortmentId: obj._id,
@@ -124,6 +128,7 @@ export const Assortment: AssortmentHelperTypes = {
       assortmentId: obj._id,
       ignoreChildAssortments: query.ignoreChildAssortments,
     });
+
     const filterIds = await context.modules.assortments.filters.findFilterIds({
       assortmentId: obj._id,
     });

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

@@ -14,7 +14,6 @@ export const Bookmark: BookmarkHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

package/src/resolvers/type/enrollment/enrollment-plan-tyes.ts

@@ -12,7 +12,6 @@ export const EnrollmentPlan: EnrollmentPlanHelperTypes = {
   product: async (plan, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: plan.productId,
-      includeDrafts: true,
     });
     return product;
   },

package/src/resolvers/type/order/order-item-types.ts

@@ -70,7 +70,6 @@ export const OrderItem: OrderItemHelperTypes = {
     });
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
 
     return Promise.all(
@@ -103,7 +102,6 @@ export const OrderItem: OrderItemHelperTypes = {
   originalProduct: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.originalProductId,
-      includeDrafts: true,
     });
     return product;
   },
@@ -111,7 +109,6 @@ export const OrderItem: OrderItemHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -2,6 +2,7 @@ import { ProductAssortmentPathHelperTypes } from '@unchainedshop/types/products'
 
 export const ProductAssortmentPath: ProductAssortmentPathHelperTypes = {
   assortmentProduct: async ({ _id }, _, { modules }) => {
+    // TODO: Loader
     return modules.assortments.products.findProduct({
       assortmentProductId: _id,
     });

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

@@ -4,7 +4,6 @@ export const ProductBundleItem: ProductBundleItemHelperTypes = {
   product: async (productItem, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: productItem.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -64,6 +64,7 @@ export const ConfigurableProduct: ConfigurableProductHelperTypes = {
       {
         quantity,
         currency,
+        userId: requestContext.userId,
         country: countryContext,
         useNetPrice,
         vectors,

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

@@ -1,6 +1,7 @@
 import { ProductMediaHelperTypes } from '@unchainedshop/types/products.media';
 
 export const ProductMedia: ProductMediaHelperTypes = {
+  // TODO: Loader for product media texts!
   texts: async (obj, { forceLocale }, { modules, localeContext }) => {
     return modules.products.media.texts.findLocalizedMediaText({
       productMediaId: obj._id,
@@ -9,6 +10,7 @@ export const ProductMedia: ProductMediaHelperTypes = {
   },
 
   file: async (obj, _, { modules }) => {
+    // TODO: Loader
     return modules.files.findFile({ fileId: obj.mediaId });
   },
 };

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

@@ -1,4 +1,4 @@
-import { PlanProductHelperTypes, ProductPrice } from '@unchainedshop/types/products';
+import { PlanProductHelperTypes } from '@unchainedshop/types/products';
 import { Product } from './product-types';
 
 export const PlanProduct: PlanProductHelperTypes = {
@@ -37,7 +37,7 @@ export const PlanProduct: PlanProductHelperTypes = {
       ));
     return modules.products.prices.userPrice(
       obj,
-      { quantity, currency, country: countryContext, useNetPrice },
+      { quantity, userId: requestContext.userId, currency, country: countryContext, useNetPrice },
       requestContext,
     );
   },
@@ -55,22 +55,6 @@ export const PlanProduct: PlanProductHelperTypes = {
     return modules.products.prices.catalogPricesLeveled(obj, { currency, country: countryContext });
   },
 
-  simulatedDiscounts: async () => {
-    // const { modules, countryContext } = requestContext;
-    // return modules.products.prices.userDiscounts(
-    //   {
-    //     quantity,
-    //     country: countryContext,
-    //   },
-    //   requestContext
-    // );
-    return [] as Array<{
-      _id: string;
-      interface: any;
-      total: ProductPrice;
-    }>;
-  },
-
   salesUnit(obj) {
     return obj.commerce && obj.commerce.salesUnit;
   },

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

@@ -23,7 +23,6 @@ export const ProductReview: ProductReviewHelperTypes = {
   product: async (review, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: review.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -14,7 +14,6 @@ export const ProductVariationAssignment: ProductVariationAssignmentHelperTypes =
   product: async ({ assignment }, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: assignment.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -27,7 +27,6 @@ export const Quotation: QuotationHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -50,9 +50,10 @@ export const Token: TokenHelperTypes = {
       {
         token,
         product,
+        locale: new Locale(forceLocale),
         referenceDate: new Date(),
       },
-      { ...context, localeContext: new Locale(forceLocale) },
+      context,
     );
 
     return ercMetadata;

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

@@ -17,6 +17,7 @@ import {
 } from '@unchainedshop/types/user';
 import type { Locale } from 'locale';
 import { TokenSurrogate } from '@unchainedshop/types/warehousing';
+import { Roles, permissions } from '@unchainedshop/roles';
 import { checkAction, checkTypeResolver } from '../../acl';
 import { actions } from '../../roles';
 
@@ -24,6 +25,9 @@ type HelperType<P, T> = (user: UserType, params: P, context: Context) => Promise
 
 export interface UserHelperTypes {
   _id: HelperType<any, boolean>;
+  created: HelperType<any, Date>;
+  updated: HelperType<any, Date>;
+  deleted: HelperType<any, Date>;
   avatar: HelperType<{ localeContext: Locale }, File>;
   bookmarks: HelperType<any, Array<Bookmark>>;
   cart: HelperType<{ orderNumber?: string }, Order>;
@@ -70,6 +74,9 @@ const getPrimaryEmail = (user: UserType) => {
 
 export const User: UserHelperTypes = {
   _id: checkTypeResolver(viewUserPublicInfos, '_id'),
+  created: checkTypeResolver(viewUserPrivateInfos, 'created'),
+  updated: checkTypeResolver(viewUserPrivateInfos, 'updated'),
+  deleted: checkTypeResolver(viewUserPrivateInfos, 'deleted'),
   emails: checkTypeResolver(viewUserPrivateInfos, 'emails'),
   lastBillingAddress: checkTypeResolver(viewUserPrivateInfos, 'lastBillingAddress'),
   lastContact: checkTypeResolver(viewUserPrivateInfos, 'lastContact'),
@@ -134,7 +141,7 @@ export const User: UserHelperTypes = {
 
   country: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserCountry(user, params, context);
+    return context.services.users.getUserCountry(user, context);
   },
 
   enrollments: async (user, params, context) => {
@@ -146,18 +153,15 @@ export const User: UserHelperTypes = {
 
   language: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserLanguage(user, params, context);
+    return context.services.users.getUserLanguage(user, context);
   },
 
   allowedActions: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserRoleActions(user, context);
-  },
 
-  // locale: async (user, params, context) => {
-  //   await checkAction(context, viewUserPrivateInfos, [user, params, context]);
-  //   return context.modules.users.userLocale(user, params);
-  // },
+    const userRoles = Roles.getUserRoles(user?._id, user.roles, true);
+    return permissions(userRoles, context.roles) as Promise<string[]>;
+  },
 
   orders: async (user, params, context) => {
     await checkAction(context, viewUserOrders, [user, params]);
@@ -183,12 +187,12 @@ export const User: UserHelperTypes = {
 
   webAuthnCredentials: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return user.services.webAuthn || [];
+    return user.services?.webAuthn || [];
   },
 
   web3Addresses: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return user.services.web3 || [];
+    return user.services?.web3 || [];
   },
 
   quotations: async (user, params, context) => {

package/src/roles/admin.ts

@@ -1,74 +1,5 @@
 export const admin = (role, actions) => {
-  role.allow(actions.viewEvent, () => true);
-  role.allow(actions.viewEvents, () => true);
-  role.allow(actions.viewUser, () => true);
-  role.allow(actions.viewUsers, () => true);
-  role.allow(actions.viewPaymentProviders, () => true);
-  role.allow(actions.viewPaymentProvider, () => true);
-  role.allow(actions.viewPaymentInterfaces, () => true);
-  role.allow(actions.viewDeliveryProviders, () => true);
-  role.allow(actions.viewDeliveryProvider, () => true);
-  role.allow(actions.viewDeliveryInterfaces, () => true);
-  role.allow(actions.viewWarehousingProviders, () => true);
-  role.allow(actions.viewWarehousingProvider, () => true);
-  role.allow(actions.viewWarehousingInterfaces, () => true);
-  role.allow(actions.viewTranslations, () => true);
-  role.allow(actions.viewOrders, () => true);
-  role.allow(actions.viewOrder, () => true);
-  role.allow(actions.viewProducts, () => true);
-  role.allow(actions.manageLanguages, () => true);
-  role.allow(actions.manageCountries, () => true);
-  role.allow(actions.manageProducts, () => true);
-  role.allow(actions.manageCurrencies, () => true);
-  role.allow(actions.managePaymentProviders, () => true);
-  role.allow(actions.manageDeliveryProviders, () => true);
-  role.allow(actions.manageWarehousingProviders, () => true);
-  role.allow(actions.updateToken, () => true);
-  role.allow(actions.viewToken, () => true);
-  role.allow(actions.manageUsers, () => true);
-  role.allow(actions.updateUser, () => true);
-  role.allow(actions.updateUsername, () => true);
-  role.allow(actions.manageAssortments, () => true);
-  role.allow(actions.manageFilters, () => true);
-  role.allow(actions.updateCart, () => true);
-  role.allow(actions.createCart, () => true);
-  role.allow(actions.sendEmail, () => true);
-  role.allow(actions.updateOrder, () => true);
-  role.allow(actions.updateOrderDiscount, () => true);
-  role.allow(actions.updateOrderItem, () => true);
-  role.allow(actions.updateOrderDelivery, () => true);
-  role.allow(actions.updateOrderPayment, () => true);
-  role.allow(actions.markOrderConfirmed, () => true);
-  role.allow(actions.markOrderRejected, () => true);
-  role.allow(actions.markOrderPaid, () => true);
-  role.allow(actions.markOrderDelivered, () => true);
-  role.allow(actions.viewLogs, () => true);
-  role.allow(actions.viewUserRoles, () => true);
-  role.allow(actions.viewUserOrders, () => true);
-  role.allow(actions.viewUserQuotations, () => true);
-  role.allow(actions.viewUserPublicInfos, () => true);
-  role.allow(actions.viewUserPrivateInfos, () => true);
-  role.allow(actions.viewUserEnrollments, () => true);
-  role.allow(actions.viewUserTokens, () => true);
-  role.allow(actions.reviewProduct, () => true);
-  role.allow(actions.updateProductReview, () => true);
-  role.allow(actions.manageProductReviews, () => true);
-  role.allow(actions.requestQuotation, () => true);
-  role.allow(actions.viewQuotations, () => true);
-  role.allow(actions.viewQuotation, () => true);
-  role.allow(actions.manageQuotations, () => true);
-  role.allow(actions.answerQuotation, () => true);
-  role.allow(actions.bookmarkProduct, () => true);
-  role.allow(actions.manageBookmarks, () => true);
-  role.allow(actions.voteProductReview, () => true);
-  role.allow(actions.manageWorker, () => true);
-  role.allow(actions.viewEnrollments, () => true);
-  role.allow(actions.viewEnrollment, () => true);
-  role.allow(actions.updateEnrollment, () => true);
-  role.allow(actions.registerPaymentCredentials, () => true);
-  role.allow(actions.managePaymentCredentials, () => true);
-  role.allow(actions.bulkImport, () => true);
-  role.allow(actions.authTwoFactor, () => true);
-  role.allow(actions.manageTwoFactor, () => true);
-  role.allow(actions.impersonate, () => true);
+  Object.values(actions).forEach((action) => {
+    role.allow(action, () => true);
+  });
 };

package/src/schema/index.js

@@ -5,4 +5,18 @@ import inputTypes from './inputTypes';
 import query from './query';
 import mutation from './mutation';
 
-export default [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation];
+export const buildDefaultTypeDefs = ({ actions = [], events = [], workTypes = [] }) => {
+  const dynamicTypeDefs = `
+    extend enum RoleAction {
+        ${actions.join(',')}
+    }
+    extend enum EventType {
+        ${events.join(',')}
+    }
+    extend enum WorkType {
+        ${workTypes.join(',')}
+    }
+  `;
+
+  return [...scalars, ...directives, ...types, ...inputTypes, ...query, ...mutation, dynamicTypeDefs];
+};

package/src/schema/mutation.js

@@ -20,9 +20,9 @@ export default [
       """
       Web3
       """
-      addWeb3Address(address: String!): User
-      verifyWeb3Address(address: String!, hash: String!): User
-      removeWeb3Address(address: String!): User
+      addWeb3Address(address: String!): User!
+      verifyWeb3Address(address: String!, hash: String!): User!
+      removeWeb3Address(address: String!): User!
 
       """
       Create a new user.
@@ -40,7 +40,7 @@ export default [
       login and logged in user IP address, locale and country where they
       accessed the system)
       """
-      heartbeat: User
+      heartbeat: User!
 
       """
       Change the current user's password. Must be logged in.
@@ -90,12 +90,12 @@ export default [
       """
       In order to activate 2nd factor (TOTP), generate a secret and return
       """
-      enableTOTP(secretBase32: String!, code: String!): User
+      enableTOTP(secretBase32: String!, code: String!): User!
 
       """
       Disable the 2nd factor (TOTP)
       """
-      disableTOTP(code: String!, userId: ID): User
+      disableTOTP(code: String!, userId: ID): User!
 
       """
       Create WebAuthn PublicKeyCredentialCreationOptions to use for Registering a new WebAuthn Device
@@ -309,32 +309,37 @@ export default [
       """
       Update E-Mail address of any user or logged in user if userId is not provided
       """
-      addEmail(email: String!, userId: ID): User
+      addEmail(email: String!, userId: ID): User!
 
       """
       Update E-Mail address of any user or logged in user if userId is not provided
       """
-      removeEmail(email: String!, userId: ID): User
+      removeEmail(email: String!, userId: ID): User!
 
       """
       Update Avatar of any user or logged in user if userId is not provided
       """
-      updateUserAvatar(avatar: Upload!, userId: ID): User
+      updateUserAvatar(avatar: Upload!, userId: ID): User!
 
       """
       Set tags of user
       """
-      setUserTags(tags: [LowerCaseString]!, userId: ID!): User
+      setUserTags(tags: [LowerCaseString]!, userId: ID!): User!
 
       """
       Update Profile of any user or logged in user if userId is not provided
       """
-      updateUserProfile(profile: UserProfileInput, meta: JSON, userId: ID): User
+      updateUserProfile(profile: UserProfileInput, meta: JSON, userId: ID): User!
+
+      """
+      Remove any user or logged in user if userId is not provided
+      """
+      removeUser(userId: ID): User!
 
       """
       Enroll a new user, setting enroll to true will let the user choose his password (e-mail gets sent)
       """
-      enrollUser(profile: UserProfileInput!, email: String!, plainPassword: String): User
+      enrollUser(profile: UserProfileInput!, email: String!, plainPassword: String): User!
 
       """
       Forcefully trigger an enrollment email for already added users by e-mail
@@ -344,17 +349,17 @@ export default [
       """
       Set username for a specific user
       """
-      setUsername(username: String!, userId: ID!): User
+      setUsername(username: String!, userId: ID!): User!
 
       """
       Set a new password for a specific user
       """
-      setPassword(newPlainPassword: String, userId: ID!): User
+      setPassword(newPlainPassword: String, userId: ID!): User!
 
       """
       Set roles of a user
       """
-      setRoles(roles: [String!]!, userId: ID!): User
+      setRoles(roles: [String!]!, userId: ID!): User!
 
       """
       Create a new product