@unchainedshop/api 2.14.2 → 3.0.0-alpha3

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

@@ -1,13 +1,11 @@
-import { Context, SortOption } from '@unchainedshop/types/api.js';
-import { Bookmark } from '@unchainedshop/types/bookmarks.js';
-import { Contact } from '@unchainedshop/types/common.js';
-import { Country } from '@unchainedshop/types/countries.js';
-import { Enrollment, EnrollmentStatus } from '@unchainedshop/types/enrollments.js';
-import { File } from '@unchainedshop/types/files.js';
-import { Language } from '@unchainedshop/types/languages.js';
-import { Order, OrderStatus } from '@unchainedshop/types/orders.js';
-import { PaymentCredentials } from '@unchainedshop/types/payments.js';
-import { Quotation } from '@unchainedshop/types/quotations.js';
+import type { Bookmark } from '@unchainedshop/core-bookmarks';
+import { SortOption } from '@unchainedshop/utils';
+import { Enrollment, EnrollmentStatus } from '@unchainedshop/core-enrollments';
+import { File } from '@unchainedshop/core-files';
+import { Language } from '@unchainedshop/core-languages';
+import { Order, OrderStatus } from '@unchainedshop/core-orders';
+import { PaymentCredentials } from '@unchainedshop/core-payment';
+import { Quotation } from '@unchainedshop/core-quotations';
 import {
   Email,
   User as UserType,
@@ -15,14 +13,15 @@ import {
   Web3Address,
   WebAuthnCredentials,
   PushSubscription,
-  OAuthAccount,
-} from '@unchainedshop/types/user.js';
-import type { Locale } from 'locale';
-import { TokenSurrogate } from '@unchainedshop/types/warehousing.js';
+} from '@unchainedshop/core-users';
+import { TokenSurrogate } from '@unchainedshop/core-warehousing';
 import { Roles, permissions } from '@unchainedshop/roles';
-import { ProductReview } from '@unchainedshop/types/products.reviews.js';
+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';
 
 type HelperType<P, T> = (user: UserType, params: P, context: Context) => Promise<T>;
 
@@ -31,10 +30,10 @@ export interface UserHelperTypes {
   created: HelperType<any, Date>;
   updated: HelperType<any, Date>;
   deleted: HelperType<any, Date>;
-  avatar: HelperType<{ localeContext: Locale }, File>;
+  avatar: HelperType<{ localeContext: Intl.Locale }, File>;
   bookmarks: HelperType<any, Array<Bookmark>>;
   cart: HelperType<{ orderNumber?: string }, Order>;
-  country: HelperType<{ localeContext: Locale }, Country>;
+  country: HelperType<{ localeContext: Intl.Locale }, Country>;
   emails: HelperType<any, Array<string>>;
   enrollments: HelperType<
     {
@@ -48,13 +47,11 @@ export interface UserHelperTypes {
   >;
   isGuest: HelperType<any, boolean>;
   isInitialPassword: HelperType<any, boolean>;
-  isTwoFactorEnabled: HelperType<any, boolean>;
-  language: HelperType<{ localeContext: Locale }, Language>;
+  language: HelperType<{ localeContext: Intl.Locale }, Language>;
   lastBillingAddress: HelperType<any, UserType['lastBillingAddress']>;
   lastContact: HelperType<any, Contact>;
   lastLogin: HelperType<any, UserType['lastLogin']>;
   allowedActions: HelperType<any, Array<string>>;
-  // locale: HelperType<{ localeContext: Locale }, Locale>;
   name: HelperType<any, string>;
   orders: HelperType<
     {
@@ -82,7 +79,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 +137,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;
@@ -181,7 +173,10 @@ export const User: UserHelperTypes = {
 
   async country(user, params, context) {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserCountry(user, context);
+    const userLocale = context.modules.users.userLocale(user);
+    return context.modules.countries.findCountry({
+      isoCode: userLocale.region?.toUpperCase(),
+    });
   },
 
   async enrollments(user, params, context) {
@@ -194,7 +189,10 @@ export const User: UserHelperTypes = {
 
   language: async (user, params, context) => {
     await checkAction(context, viewUserPrivateInfos, [user, params]);
-    return context.services.users.getUserLanguage(user, context);
+    const userLocale = context.modules.users.userLocale(user);
+    return context.modules.languages.findLanguage({
+      isoCode: userLocale.language,
+    });
   },
 
   allowedActions: async (user, params, context) => {
@@ -249,15 +247,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/warehousing-provider-types.ts

@@ -1,4 +1,17 @@
-import { WarehousingProviderHelperTypes } from '@unchainedshop/types/warehousing.js';
+import {
+  WarehousingError,
+  WarehousingInterface,
+  WarehousingProvider as WarehousingProviderType,
+} from '@unchainedshop/core-warehousing';
+import { Context } from '../../types.js';
+
+export type HelperType<P, T> = (provider: WarehousingProviderType, params: P, context: Context) => T;
+
+export interface WarehousingProviderHelperTypes {
+  configurationError: HelperType<never, Promise<WarehousingError>>;
+  interface: HelperType<never, WarehousingInterface>;
+  isActive: HelperType<never, Promise<boolean>>;
+}
 
 export const WarehousingProvider: WarehousingProviderHelperTypes = {
   interface(obj, _, context) {

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

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { WebAuthnCredentials as WebAuthnCredentialsTypes } from '@unchainedshop/types/user.js';
+import { Context } from '@unchainedshop/api';
+import { WebAuthnCredentials as WebAuthnCredentialsTypes } from '@unchainedshop/core-users';
 
 type HelperType<P, T> = (
   credentials: WebAuthnCredentialsTypes,
@@ -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/resolvers/type/work-types.ts

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { Work as WorkType } from '@unchainedshop/types/worker.js';
+import { Context } from '@unchainedshop/api';
+import { Work as WorkType } from '@unchainedshop/core-worker';
 import { buildObfuscatedFieldsFilter } from '@unchainedshop/utils';
 
 type HelperType<P, T> = (work: WorkType, params: P, context: Context) => T;

package/src/roles/all.ts

@@ -1,4 +1,4 @@
-import { Context } from '@unchainedshop/types/api.js';
+import { Context } from '@unchainedshop/api';
 
 export const all = (role, actions) => {
   const isInLoginMutationResponse = (root) => {
@@ -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);
   role.allow(actions.viewStatistics, () => false);
 
@@ -133,11 +129,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

@@ -1,5 +1,5 @@
-import { Context } from '@unchainedshop/types/api.js';
-import { User } from '@unchainedshop/types/user.js';
+import { Context } from '@unchainedshop/api';
+import { User } from '@unchainedshop/core-users';
 
 export const loggedIn = (role: any, actions: Record<string, string>) => {
   const isMyself = (user: User, params: { userId?: string } = {}, ownUser: { userId?: string } = {}) => {
@@ -202,8 +202,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);
@@ -226,6 +224,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.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: Locale!
+      title: String
+      subtitle: String
+    }
+
     input CreateProductVariationInput {
       key: String!
       type: ProductVariationType!
-      title: String!
-    }
-
-    input CreateProductVariationOptionInput {
-      value: String!
-      title: String!
     }
 
     input ProductAssignmentVectorInput {
@@ -88,8 +87,8 @@ export default [
       meta: JSON
     }
 
-    input UpdateProductTextInput {
-      locale: String!
+    input ProductTextInput {
+      locale: Locale!
       slug: String
       title: String
       subtitle: String
@@ -99,14 +98,8 @@ export default [
       labels: [String!]
     }
 
-    input UpdateProductMediaTextInput {
-      locale: String!
-      title: String
-      subtitle: String
-    }
-
-    input UpdateProductVariationTextInput {
-      locale: String!
+    input ProductMediaTextInput {
+      locale: Locale!
       title: String
       subtitle: String
     }
@@ -163,7 +156,6 @@ export default [
     input CreateAssortmentInput {
       isRoot: Boolean
       tags: [LowerCaseString!]
-      title: String!
     }
 
     input UpdateAssortmentInput {
@@ -173,8 +165,8 @@ export default [
       sequence: Int
     }
 
-    input UpdateAssortmentTextInput {
-      locale: String!
+    input AssortmentTextInput {
+      locale: Locale!
       slug: String
       title: String
       subtitle: String
@@ -196,8 +188,8 @@ export default [
       sortKey: Int!
     }
 
-    input UpdateAssortmentMediaTextInput {
-      locale: String!
+    input AssortmentMediaTextInput {
+      locale: Locale!
       title: String
       subtitle: String
     }
@@ -210,22 +202,16 @@ 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 {
-      locale: String!
+    input FilterTextInput {
+      locale: Locale!
       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
       """
@@ -151,7 +111,7 @@ export default [
       """
       Add multiple new item to the cart. Order gets generated with status = open (= order before checkout / cart) if necessary.
       """
-      addMultipleCartProducts(orderId: ID, items: [OrderItemInput!]!): [OrderItem]!
+      addMultipleCartProducts(orderId: ID, items: [OrderItemInput!]!): Order!
 
       """
       Add a new discount to the cart, a new order gets generated with status = open (= order before checkout / cart) if necessary
@@ -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

package/src/schema/query.ts

@@ -5,10 +5,6 @@ export default [
       Currently logged in user
       """
       me: User
-      """
-      User impersonating current user session using the  impersonate API
-      """
-      impersonator: User
 
       """
       Get list of users, by default sorted by creation date (ascending) unless a queryString is set

package/src/schema/scalars.ts

@@ -1,10 +1,10 @@
 export default [
   /* GraphQL */ `
     scalar JSON
-    scalar Upload
     scalar DateTime
     scalar Date
     scalar Timestamp
     scalar LowerCaseString
+    scalar Locale
   `,
 ];