@unchainedshop/platform 2.12.2 → 3.0.0-alpha2

package/src/setup/setupAccounts.ts

@@ -1,245 +1,16 @@
-import { User } from '@unchainedshop/types/user.js';
-import { randomValueHex } from '@unchainedshop/utils';
-import { accountsSettings } from '@unchainedshop/core-accountsjs';
-import moniker from 'moniker';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
+import { subscribe } from '@unchainedshop/events';
 
 export const setupAccounts = (unchainedAPI: UnchainedCore) => {
-  const accountsServer = unchainedAPI.modules.accounts.getAccountsServer();
-
-  accountsServer.users = unchainedAPI.modules.users;
-
-  accountsServer.options.prepareMail = (
-    to: string,
-    token: string,
-    user: User & { id: string },
-    pathFragment: string,
-  ) => {
-    return {
-      template: 'ACCOUNT_ACTION',
-      recipientEmail: to,
-      action: pathFragment,
-      userId: user.id || user._id,
-      token,
-      skipMessaging: !!user.guest && pathFragment === 'verify-email',
-    };
-  };
-
-  accountsServer.options.sendMail = (input: any) => {
-    if (!input) return true;
-    if (input.skipMessaging) return true;
-
-    return unchainedAPI.modules.worker.addWork({
+  subscribe('USER_ACCOUNT_ACTION', async ({ payload }: { payload: any }) => {
+    await unchainedAPI.modules.worker.addWork({
       type: 'MESSAGE',
       retries: 0,
-      input,
-    });
-  };
-
-  accountsServer.services.guest = {
-    async authenticate(params: { email?: string | null }) {
-      const guestname = `${moniker.choose()}-${randomValueHex(5)}`;
-
-      const guestUserId = await unchainedAPI.modules.accounts.createUser(
-        {
-          email: params.email || `${guestname}@unchained.local`,
-          guest: true,
-          password: null,
-          initialPassword: true,
-        },
-        {},
-      );
-      return unchainedAPI.modules.users.findUserById(guestUserId);
-    },
-  };
-
-  accountsServer.services.webAuthn = {
-    async authenticate(params: { webAuthnPublicKeyCredentials: any }) {
-      const username =
-        Buffer.from(params.webAuthnPublicKeyCredentials?.response?.userHandle, 'base64').toString() ||
-        '';
-
-      const user = await unchainedAPI.modules.users.findUser({ username });
-      if (!user) throw new Error('User not found');
-
-      await unchainedAPI.modules.accounts.webAuthn.verifyCredentialRequest(
-        user.services?.webAuthn,
-        user.username,
-        params.webAuthnPublicKeyCredentials,
-      );
-      return user;
-    },
-  };
-
-  accountsServer.services.oauth2 = {
-    async authenticate({
-      authorizationCode,
-      provider,
-      redirectUrl,
-    }: {
-      authorizationCode: any;
-      provider: string;
-      redirectUrl: string;
-    }): Promise<any> {
-      if (!authorizationCode || !provider) {
-        return undefined;
-      }
-
-      const { modules, services } = unchainedAPI;
-
-      const authorizationToken = await modules.accounts.oAuth2.getAuthorizationToken(
-        provider,
-        authorizationCode,
-        redirectUrl,
-      );
-
-      if (!authorizationToken) throw new Error('Unable to authorize user');
-      const data = await modules.accounts.oAuth2.getAccountData(provider, authorizationToken);
-      if (!data?.id) {
-        throw new Error('OAuth authentication failed or no id returned from service');
-      }
-
-      const user = await unchainedAPI.modules.users.findUser({
-        [`services.oauth.${provider}.id`]: data.id,
-      });
-
-      if (!user) {
-        const newUserId = await unchainedAPI.modules.accounts.createUser(
-          {
-            username: data.username || `${data.id}`,
-            email: data.email,
-            guest: false,
-            initialPassword: undefined,
-            password: undefined,
-            profile: {
-              address: {
-                firstName: data?.firstName,
-                lastName: data?.lastName,
-                addressLine: data?.address,
-                city: data?.city,
-                countryCode: data?.countryCode,
-                regionCode: data?.regionCode,
-                postalCode: data?.postalCode,
-                company: data?.company,
-              },
-              gender: data?.gender,
-              phoneMobile: data?.phoneNumber,
-              displayName: data?.displayName,
-              birthday: data?.birthDate,
-            },
-          },
-          { skipPasswordEnrollment: true },
-        );
-
-        await modules.users.updateUser(
-          { _id: newUserId },
-          {
-            $push: {
-              [`services.oauth.${provider}`]: {
-                id: data.id,
-                authorizationToken,
-                authorizationCode,
-                data,
-              },
-            },
-          },
-          { upsert: true },
-        );
-
-        if (data?.avatarUrl) {
-          const file = await services.files.uploadFileFromURL(
-            {
-              directoryName: 'user-avatars',
-              fileInput: {
-                fileLink: data.avatarUrl,
-                fileName: `${data.firstName}-avatar`,
-              },
-              meta: { userId: newUserId },
-            },
-            unchainedAPI,
-          );
-          if (user?.avatarId) {
-            await services.files.removeFiles(
-              {
-                fileIds: [user.avatarId as string],
-              },
-              unchainedAPI,
-            );
-          }
-          return modules.users.updateAvatar(newUserId, file._id);
-        }
-      }
-
-      return user;
-    },
-  };
-
-  accountsServer.on('LoginTokenCreated', async (props) => {
-    const { userId, connection = {} } = props;
-
-    // TODO: Doubt that there is countryContext etc. here?
-    const { userIdBeforeLogin, countryContext, remoteAddress, remotePort, userAgent, normalizedLocale } =
-      connection;
-
-    await unchainedAPI.modules.users.updateHeartbeat(userId, {
-      remoteAddress,
-      remotePort,
-      userAgent,
-      locale: normalizedLocale,
-      countryCode: countryContext,
-    });
-
-    const user = await unchainedAPI.modules.users.findUserById(userId);
-
-    if (userIdBeforeLogin) {
-      const userBeforeLogin = await unchainedAPI.modules.users.findUserById(userIdBeforeLogin);
-
-      await unchainedAPI.services.orders.migrateOrderCarts(
-        {
-          fromUserId: userBeforeLogin._id,
-          toUserId: user._id,
-          shouldMerge: accountsSettings.mergeUserCartsOnLogin,
-          countryContext:
-            countryContext || userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
-        },
-        unchainedAPI,
-      );
-
-      await unchainedAPI.services.bookmarks.migrateBookmarks(
-        {
-          fromUserId: userBeforeLogin._id,
-          toUserId: user._id,
-          shouldMerge: accountsSettings.mergeUserCartsOnLogin,
-          countryContext:
-            countryContext || userBeforeLogin.lastLogin?.countryCode || user.lastLogin?.countryCode,
-        },
-        unchainedAPI,
-      );
-    }
-
-    return unchainedAPI.services.orders.nextUserCart(
-      {
-        user,
-        countryCode: countryContext,
+      input: {
+        template: 'ACCOUNT_ACTION',
+        recipientEmail: payload.address,
+        ...payload,
       },
-      unchainedAPI,
-    );
-  });
-
-  accountsServer.on('ResetPasswordSuccess', async (user: User) => {
-    await unchainedAPI.modules.users.updateInitialPassword(user, false);
-  });
-
-  accountsServer.on('ChangePasswordSuccess', async (user: User) => {
-    await unchainedAPI.modules.users.updateInitialPassword(user, false);
-  });
-
-  accountsServer.on('ValidateLogin', async (params: { service: string; user: User }) => {
-    if (params.service !== 'guest' && params.user.guest) {
-      await unchainedAPI.modules.users.updateGuest(params.user, false);
-    }
-    return true;
+    });
   });
-
-  return accountsServer;
 };

package/src/startPlatform.ts

@@ -1,4 +1,4 @@
-import { startAPIServer, roles } from '@unchainedshop/api';
+import { startAPIServer, GraphQLServerOptions, roles } from '@unchainedshop/api';
 import { initCore } from '@unchainedshop/core';
 import { initDb } from '@unchainedshop/mongodb';
 import { createLogger } from '@unchainedshop/logger';
@@ -6,6 +6,7 @@ import { UnchainedCore, UnchainedCoreOptions } from '@unchainedshop/types/core.j
 import { getRegisteredEvents } from '@unchainedshop/events';
 import { WorkerDirector } from '@unchainedshop/core-worker';
 import { AdminUiConfig } from '@unchainedshop/types/api.js';
+import { Db } from 'mongodb';
 import { BulkImportHandler, createBulkImporterFactory } from './bulk-importer/createBulkImporter.js';
 import { runMigrations } from './migrations/runMigrations.js';
 import { setupAccounts } from './setup/setupAccounts.js';
@@ -17,19 +18,14 @@ import { createMigrationRepository } from './migrations/migrationRepository.js';
 export { MessageTypes };
 
 export type PlatformOptions = {
-  typeDefs?: Array<string>;
-  resolvers?: any;
-  schema?: any;
-  plugins?: any[];
-  cache?: any;
   bulkImporter?: {
     handlers?: Record<string, BulkImportHandler>;
   };
   context?: any;
   workQueueOptions?: SetupWorkqueueOptions & SetupCartsOptions;
-  introspection?: boolean;
   adminUiConfig?: AdminUiConfig;
-} & Partial<Pick<UnchainedCoreOptions, 'modules' | 'services' | 'options' | 'rolesOptions'>>;
+} & Partial<Pick<UnchainedCoreOptions, 'modules' | 'services' | 'options' | 'rolesOptions'>> &
+  GraphQLServerOptions;
 
 const logger = createLogger('unchained');
 
@@ -55,21 +51,16 @@ export const queueWorkers: Array<any> = [];
 export const startPlatform = async ({
   modules = {},
   services = {},
-  typeDefs = [],
-  resolvers = [],
   options = {},
   adminUiConfig = {},
   rolesOptions = {},
   bulkImporter: bulkImporterOptions,
-  schema,
-  plugins,
-  cache,
   workQueueOptions,
-  context,
-  introspection,
+  ...arbitraryGraphQLServerOptions
 }: PlatformOptions): Promise<{
   unchainedAPI: UnchainedCore;
-  apolloGraphQLServer: any;
+  yogaServer: any;
+  db: Db;
 }> => {
   exitOnMissingEnvironmentVariables();
 
@@ -107,19 +98,13 @@ export const startPlatform = async ({
   setupTemplates(unchainedAPI);
 
   // Start the graphQL server
-  const apolloGraphQLServer = await startAPIServer({
+  const yogaServer = await startAPIServer({
     unchainedAPI,
     roles: configuredRoles,
     events: configuredEvents,
     workTypes: configuredWorkTypes,
-    typeDefs,
-    resolvers,
-    schema,
-    plugins,
-    cache,
-    context,
-    introspection,
     adminUiConfig,
+    ...arbitraryGraphQLServerOptions,
   });
 
   // Setup work queues for scheduled work
@@ -134,5 +119,5 @@ export const startPlatform = async ({
     setImmediate(() => unchainedAPI.modules.filters.invalidateCache({}, unchainedAPI));
   }
 
-  return { unchainedAPI, apolloGraphQLServer };
+  return { unchainedAPI, yogaServer, db };
 };

package/lib/context/withAccessToken.d.ts

@@ -1,4 +0,0 @@
-import { Context } from '@unchainedshop/types/api.js';
-declare const _default: (fn?: (context: Context) => any) => any;
-export default _default;
-//# sourceMappingURL=withAccessToken.d.ts.map

package/lib/context/withAccessToken.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"withAccessToken.d.ts","sourceRoot":"","sources":["../../src/context/withAccessToken.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;8BAOlC,CAAC,OAAO,EAAE,OAAO,KAAK,GAAG,KAAqB,GAAG;AAArE,wBA+BE"}

package/lib/context/withAccessToken.js

@@ -1,37 +0,0 @@
-import { createLogger } from '@unchainedshop/logger';
-import { timingSafeEqual } from 'crypto';
-const logger = createLogger('unchained:platform');
-const contextIdentity = (params) => params;
-export default (fn = contextIdentity) => {
-    return async (params, unchainedContextFn) => {
-        const unchainedContext = await unchainedContextFn(params);
-        const newContext = {
-            userId: unchainedContext.userId,
-            user: unchainedContext.user,
-        };
-        if (!unchainedContext.userId && params.req.headers.authorization) {
-            const [type, userToken] = params.req.headers.authorization.split(' ');
-            if (type === 'Bearer' && userToken) {
-                const [username, secret] = userToken.split(':');
-                const user = await unchainedContext.modules.users.findUser({
-                    username,
-                });
-                if (secret && user?.services.token?.secret) {
-                    if (timingSafeEqual(Buffer.from(secret), Buffer.from(user?.services.token?.secret))) {
-                        newContext.userId = user._id;
-                        newContext.user = user;
-                        logger.debug('Token login success');
-                    }
-                    else {
-                        logger.warn('Token login failed');
-                    }
-                }
-            }
-        }
-        return fn({
-            ...unchainedContext,
-            ...newContext,
-        });
-    };
-};
-//# sourceMappingURL=withAccessToken.js.map

package/lib/context/withAccessToken.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"withAccessToken.js","sourceRoot":"","sources":["../../src/context/withAccessToken.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAEzC,MAAM,MAAM,GAAG,YAAY,CAAC,oBAAoB,CAAC,CAAC;AAElD,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC;AAE3C,eAAe,CAAC,KAAgC,eAAe,EAAO,EAAE;IACtE,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,EAAE;QAC1C,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC1D,MAAM,UAAU,GAAG;YACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,IAAI,EAAE,gBAAgB,CAAC,IAAI;SAC5B,CAAC;QACF,IAAI,CAAC,gBAAgB,CAAC,MAAM,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACjE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtE,IAAI,IAAI,KAAK,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACnC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChD,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC;oBACzD,QAAQ;iBACT,CAAC,CAAC;gBAEH,IAAI,MAAM,IAAI,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;oBAC3C,IAAI,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;wBACpF,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;wBAC7B,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC;wBACvB,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;oBACtC,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;oBACpC,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC;YACR,GAAG,gBAAgB;YACnB,GAAG,UAAU;SACd,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC"}

package/src/context/withAccessToken.ts

@@ -1,40 +0,0 @@
-import { createLogger } from '@unchainedshop/logger';
-import { Context } from '@unchainedshop/types/api.js';
-import { timingSafeEqual } from 'crypto';
-
-const logger = createLogger('unchained:platform');
-
-const contextIdentity = (params) => params;
-
-export default (fn: (context: Context) => any = contextIdentity): any => {
-  return async (params, unchainedContextFn) => {
-    const unchainedContext = await unchainedContextFn(params);
-    const newContext = {
-      userId: unchainedContext.userId,
-      user: unchainedContext.user,
-    };
-    if (!unchainedContext.userId && params.req.headers.authorization) {
-      const [type, userToken] = params.req.headers.authorization.split(' ');
-      if (type === 'Bearer' && userToken) {
-        const [username, secret] = userToken.split(':');
-        const user = await unchainedContext.modules.users.findUser({
-          username,
-        });
-
-        if (secret && user?.services.token?.secret) {
-          if (timingSafeEqual(Buffer.from(secret), Buffer.from(user?.services.token?.secret))) {
-            newContext.userId = user._id;
-            newContext.user = user;
-            logger.debug('Token login success');
-          } else {
-            logger.warn('Token login failed');
-          }
-        }
-      }
-    }
-    return fn({
-      ...unchainedContext,
-      ...newContext,
-    });
-  };
-};