@unchainedshop/api 2.12.2 → 3.0.0-alpha2

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/payment/payment-provider-types.ts

@@ -59,17 +59,10 @@ export const PaymentProvider: PaymentProviderHelperTypes = {
     { currency: currencyCode, orderId, useNetPrice, context: providerContext },
     requestContext,
   ) {
-    const { modules, services, countryContext: country, user } = requestContext;
+    const { modules, countryContext: country, user } = requestContext;
     const order = await modules.orders.findOrder({ orderId });
 
-    const currency =
-      currencyCode ||
-      (await services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: country,
-        },
-        requestContext,
-      ));
+    const currency = currencyCode || requestContext.currencyContext;
 
     const pricingDirector = await PaymentPricingDirector.actions(
       {

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

@@ -58,14 +58,7 @@ export const ConfigurableProduct = {
     requestContext: Context,
   ): Promise<ProductPriceRange> {
     const { countryContext, modules } = requestContext;
-    const currencyCode =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currencyCode = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.catalogPriceRange(product, {
       quantity,
       vectors,
@@ -111,14 +104,8 @@ export const ConfigurableProduct = {
     requestContext: Context,
   ): Promise<ProductPriceRange> {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
+
     return modules.products.prices.simulatedPriceRange(
       product,
       {

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

@@ -11,17 +11,10 @@ export const PlanProduct = {
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { modules, countryContext } = requestContext;
-    const currencyCode =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.price(product, {
       country: countryContext,
-      currency: currencyCode,
+      currency,
       quantity,
     });
   },
@@ -36,14 +29,8 @@ export const PlanProduct = {
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
+
     return modules.products.prices.userPrice(
       obj,
       { quantity, userId: requestContext.userId, currency, country: countryContext, useNetPrice },
@@ -63,14 +50,7 @@ export const PlanProduct = {
     }>
   > {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.catalogPricesLeveled(obj, { currency, country: countryContext });
   },
 

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

@@ -44,7 +44,8 @@ export default [
     input UpdateCountryInput {
       isoCode: String!
       isActive: Boolean
-      defaultCurrencyId: String
+      defaultCurrencyCode: String
+      defaultCurrencyId: String @deprecated(reason: "Use defaultCurrencyCode instead")
     }
 
     input CreateCurrencyInput {
@@ -60,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 {
@@ -87,7 +87,7 @@ export default [
       meta: JSON
     }
 
-    input UpdateProductTextInput {
+    input ProductTextInput {
       locale: String!
       slug: String
       title: String
@@ -98,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
@@ -162,7 +156,6 @@ export default [
     input CreateAssortmentInput {
       isRoot: Boolean
       tags: [LowerCaseString!]
-      title: String!
     }
 
     input UpdateAssortmentInput {
@@ -172,7 +165,7 @@ export default [
       sequence: Int
     }
 
-    input UpdateAssortmentTextInput {
+    input AssortmentTextInput {
       locale: String!
       slug: String
       title: String
@@ -195,7 +188,7 @@ export default [
       sortKey: Int!
     }
 
-    input UpdateAssortmentMediaTextInput {
+    input AssortmentMediaTextInput {
       locale: String!
       title: String
       subtitle: String
@@ -209,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

package/src/schema/mutation.ts

@@ -5,27 +5,13 @@ export default [
       """
       Log the user in with a password.
       """
-      loginWithPassword(
-        username: String
-        email: String
-        plainPassword: String
-        totpCode: String
-      ): LoginMethodResponse
+      loginWithPassword(username: String, email: String, password: String): LoginMethodResponse
 
       """
       Log the user in with a WebAuthn device
       """
       loginWithWebAuthn(webAuthnPublicKeyCredentials: JSON!): LoginMethodResponse
 
-      """
-      Log the user with OAuth2 service provider
-      """
-      loginWithOAuth(
-        provider: String!
-        authorizationCode: String!
-        redirectUrl: String!
-      ): LoginMethodResponse
-
       """
       Web3
       """
@@ -33,12 +19,6 @@ export default [
       verifyWeb3Address(address: String!, hash: String!): User!
       removeWeb3Address(address: String!): User!
 
-      """
-      OAuth2
-      """
-      linkOAuthAccount(provider: String!, authorizationCode: String!, redirectUrl: String!): User!
-      unlinkOAuthAccount(provider: String!, oAuthAccountId: ID!): User!
-
       """
       Create a new user.
       """
@@ -46,7 +26,7 @@ export default [
         username: String
         email: String
         webAuthnPublicKeyCredentials: JSON
-        plainPassword: String
+        password: String
         profile: UserProfileInput
       ): LoginMethodResponse
 
@@ -60,7 +40,7 @@ export default [
       """
       Change the current user's password. Must be logged in.
       """
-      changePassword(oldPlainPassword: String, newPlainPassword: String): SuccessResponse
+      changePassword(oldPassword: String, newPassword: String): SuccessResponse
 
       """
       Request a forgot password email.
@@ -70,17 +50,12 @@ export default [
       """
       Reset the password for a user using a token received in email. Logs the user in afterwards.
       """
-      resetPassword(newPlainPassword: String, token: String!): LoginMethodResponse
+      resetPassword(newPassword: String, token: String!): LoginMethodResponse
 
       """
       Log the user out.
       """
-      logout(token: String): SuccessResponse
-
-      """
-      Log out all sessions related with user.
-      """
-      logoutAllSessions: SuccessResponse
+      logout: SuccessResponse
 
       """
       Marks the user's email address as verified. Logs the user in afterwards.
@@ -97,21 +72,6 @@ export default [
       """
       loginAsGuest: LoginMethodResponse
 
-      """
-      In order to activate TOTP, generate a secret and return
-      """
-      buildSecretTOTPAuthURL: String!
-
-      """
-      In order to activate 2nd factor (TOTP), generate a secret and return
-      """
-      enableTOTP(secretBase32: String!, code: String!): User!
-
-      """
-      Disable the 2nd factor (TOTP)
-      """
-      disableTOTP(code: String!, userId: ID): User!
-
       """
       Create WebAuthn PublicKeyCredentialCreationOptions to use for Registering a new WebAuthn Device
       """
@@ -331,11 +291,6 @@ export default [
       """
       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!
-
       """
       Set tags of user
       """
@@ -354,7 +309,7 @@ export default [
       """
       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!, password: String): User!
 
       """
       Forcefully trigger an enrollment email for already added users by e-mail
@@ -369,7 +324,7 @@ export default [
       """
       Set a new password for a specific user
       """
-      setPassword(newPlainPassword: String, userId: ID!): User!
+      setPassword(newPassword: String, userId: ID!): User!
 
       """
       Set roles of a user
@@ -379,7 +334,7 @@ export default [
       """
       Create a new product
       """
-      createProduct(product: CreateProductInput!): Product!
+      createProduct(product: CreateProductInput!, texts: [ProductTextInput!]): Product!
 
       """
       Make the product visible on any shop listings (product queries)
@@ -432,28 +387,13 @@ export default [
       """
       Modify localized texts part of a product
       """
-      updateProductTexts(productId: ID!, texts: [UpdateProductTextInput!]!): [ProductTexts!]!
-
-      """
-      Add a new media to a product's visualization
-      """
-      addProductMedia(productId: ID!, media: Upload!): ProductMedia!
+      updateProductTexts(productId: ID!, texts: [ProductTextInput!]!): [ProductTexts!]!
 
       """
       Remove a media asset from a product's visualization
       """
       removeProductMedia(productMediaId: ID!): ProductMedia!
 
-      """
-      Impersonate a user
-      """
-      impersonate(userId: ID!): LoginMethodResponse!
-
-      """
-      End customer impersonated user session and resume the impersonator session
-      """
-      stopImpersonation: LoginMethodResponse!
-
       """
       Reorder a media asset (first is primary)
       """
@@ -464,7 +404,7 @@ export default [
       """
       updateProductMediaTexts(
         productMediaId: ID!
-        texts: [UpdateProductMediaTextInput!]!
+        texts: [ProductMediaTextInput!]!
       ): [ProductMediaTexts!]!
 
       """
@@ -487,13 +427,17 @@ export default [
       updateProductVariationTexts(
         productVariationId: ID!
         productVariationOptionValue: String
-        texts: [UpdateProductVariationTextInput!]!
+        texts: [ProductVariationTextInput!]!
       ): [ProductVariationTexts!]!
 
       """
       Creates new product variation for a product.
       """
-      createProductVariation(productId: ID!, variation: CreateProductVariationInput!): ProductVariation!
+      createProductVariation(
+        productId: ID!
+        variation: CreateProductVariationInput!
+        texts: [ProductVariationTextInput!]
+      ): ProductVariation!
 
       """
       Adds one product as bundle for another products
@@ -510,7 +454,8 @@ export default [
       """
       createProductVariationOption(
         productVariationId: ID!
-        option: CreateProductVariationOptionInput!
+        option: String!
+        texts: [ProductVariationTextInput!]
       ): ProductVariation!
 
       """
@@ -631,7 +576,7 @@ export default [
       """
       Creates new assortment.
       """
-      createAssortment(assortment: CreateAssortmentInput!): Assortment!
+      createAssortment(assortment: CreateAssortmentInput!, texts: [AssortmentTextInput!]): Assortment!
 
       """
       Updates the provided assortment
@@ -652,7 +597,7 @@ export default [
       """
       Modify localized texts part of an assortment
       """
-      updateAssortmentTexts(assortmentId: ID!, texts: [UpdateAssortmentTextInput!]!): [AssortmentTexts!]!
+      updateAssortmentTexts(assortmentId: ID!, texts: [AssortmentTextInput!]!): [AssortmentTexts!]!
 
       """
       Add a new product to an assortment
@@ -706,10 +651,6 @@ export default [
       Reorder the products in an assortment
       """
       reorderAssortmentFilters(sortKeys: [ReorderAssortmentFilterInput!]!): [AssortmentFilter!]!
-      """
-      Add a new media to a assortment
-      """
-      addAssortmentMedia(assortmentId: ID!, media: Upload!): AssortmentMedia!
 
       """
       Remove a media asset from a assortment
@@ -726,13 +667,13 @@ export default [
       """
       updateAssortmentMediaTexts(
         assortmentMediaId: ID!
-        texts: [UpdateAssortmentMediaTextInput!]!
+        texts: [AssortmentMediaTextInput!]!
       ): [AssortmentMediaTexts!]!
 
       """
       Creates new Filter along with the user who created it.
       """
-      createFilter(filter: CreateFilterInput!): Filter!
+      createFilter(filter: CreateFilterInput!, texts: [FilterTextInput!]): Filter!
 
       """
       Updates the specified filter with the information passed.
@@ -755,13 +696,13 @@ export default [
       updateFilterTexts(
         filterId: ID!
         filterOptionValue: String
-        texts: [UpdateFilterTextInput!]!
+        texts: [FilterTextInput!]!
       ): [FilterTexts!]!
 
       """
       Adds new option to filters
       """
-      createFilterOption(filterId: ID!, option: CreateFilterOptionInput!): Filter!
+      createFilterOption(filterId: ID!, option: String!, texts: [FilterTextInput!]): Filter!
 
       """
       Add a new ProductReview