@unchainedshop/api 3.0.0-rc9 → 3.0.1

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

@@ -0,0 +1,23 @@
+import { log } from '@unchainedshop/logger';
+import { ImpersonatingAdminUserError, UserNotFoundError } from '../../../errors.js';
+import { Context } from '../../../context.js';
+
+const impersonate = async (root, { userId }, context: Context) => {
+  log(`mutation impersonate ${userId}`, { userId: context.userId });
+
+  const userToImpersonate = await context.modules.users.findUserById(userId);
+
+  if (!userToImpersonate) {
+    throw new UserNotFoundError({ userId });
+  }
+
+  if ((userToImpersonate.roles || []).includes('admin')) {
+    throw new ImpersonatingAdminUserError({ impersonatedUserId: userId, userId: context.userId });
+  }
+
+  return context.login(userToImpersonate, {
+    impersonator: context.user,
+  });
+};
+
+export default impersonate;

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

@@ -22,7 +22,7 @@ export default async function loginAsGuest(root: never, _: any, context: Context
   user = await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
-    userAgent: context.userAgent,
+    userAgent: context.getHeader('user-agent'),
     locale: context.localeContext.baseName,
     countryCode: context.countryContext,
   });

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

@@ -35,7 +35,7 @@ export default async function loginWithPassword(
   user = await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
-    userAgent: context.userAgent,
+    userAgent: context.getHeader('user-agent'),
     locale: context.localeContext.baseName,
     countryCode: context.countryContext,
   });

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

@@ -28,7 +28,7 @@ export default async function loginWithWebAuthn(
   user = await context.modules.users.updateHeartbeat(user._id, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
-    userAgent: context.userAgent,
+    userAgent: context.getHeader('user-agent'),
     locale: context.localeContext.baseName,
     countryCode: context.countryContext,
   });

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

@@ -22,7 +22,7 @@ export default async function resetPassword(
     user = await context.modules.users.updateHeartbeat(user._id, {
       remoteAddress: context.remoteAddress,
       remotePort: context.remotePort,
-      userAgent: context.userAgent,
+      userAgent: context.getHeader('user-agent'),
       locale: context.localeContext.baseName,
       countryCode: context.countryContext,
     });

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

@@ -0,0 +1,19 @@
+import { log } from '@unchainedshop/logger';
+import { Context } from '../../../context.js';
+import { UserNotFoundError } from '../../../errors.js';
+
+export default async function stopImpersonation(root: never, _, context: Context) {
+  const { userId, modules, impersonatorId } = context;
+
+  log(`mutation stopImpersonation for ${userId}`);
+
+  if (!impersonatorId) return null;
+
+  const impersonator = await modules.users.findUserById(impersonatorId);
+
+  if (!impersonator) throw new UserNotFoundError({ userId: impersonatorId });
+
+  await context.logout();
+
+  return context.login(impersonator);
+}

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

@@ -18,7 +18,7 @@ export default async function verifyEmail(root: never, { token }: { token: any }
   const user = await context.modules.users.updateHeartbeat(unverifiedToken.userId, {
     remoteAddress: context.remoteAddress,
     remotePort: context.remotePort,
-    userAgent: context.userAgent,
+    userAgent: context.getHeader('user-agent'),
     locale: context.localeContext.baseName,
     countryCode: context.countryContext,
   });

package/src/resolvers/mutations/assortments/removeAssortmentProduct.ts

@@ -13,7 +13,7 @@ export default async function removeAssortmentProduct(
 
   if (!assortmentProductId) throw new InvalidIdError({ assortmentProductId });
 
-  const assortmentProduct = await modules.assortments.products.findProduct({
+  const assortmentProduct = await modules.assortments.products.findAssortmentProduct({
     assortmentProductId,
   });
   if (!assortmentProduct) throw new AssortmentProductNotFoundError({ assortmentProductId });

package/src/resolvers/mutations/index.ts

@@ -4,6 +4,8 @@ import loginWithPassword from './accounts/loginWithPassword.js';
 import loginWithWebAuthn from './accounts/loginWithWebAuthn.js';
 import loginAsGuest from './accounts/loginAsGuest.js';
 import logout from './accounts/logout.js';
+import impersonate from './accounts/impersonate.js';
+import stopImpersonation from './accounts/stopImpersonation.js';
 import changePassword from './accounts/changePassword.js';
 import createUser from './accounts/createUser.js';
 import verifyEmail from './accounts/verifyEmail.js';
@@ -155,6 +157,9 @@ import removeUserProductReviews from './users/removeUserProductReviews.js';
 export default {
   logout: acl(actions.logout)(logout),
   loginAsGuest: acl(actions.loginAsGuest)(loginAsGuest),
+  impersonate: acl(actions.impersonate)(impersonate),
+  stopImpersonation: acl(actions.stopImpersonation)(stopImpersonation),
+
   createWebAuthnCredentialCreationOptions: acl(actions.useWebAuthn)(
     createWebAuthnCredentialCreationOptions,
   ),
@@ -313,5 +318,5 @@ export default {
   signPaymentProviderForCheckout: acl(actions.registerPaymentCredentials)(
     signPaymentProviderForCheckout,
   ),
-  removeUserProductReviews,
+  removeUserProductReviews, // TODO!
 };

package/src/resolvers/mutations/users/addPushSubscription.ts

@@ -6,7 +6,8 @@ const addPushSubscription = async (
   { subscription, unsubscribeFromOtherUsers = false },
   context: Context,
 ) => {
-  const { modules, userId, userAgent } = context;
+  const { modules, userId } = context;
+  const userAgent = context.getHeader('user-agent');
   log(`mutation addPushSubscription ${userAgent}`, { userId });
 
   await modules.users.addPushSubscription(userId, subscription, {

package/src/resolvers/mutations/users/heartbeat.ts

@@ -5,7 +5,7 @@ import { UserNotFoundError } from '../../../errors.js';
 export default async function heartbeat(
   root: never,
   _: any,
-  { countryContext, localeContext, modules, remoteAddress, remotePort, userAgent, userId }: Context,
+  { countryContext, localeContext, modules, remoteAddress, remotePort, userId, getHeader }: Context,
 ) {
   log(`mutation heartbeat ${remoteAddress}`, { userId });
 
@@ -20,7 +20,7 @@ export default async function heartbeat(
     locale: localeContext.baseName,
     remoteAddress,
     remotePort,
-    userAgent,
+    userAgent: getHeader('user-agent'),
   });
 
   return user;

package/src/resolvers/mutations/users/removePushSubscription.ts

@@ -2,7 +2,9 @@ import { Context } from '../../../context.js';
 import { log } from '@unchainedshop/logger';
 
 const removePushSubscription = async (_, { p256dh }, context: Context) => {
-  const { modules, userId, userAgent } = context;
+  const { modules, userId } = context;
+  const userAgent = context.getHeader('user-agent');
+
   log(`mutation removePushSubscription ${userId} ${userAgent}`, { userId });
 
   await modules.users.removePushSubscription(userId, p256dh);

package/src/resolvers/queries/index.ts

@@ -63,6 +63,7 @@ import warehousingProviders from './warehousing/warehousingProviders.js';
 import warehousingProvidersCount from './warehousing/warehousingProvidersCount.js';
 import token from './warehousing/token.js';
 import tokens from './warehousing/tokens.js';
+import tokensCount from './warehousing/tokensCount.js';
 import work from './worker/work.js';
 import workQueue from './worker/workQueue.js';
 import workStatistics from './worker/workStatistics.js';
@@ -71,9 +72,11 @@ import validateResetPasswordToken from './users/validateResetPasswordToken.js';
 import validateVerifyEmailToken from './users/validateVerifyEmailToken.js';
 import eventStatistics from './events/eventStatistics.js';
 import orderStatistics from './orders/orderStatistics.js';
+import impersonator from './users/impersonator.js';
 
 export default {
   me,
+  impersonator,
   user: acl(actions.viewUser)(user),
   users: acl(actions.viewUsers)(users),
   usersCount: acl(actions.viewUsers)(usersCount),
@@ -104,6 +107,7 @@ export default {
   warehousingInterfaces: acl(actions.viewWarehousingInterfaces)(warehousingInterfaces),
   token: acl(actions.viewToken)(token),
   tokens: acl(actions.viewTokens)(tokens),
+  tokensCount: acl(actions.viewTokens)(tokensCount),
   translatedProductTexts: acl(actions.viewTranslations)(translatedProductTexts),
   translatedProductMediaTexts: acl(actions.viewTranslations)(translatedProductMediaTexts),
   translatedProductVariationTexts: acl(actions.viewTranslations)(translatedProductVariationTexts),

package/src/resolvers/queries/shopInfo.ts

@@ -7,7 +7,6 @@ export default function shopInfo(
   context: Context,
 ): {
   version?: string;
-  externalLinks: () => Array<string>;
   adminUiConfig?: Record<string, any>;
   vapidPublicKey?: string;
 } {
@@ -16,16 +15,17 @@ export default function shopInfo(
 
   return {
     version: context.version,
-    externalLinks: () => {
-      try {
-        const parsed = JSON.parse(process.env.EXTERNAL_LINKS);
-        return parsed;
-      } catch {
-        return [];
-      }
-    },
     adminUiConfig: {
       customProperties: adminUiConfig?.customProperties ?? [],
+      singleSignOnURL: adminUiConfig?.singleSignOnURL,
+      externalLinks: () => {
+        try {
+          const parsed = JSON.parse(process.env.EXTERNAL_LINKS);
+          return parsed;
+        } catch {
+          return [];
+        }
+      },
     },
     vapidPublicKey: process.env?.PUSH_NOTIFICATION_PUBLIC_KEY,
   };

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

@@ -0,0 +1,13 @@
+import { log } from '@unchainedshop/logger';
+import { Context } from '../../../context.js';
+
+export default async function impersonator(
+  root: never,
+  params: any,
+  { userId, remoteAddress, modules, impersonatorId }: Context,
+) {
+  log(`query impersonator ${remoteAddress}`, { userId });
+
+  if (!impersonatorId) return null;
+  return modules.users.findUserById(impersonatorId);
+}

package/src/resolvers/queries/warehousing/tokens.ts

@@ -4,15 +4,17 @@ import { Context } from '../../../context.js';
 export default async function tokens(
   root: never,
   {
+    queryString = null,
     limit = 10,
     offset = 0,
   }: {
     limit: number;
     offset: number;
+    queryString?: string;
   },
   { modules, userId }: Context,
 ) {
   log(`query tokens`, { userId });
 
-  return modules.warehousing.findTokens({}, { limit, skip: offset });
+  return modules.warehousing.findTokens({ queryString }, { limit, skip: offset });
 }

package/src/resolvers/queries/warehousing/tokensCount.ts

@@ -0,0 +1,12 @@
+import { log } from '@unchainedshop/logger';
+import { Context } from '../../../context.js';
+
+export default async function tokensCount(
+  root: never,
+  { queryString = null },
+  { modules, userId }: Context,
+) {
+  log(`query tokensCount`, { userId });
+
+  return modules.warehousing.tokensCount({ queryString });
+}

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

@@ -1,28 +1,23 @@
+import { AssortmentLink } from '@unchainedshop/core-assortments';
 import { Context } from '../../../context.js';
-import {
-  AssortmentPathLink as AssortmentPathLinkType,
-  AssortmentLink as AssortmentLinkType,
-  AssortmentText,
-} from '@unchainedshop/core-assortments';
 
-type HelperType<P, T> = (assortmentPathLink: AssortmentPathLinkType, params: P, context: Context) => T;
-
-export interface AssortmentPathLinkHelperTypes {
-  link: HelperType<never, Promise<AssortmentLinkType>>;
-  assortmentTexts: HelperType<{ forceLocale?: string }, Promise<AssortmentText>>;
-}
+export const AssortmentPathLink = {
+  link(linkObj) {
+    if (linkObj._id) return linkObj;
+    return null;
+  },
 
-export const AssortmentPathLink: AssortmentPathLinkHelperTypes = {
-  link: async ({ assortmentId, childAssortmentId }, _, { loaders }) => {
-    return loaders.assortmentLinkLoader.load({
-      parentAssortmentId: assortmentId,
-      childAssortmentId,
-    });
+  assortmentId(linkObj) {
+    return linkObj.childAssortmentId;
   },
 
-  assortmentTexts: async ({ assortmentId }, params, { loaders, localeContext }) => {
+  assortmentTexts: async (
+    { childAssortmentId }: AssortmentLink,
+    params: { forceLocale?: string },
+    { loaders, localeContext }: Context,
+  ) => {
     const text = await loaders.assortmentTextLoader.load({
-      assortmentId,
+      assortmentId: childAssortmentId,
       locale: params.forceLocale || localeContext.baseName,
     });
     return text;

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

@@ -3,10 +3,22 @@ import { Assortment } from '@unchainedshop/core-assortments';
 import { SearchFilterQuery } from '@unchainedshop/core-filters';
 
 export const AssortmentTypes = {
-  assortmentPaths: (obj: Assortment, _, { modules }: Context) => {
-    return modules.assortments.breadcrumbs({
-      assortmentId: obj._id,
-    });
+  assortmentPaths(obj: Assortment, _, { modules, loaders }: Context) {
+    return modules.assortments.breadcrumbs(
+      {
+        assortmentId: obj._id,
+      },
+      {
+        resolveAssortmentProducts: async (productId) =>
+          loaders.assortmentProductsLoader.load({
+            productId,
+          }),
+        resolveAssortmentLinks: async (childAssortmentId) =>
+          loaders.assortmentLinksLoader.load({
+            childAssortmentId,
+          }),
+      },
+    );
   },
 
   children: async (
@@ -79,7 +91,7 @@ export const AssortmentTypes = {
 
   async productAssignments(obj: Assortment, _, { modules }: Context) {
     // TODO: Loader & move default sort to core module
-    return modules.assortments.products.findProducts(
+    return modules.assortments.products.findAssortmentProducts(
       {
         assortmentId: obj._id,
       },

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

@@ -18,15 +18,27 @@ export const Product = {
     params: {
       forceLocale?: string;
     },
-    { modules }: Context,
+    { modules, loaders }: Context,
   ): Promise<
     Array<{
       links: Array<AssortmentPathLink>;
     }>
   > {
-    return modules.assortments.breadcrumbs({
-      productId: product._id,
-    });
+    return modules.assortments.breadcrumbs(
+      {
+        productId: product._id,
+      },
+      {
+        resolveAssortmentProducts: async (productId) =>
+          loaders.assortmentProductsLoader.load({
+            productId,
+          }),
+        resolveAssortmentLinks: async (childAssortmentId) =>
+          loaders.assortmentLinksLoader.load({
+            childAssortmentId,
+          }),
+      },
+    );
   },
 
   // TODO: Use a loader!
@@ -103,7 +115,7 @@ export const Product = {
 
     if (!assortmentIds.length) return [];
 
-    const productIds = await modules.assortments.products.findProductSiblings({
+    const productIds = await modules.assortments.products.findSiblings({
       productId,
       assortmentIds,
     });

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

@@ -22,7 +22,10 @@ export const ProductVariationAssignmentVector: ProductVariationAssignmentVectorH
       key: obj.key,
       productId: obj.product._id,
     });
-    return modules.products.variations.option(productVariation, obj.value);
+    return {
+      _id: productVariation._id,
+      productVariationOption: obj.value,
+    };
   },
 
   variation: (obj, _, { modules }) => {

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

@@ -21,8 +21,11 @@ export interface ProductVariationHelperTypes {
   texts: HelperType<{ forceLocale?: string }, Promise<ProductVariationText>>;
 }
 export const ProductVariation: ProductVariationHelperTypes = {
-  options: (obj, _, { modules }) => {
-    return (obj.options || []).map((option) => modules.products.variations.option(obj, option));
+  options: (obj) => {
+    return (obj.options || []).map((option) => ({
+      _id: obj._id,
+      productVariationOption: option,
+    }));
   },
 
   texts: async (obj, { forceLocale }, { modules, localeContext }) => {

package/src/roles/all.ts

@@ -100,6 +100,7 @@ export const all = (role, actions) => {
   role.allow(actions.viewTokens, () => false);
   role.allow(actions.viewStatistics, () => false);
   role.allow(actions.uploadUserAvatar, () => false);
+  role.allow(actions.impersonate, () => 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
@@ -139,6 +140,7 @@ export const all = (role, actions) => {
   role.allow(actions.viewFilter, () => true);
   role.allow(actions.viewTranslations, () => true);
   role.allow(actions.logout, () => true);
+  role.allow(actions.stopImpersonation, () => true);
   role.allow(actions.loginAsGuest, () => true);
   role.allow(actions.loginWithPassword, () => true);
   role.allow(actions.loginWithWebAuthn, () => true);

package/src/roles/index.ts

@@ -12,6 +12,8 @@ const roles = {
 const allRoles = roles;
 
 const actions: Record<string, string> = [
+  'impersonate',
+  'stopImpersonation',
   'viewEvent',
   'viewEvents',
   'viewUserRoles',

package/src/schema/mutation.ts

@@ -57,6 +57,16 @@ export default [
       """
       logout: SuccessResponse
 
+      """
+      Impersonate a user
+      """
+      impersonate(userId: ID!): LoginMethodResponse!
+
+      """
+      End customer impersonated user session and resume the impersonator session
+      """
+      stopImpersonation: LoginMethodResponse
+
       """
       Marks the user's email address as verified. Logs the user in afterwards.
       """

package/src/schema/query.ts

@@ -6,6 +6,11 @@ export default [
       """
       me: User
 
+      """
+      User impersonating currently logged in user
+      """
+      impersonator: User
+
       """
       Get list of users, by default sorted by creation date (ascending) unless a queryString is set
       """
@@ -211,7 +216,12 @@ export default [
       """
       Get all tokens
       """
-      tokens(limit: Int = 10, offset: Int = 0): [Token!]!
+      tokens(queryString: String, limit: Int = 10, offset: Int = 0): [Token!]!
+
+      """
+      Returns total tokens
+      """
+      tokensCount(queryString: String): Int!
 
       """
       Returns total number of payment providers, optionally filtered by type

package/src/schema/types/shop.ts

@@ -10,7 +10,7 @@ export default [
       """
       SELF
     }
-    type Link @cacheControl(maxAge: 180) {
+    type AdminUiLink @cacheControl(maxAge: 180) {
       href: String
       title: String
       target: ExternalLinkTarget
@@ -23,6 +23,8 @@ export default [
 
     type AdminUiConfig {
       customProperties: [AdminUiConfigCustomEntityInterface!]!
+      externalLinks: [AdminUiLink!]!
+      singleSignOnURL: String
     }
 
     type Shop @cacheControl(maxAge: 180) {
@@ -31,7 +33,6 @@ export default [
       country: Country
       version: String
       userRoles: [String!]!
-      externalLinks: [Link]!
       adminUiConfig: AdminUiConfig!
       vapidPublicKey: String
     }

package/src/schema/types/user.ts

@@ -45,7 +45,7 @@ export default [
     type UserLoginTracker {
       timestamp: Timestamp!
       remoteAddress: String
-      remotePort: String
+      remotePort: Int
       userAgent: String
       locale: Locale
       countryCode: String