@unchainedshop/api 2.13.0 → 3.0.0-alpha2

package/src/resolvers/mutations/products/createProductVariationOption.ts

@@ -1,16 +1,18 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
+import { VariationInputText } from '@unchainedshop/types/products.variations.js';
 import { InvalidIdError, ProductVariationNotFoundError } from '../../../errors.js';
 
 export default async function createProductVariationOption(
   root: Root,
   params: {
-    option: { value: string; title: string };
+    option: string;
+    texts?: VariationInputText[];
     productVariationId: string;
   },
-  { modules, localeContext, userId }: Context,
+  { modules, userId }: Context,
 ) {
-  const { option: inputData, productVariationId } = params;
+  const { option, productVariationId, texts } = params;
 
   log(`mutation createProductVariationOption ${productVariationId}`, {
     userId,
@@ -23,8 +25,13 @@ export default async function createProductVariationOption(
   });
   if (!variation) throw new ProductVariationNotFoundError({ productVariationId });
 
-  return modules.products.variations.addVariationOption(productVariationId, {
-    ...inputData,
-    locale: localeContext.language,
+  const newOption = await modules.products.variations.addVariationOption(productVariationId, {
+    value: option,
   });
+
+  if (texts) {
+    await modules.products.variations.texts.updateVariationTexts(productVariationId, texts, option);
+  }
+
+  return newOption;
 }

package/src/resolvers/mutations/warehousing/exportToken.ts

@@ -1,7 +1,7 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
 import { WorkStatus } from '@unchainedshop/types/worker.js';
-import { InvalidIdError, TokenWrongStatusError } from '../../../errors.js';
+import { InvalidIdError, TokenNotFoundError, TokenWrongStatusError } from '../../../errors.js';
 
 export default async function exportToken(
   root: Root,
@@ -19,27 +19,26 @@ export default async function exportToken(
   if (!tokenId) throw new InvalidIdError({ tokenId });
 
   const token = await modules.warehousing.findToken({ tokenId });
+  if (!token) throw new TokenNotFoundError({ tokenId });
 
-  if (token) {
-    if (token.walletAddress && !token.userId) {
-      throw new TokenWrongStatusError({ tokenId });
-    }
-    const workItems = await modules.worker.findWorkQueue({
-      types: ['EXPORT_TOKEN'],
-      status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
+  if (token.walletAddress && !token.userId) {
+    throw new TokenWrongStatusError({ tokenId });
+  }
+  const workItems = await modules.worker.findWorkQueue({
+    types: ['EXPORT_TOKEN'],
+    status: [WorkStatus.NEW, WorkStatus.ALLOCATED],
+  });
+  const existingWork = workItems.find((item) => item.input?.token?._id === token._id);
+  if (!existingWork) {
+    await modules.worker.addWork({
+      type: 'EXPORT_TOKEN',
+      retries: 5,
+      input: {
+        token,
+        quantity,
+        recipientWalletAddress,
+      },
     });
-    const existingWork = workItems.find((item) => item.input?.token?._id === token._id);
-    if (!existingWork) {
-      await modules.worker.addWork({
-        type: 'EXPORT_TOKEN',
-        retries: 5,
-        input: {
-          token,
-          quantity,
-          recipientWalletAddress,
-        },
-      });
-    }
   }
 
   return modules.warehousing.findToken({ tokenId });

package/src/resolvers/queries/events/events.ts

@@ -9,7 +9,7 @@ export default async function events(
   { modules, userId }: Context,
 ) {
   log(
-    `query events ${params.types}  limit: ${params.limit} offset: ${params.offset} queryString: ${params.queryString}`,
+    `query events ${params.types?.join(',') || '*'} limit: ${params.limit} offset: ${params.offset} queryString: ${params.queryString}`,
     {
       userId,
     },

package/src/resolvers/queries/index.ts

@@ -66,13 +66,11 @@ import tokens from './warehousing/tokens.js';
 import work from './worker/work.js';
 import workQueue from './worker/workQueue.js';
 import workQueueCount from './worker/workQueueCount.js';
-import impersonator from './users/impersonator.js';
 import validateResetPasswordToken from './users/validateResetPasswordToken.js';
 import validateVerifyEmailToken from './users/validateVerifyEmailToken.js';
 
 export default {
   me,
-  impersonator,
   user: acl(actions.viewUser)(user),
   users: acl(actions.viewUsers)(users),
   usersCount: acl(actions.viewUsers)(usersCount),

package/src/resolvers/queries/shopInfo.ts

@@ -1,6 +1,5 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
-import { IOAuth2Adapter } from '@unchainedshop/types/accounts.js';
 
 export default function shopInfo(
   root: Root,
@@ -11,7 +10,6 @@ export default function shopInfo(
   externalLinks: () => Array<string>;
   adminUiConfig?: Record<string, any>;
   vapidPublicKey?: string;
-  oAuthProviders?: () => Promise<Array<IOAuth2Adapter>>;
 } {
   const { adminUiConfig } = context;
   log('query shopInfo', { userId: context.userId });
@@ -29,9 +27,6 @@ export default function shopInfo(
     adminUiConfig: {
       customProperties: adminUiConfig?.customProperties ?? [],
     },
-    async oAuthProviders() {
-      return context.modules.accounts.oAuth2.getProviders();
-    },
     vapidPublicKey: process.env?.PUSH_NOTIFICATION_PUBLIC_KEY,
   };
 }

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

@@ -10,7 +10,7 @@ export default async function validateResetPasswordToken(
 
   log('query validateResetPasswordToken', { userId, token: params.token });
 
-  const user = await modules.users.findUserByToken({ resetToken: params.token });
+  const user = await modules.users.findUserByResetToken(params.token);
 
   return !!user;
 }

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

@@ -10,7 +10,7 @@ export default async function validateVerifyEmailToken(
 
   log(`query validateVerifyEmailToken ${userId}`, { userId, token });
 
-  const unverifiedToken = await modules.users.findUserByToken({ verifyEmailToken: token });
+  const unverifiedToken = await modules.users.findUnverifiedEmailToken(token);
 
   return !!unverifiedToken;
 }

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

@@ -92,6 +92,7 @@ export const Assortment: AssortmentHelperTypes = {
     });
   },
 
+  // TODO: Use a loader!
   async media(obj, params, { modules }) {
     return modules.assortments.media.findAssortmentMedias({
       assortmentId: obj._id,

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

@@ -1,5 +1,5 @@
 import { Context } from '@unchainedshop/types/api.js';
-import { Event as EventType } from '@unchainedshop/core-events';
+import type { Event as EventType } from '@unchainedshop/core-events';
 
 export type HelperType<P, T> = (work: EventType, params: P, context: Context) => T;
 

package/src/resolvers/type/index.ts

@@ -23,7 +23,6 @@ import { FilterOption } from './filter/filter-option-types.js';
 import { Language } from './language-types.js';
 import { LoadedFilter } from './filter/loaded-filter-types.js';
 import { LoadedFilterOption } from './filter/loaded-filter-option-types.js';
-import { LoginMethodResponse } from './login-method-response-types.js';
 import { Order } from './order/order-types.js';
 import { OrderDelivery } from './order/order-delivery-types.js';
 import { OrderDeliveryDiscount } from './order/order-delivery-discount-types.js';
@@ -67,8 +66,7 @@ import { Event } from './event-types.js';
 import { Media } from './media-types.js';
 import { Token } from './token-types.js';
 import { Web3Address } from './web3-address.js';
-import { OAuthAccount } from './oauth-account.js';
-import { OAuthProvider } from './oauth-provider.js';
+import { LoginMethodResponse } from './login-method-response-types.js';
 
 const types = {
   Assortment,
@@ -96,7 +94,6 @@ const types = {
   Language,
   LoadedFilter,
   LoadedFilterOption,
-  LoginMethodResponse,
   Order,
   OrderDelivery,
   OrderDeliveryDiscount,
@@ -140,8 +137,7 @@ const types = {
   Event,
   Media,
   Web3Address,
-  OAuthAccount,
-  OAuthProvider,
+  LoginMethodResponse,
 };
 
 export default types;

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

@@ -1,17 +1,6 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { User } from '@unchainedshop/types/user.js';
-
 export const LoginMethodResponse = {
-  user: async ({ id }: { id: string }, _: never, { modules }: Context) => {
-    const user = (await modules.users.findUserById(id)) as User & {
-      _inLoginMethodResponse: boolean;
-    };
+  user({ user }) {
     user._inLoginMethodResponse = true; // eslint-disable-line
-
     return user;
   },
-  token({ token, tokenExpires }, _, { setLoginToken }: Context) {
-    setLoginToken(token, tokenExpires);
-    return token;
-  },
 };

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

@@ -28,6 +28,7 @@ export const Product = {
     });
   },
 
+  // TODO: Use a loader!
   async media(
     product: ProductType,
     params: {

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

@@ -15,7 +15,6 @@ import {
   Web3Address,
   WebAuthnCredentials,
   PushSubscription,
-  OAuthAccount,
 } from '@unchainedshop/types/user.js';
 import type { Locale } from 'locale';
 import { TokenSurrogate } from '@unchainedshop/types/warehousing.js';
@@ -48,7 +47,6 @@ export interface UserHelperTypes {
   >;
   isGuest: HelperType<any, boolean>;
   isInitialPassword: HelperType<any, boolean>;
-  isTwoFactorEnabled: HelperType<any, boolean>;
   language: HelperType<{ localeContext: Locale }, Language>;
   lastBillingAddress: HelperType<any, UserType['lastBillingAddress']>;
   lastContact: HelperType<any, Contact>;
@@ -82,7 +80,6 @@ export interface UserHelperTypes {
   tags: HelperType<any, Array<string>>;
   username: HelperType<any, string>;
   pushSubscriptions: HelperType<any, Array<PushSubscription>>;
-  oAuthAccounts: HelperType<any, Array<OAuthAccount>>;
   reviews: HelperType<
     {
       sort?: Array<SortOption>;
@@ -141,11 +138,7 @@ export const User: UserHelperTypes = {
     const { password: { initial } = { initial: undefined } } = user.services || {};
     return user.initialPassword || !!initial;
   },
-  isTwoFactorEnabled: async (user, params, context) => {
-    await checkAction(context, viewUserPrivateInfos, [user, params]);
-    const { 'two-factor': { secret } = { secret: undefined } } = user.services || {};
-    return !!secret;
-  },
+
   isGuest: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
     return !!user.guest;
@@ -249,15 +242,6 @@ export const User: UserHelperTypes = {
       endpoint,
     }));
   },
-  oAuthAccounts: async (user, params, context) => {
-    await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return Object.entries(user.services?.oauth || {}).flatMap(([provider, accounts]) => {
-      return (accounts as any).map((providerData) => ({
-        provider,
-        ...(providerData as any),
-      }));
-    });
-  },
   async reviews(user, params, context) {
     const { modules } = context;
     await checkAction(context, viewUserProductReviews, [user, params]);

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

@@ -21,7 +21,7 @@ export const WebAuthnCredentials: WebAuthnCredentialsHelperTypes = {
     return obj.created || new Date(0);
   },
   async mdsMetadata(obj, _, { modules }) {
-    const metadata = await modules.accounts.webAuthn.findMDSMetadataForAAGUID(obj.aaguid);
+    const metadata = await modules.users.webAuthn.findMDSMetadataForAAGUID(obj.aaguid);
     return metadata;
   },
 };

package/src/roles/all.ts

@@ -23,7 +23,7 @@ export const all = (role, actions) => {
 
     if (isOwnedByUser) return true;
 
-    const accessKeyHeader = context.req.headers['x-token-accesskey'];
+    const accessKeyHeader = context.getHeader('x-token-accesskey') as string;
     const accessKey = await context.modules.warehousing.buildAccessKeyForToken(tokenId);
     if (accessKeyHeader === accessKey) return true;
 
@@ -91,10 +91,6 @@ export const all = (role, actions) => {
   role.allow(actions.viewOrder, () => false);
   role.allow(actions.viewQuotation, () => false);
   role.allow(actions.viewEnrollment, () => false);
-  role.allow(actions.authTwoFactor, () => false);
-  role.allow(actions.manageTwoFactor, () => false);
-  role.allow(actions.impersonate, () => false);
-  role.allow(actions.stopImpersonation, () => false);
   role.allow(actions.viewTokens, () => false);
 
   // special case: when doing a login mutation, the user is not logged in technically yet,
@@ -132,11 +128,9 @@ export const all = (role, actions) => {
   role.allow(actions.viewFilter, () => true);
   role.allow(actions.viewTranslations, () => true);
   role.allow(actions.logout, () => true);
-  role.allow(actions.logoutAllSessions, () => true);
   role.allow(actions.loginAsGuest, () => true);
   role.allow(actions.loginWithPassword, () => true);
   role.allow(actions.loginWithWebAuthn, () => true);
-  role.allow(actions.loginWithOAuth, () => true);
   role.allow(actions.verifyEmail, () => true);
   role.allow(actions.useWebAuthn, () => true);
   role.allow(actions.pageView, () => true);

package/src/roles/index.ts

@@ -98,16 +98,10 @@ const actions: Record<string, string> = [
   'registerPaymentCredentials',
   'managePaymentCredentials',
   'bulkImport',
-  'authTwoFactor',
-  'manageTwoFactor',
-  'impersonate',
-  'stopImpersonation',
   'logout',
-  'logoutAllSessions',
   'loginAsGuest',
   'loginWithPassword',
   'loginWithWebAuthn',
-  'loginWithOAuth',
   'verifyEmail',
   'useWebAuthn',
   'pageView',

package/src/roles/loggedIn.ts

@@ -204,8 +204,6 @@ 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.authTwoFactor, isMyself);
-  role.allow(actions.manageTwoFactor, isMyself);
   role.allow(actions.sendEmail, isOwnedEmailAddress);
   role.allow(actions.viewOrder, isOwnedOrder);
   role.allow(actions.updateOrder, isOwnedOrder);
@@ -228,7 +226,5 @@ export const loggedIn = (role: any, actions: Record<string, string>) => {
   role.allow(actions.voteProductReview, () => true);
   role.allow(actions.registerPaymentCredentials, () => true);
   role.allow(actions.managePaymentCredentials, isOwnedPaymentCredential);
-  role.allow(actions.stopImpersonation, () => true);
-  role.allow(actions.impersonate, () => false);
   role.allow(actions.confirmMediaUpload, () => true);
 };

package/src/schema/directives.ts

@@ -5,10 +5,6 @@ export default [
       PRIVATE
     }
 
-    directive @cacheControl(
-      maxAge: Int
-      scope: CacheControlScope
-      inheritMaxAge: Boolean
-    ) on FIELD_DEFINITION | OBJECT | INTERFACE | UNION
+    directive @cacheControl(maxAge: Int, scope: CacheControlScope) on FIELD_DEFINITION | OBJECT
   `,
 ];

package/src/schema/inputTypes.ts

@@ -61,20 +61,19 @@ export default [
     }
 
     input CreateProductInput {
-      title: String!
       type: String!
       tags: [LowerCaseString!]
     }
 
+    input ProductVariationTextInput {
+      locale: String!
+      title: String
+      subtitle: String
+    }
+
     input CreateProductVariationInput {
       key: String!
       type: ProductVariationType!
-      title: String!
-    }
-
-    input CreateProductVariationOptionInput {
-      value: String!
-      title: String!
     }
 
     input ProductAssignmentVectorInput {
@@ -88,7 +87,7 @@ export default [
       meta: JSON
     }
 
-    input UpdateProductTextInput {
+    input ProductTextInput {
       locale: String!
       slug: String
       title: String
@@ -99,13 +98,7 @@ export default [
       labels: [String!]
     }
 
-    input UpdateProductMediaTextInput {
-      locale: String!
-      title: String
-      subtitle: String
-    }
-
-    input UpdateProductVariationTextInput {
+    input ProductMediaTextInput {
       locale: String!
       title: String
       subtitle: String
@@ -163,7 +156,6 @@ export default [
     input CreateAssortmentInput {
       isRoot: Boolean
       tags: [LowerCaseString!]
-      title: String!
     }
 
     input UpdateAssortmentInput {
@@ -173,7 +165,7 @@ export default [
       sequence: Int
     }
 
-    input UpdateAssortmentTextInput {
+    input AssortmentTextInput {
       locale: String!
       slug: String
       title: String
@@ -196,7 +188,7 @@ export default [
       sortKey: Int!
     }
 
-    input UpdateAssortmentMediaTextInput {
+    input AssortmentMediaTextInput {
       locale: String!
       title: String
       subtitle: String
@@ -210,21 +202,15 @@ export default [
     input CreateFilterInput {
       key: String!
       type: FilterType!
-      title: String!
       options: [String!]
     }
 
-    input CreateFilterOptionInput {
-      value: String!
-      title: String!
-    }
-
     input UpdateFilterInput {
       isActive: Boolean
       key: String
     }
 
-    input UpdateFilterTextInput {
+    input FilterTextInput {
       locale: String!
       title: String
       subtitle: String