@unchainedshop/api 2.14.2 → 3.0.0-alpha3

package/lib/schema/types/shop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shop.d.ts","sourceRoot":"","sources":["../../../src/schema/types/shop.ts"],"names":[],"mappings":";AAAA,wBAuCE"}
+{"version":3,"file":"shop.d.ts","sourceRoot":"","sources":["../../../src/schema/types/shop.ts"],"names":[],"mappings":";AAAA,wBAsCE"}

package/lib/schema/types/shop.js

@@ -33,7 +33,6 @@ export default [
       userRoles: [String!]!
       externalLinks: [Link]!
       adminUiConfig: AdminUiConfig!
-      oAuthProviders: [OAuthProvider!]!
       vapidPublicKey: String
     }
   `,

package/lib/schema/types/shop.js.map

@@ -1 +1 @@
-{"version":3,"file":"shop.js","sourceRoot":"","sources":["../../../src/schema/types/shop.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCb;CACF,CAAC"}
+{"version":3,"file":"shop.js","sourceRoot":"","sources":["../../../src/schema/types/shop.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCb;CACF,CAAC"}

package/lib/schema/types/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/schema/types/user.ts"],"names":[],"mappings":";AAAA,wBAgKE"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/schema/types/user.ts"],"names":[],"mappings":";AAAA,wBA6IE"}

package/lib/schema/types/user.js

@@ -7,14 +7,9 @@ export default [
     """
     type LoginMethodResponse @cacheControl(maxAge: 0, scope: PRIVATE) {
       """
-      Id of the user logged in user
+      Session ID
       """
-      id: String!
-
-      """
-      Token of the connection
-      """
-      token: String!
+      _id: String!
 
       """
       Expiration date for the token
@@ -52,7 +47,7 @@ export default [
       remoteAddress: String
       remotePort: String
       userAgent: String
-      locale: String
+      locale: Locale
       countryCode: String
     }
 
@@ -91,18 +86,6 @@ export default [
       verified: Boolean!
     }
 
-    type OAuthProvider {
-      _id: String!
-      clientId: String!
-      scopes: [String!]!
-    }
-
-    type OAuthAccount {
-      _id: ID!
-      provider: OAuthProvider!
-      authorizationCode: String!
-    }
-
     type User {
       _id: ID!
       created: DateTime!
@@ -110,7 +93,6 @@ export default [
       deleted: DateTime
       username: String
       isGuest: Boolean!
-      isTwoFactorEnabled: Boolean!
       isInitialPassword: Boolean!
       webAuthnCredentials: [WebAuthnCredentials!]!
       web3Addresses: [Web3Address!]!
@@ -153,7 +135,6 @@ export default [
       ): [Enrollment!]!
       allowedActions: [RoleAction!]!
       tokens: [Token!]!
-      oAuthAccounts: [OAuthAccount!]!
       reviews(limit: Int = 10, offset: Int = 0, sort: [SortOptionInput!]): [ProductReview!]!
       reviewsCount: Int!
     }

package/lib/schema/types/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/schema/types/user.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8Jb;CACF,CAAC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../src/schema/types/user.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2Ib;CACF,CAAC"}

package/lib/types.d.ts

@@ -0,0 +1,100 @@
+import type DataLoader from 'dataloader';
+import { UnchainedCore } from '@unchainedshop/core';
+import { User } from '@unchainedshop/core-users';
+import { Product, ProductText } from '@unchainedshop/core-products';
+import { ProductMediaText } from '@unchainedshop/core-products';
+import { Filter, FilterText } from '@unchainedshop/core-filters';
+import { Assortment, AssortmentLink, AssortmentProduct, AssortmentText } from '@unchainedshop/core-assortments';
+import { AssortmentMediaText } from '@unchainedshop/core-assortments';
+import { File } from '@unchainedshop/core-files';
+export type VariationInputText = {
+    locale: string;
+    title: string;
+    subtitle?: string;
+};
+export interface UnchainedUserContext {
+    login: (user: User) => Promise<{
+        _id: string;
+        tokenExpires: Date;
+    }>;
+    logout: () => Promise<boolean>;
+    userId?: string;
+    user?: User;
+    remoteAddress?: string;
+    remotePort?: string;
+    userAgent?: string;
+}
+export interface CustomAdminUiProperties {
+    entityName: string;
+    inlineFragment: string;
+}
+export interface AdminUiConfig {
+    customProperties?: CustomAdminUiProperties[];
+}
+export interface UnchainedLocaleContext {
+    countryContext: string;
+    localeContext: Intl.Locale;
+    currencyContext: string;
+    remoteAddress?: string;
+    remotePort?: string;
+    userAgent?: string;
+}
+export interface UnchainedLoaders {
+    loaders: {
+        productLoader: InstanceType<typeof DataLoader<{
+            productId: string;
+        }, Product>>;
+        productTextLoader: InstanceType<typeof DataLoader<{
+            productId: string;
+            locale: string;
+        }, ProductText>>;
+        productMediaTextLoader: InstanceType<typeof DataLoader<{
+            productMediaId: string;
+            locale: string;
+        }, ProductMediaText>>;
+        fileLoader: InstanceType<typeof DataLoader<{
+            fileId: string;
+        }, File>>;
+        filterLoader: InstanceType<typeof DataLoader<{
+            filterId: string;
+        }, Filter>>;
+        filterTextLoader: InstanceType<typeof DataLoader<{
+            filterId: string;
+            filterOptionValue?: string;
+            locale: string;
+        }, FilterText>>;
+        assortmentLoader: InstanceType<typeof DataLoader<{
+            assortmentId: string;
+        }, Assortment>>;
+        assortmentTextLoader: InstanceType<typeof DataLoader<{
+            assortmentId: string;
+            locale: string;
+        }, AssortmentText>>;
+        assortmentLinkLoader: InstanceType<typeof DataLoader<{
+            parentAssortmentId: string;
+            childAssortmentId: string;
+        }, AssortmentLink>>;
+        assortmentLinksLoader: InstanceType<typeof DataLoader<{
+            parentAssortmentId?: string;
+            assortmentId?: string;
+        }, AssortmentLink[]>>;
+        assortmentProductLoader: InstanceType<typeof DataLoader<{
+            assortmentId: string;
+            productId: string;
+        }, AssortmentProduct>>;
+        assortmentMediaTextLoader: InstanceType<typeof DataLoader<{
+            assortmentMediaId: string;
+            locale: string;
+        }, AssortmentMediaText>>;
+    };
+}
+export type UnchainedHTTPServerContext = {
+    setHeader: (key: string, value: string) => void;
+    getHeader: (key: string) => string | string[];
+};
+export type Context = UnchainedCore & {
+    version?: string;
+    roles?: any;
+    adminUiConfig?: AdminUiConfig;
+} & UnchainedUserContext & UnchainedLocaleContext & UnchainedLoaders & UnchainedHTTPServerContext;
+//# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/lib/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.14.2",
+  "version": "3.0.0-alpha3",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -40,35 +40,37 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@apollo/server": "^4.11.0",
-    "cookie": "~0.6"
+    "graphql-yoga": "^5.7.0"
   },
   "optionalDependencies": {
-    "express": "~4"
+    "connect-mongo": "~5",
+    "cookie-parser": "^1.4.6",
+    "express": "~4",
+    "express-session": "~1",
+    "passport": "^0.7.0",
+    "passport-strategy": "^1.0.0"
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.3",
-    "@unchainedshop/core": "^2.14.2",
-    "@unchainedshop/events": "^2.14.2",
-    "@unchainedshop/logger": "^2.14.2",
-    "@unchainedshop/roles": "^2.14.2",
-    "@unchainedshop/utils": "^2.14.2",
+    "@unchainedshop/core": "^3.0.0-alpha3",
+    "@unchainedshop/events": "^3.0.0-alpha3",
+    "@unchainedshop/logger": "^3.0.0-alpha3",
+    "@unchainedshop/roles": "^3.0.0-alpha3",
+    "@unchainedshop/utils": "^3.0.0-alpha3",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
-    "graphql-upload": "^16.0.2",
-    "locale": "0.1.0",
-    "lodash.isnumber": "3.0.3",
     "memoizee": "^0.4.17"
   },
   "devDependencies": {
-    "@types/graphql-upload": "^16.0.7",
-    "@types/locale": "^0.1.4",
-    "@types/node": "^20.16.5",
-    "@unchainedshop/types": "^2.14.2",
-    "express": "^4.19.2",
+    "@types/node": "^22.5.5",
+    "connect-mongo": "^5.1.0",
+    "express": "^4.21.0",
+    "express-session": "^1.18.0",
     "jest": "^29.7.0",
+    "passport": "^0.7.0",
+    "passport-strategy": "^1.0.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   }
 }

package/src/acl.ts

@@ -1,4 +1,4 @@
-import { CheckPermissionArgs } from '@unchainedshop/types/roles.js';
+import { CheckPermissionArgs } from '@unchainedshop/roles';
 import { Roles } from '@unchainedshop/roles';
 import { NoPermissionError, PermissionSystemError } from './errors.js';
 

package/src/api-index.ts

@@ -1,63 +1,65 @@
-import fs from 'fs';
-import path from 'path';
-import { UnchainedServerOptions } from '@unchainedshop/types/api.js';
-import type { ApolloServer } from '@apollo/server';
-import createGraphQLServer from './createGraphQLServer.js';
+import createGraphQLServer, { GraphQLServerOptions } from './createGraphQLServer.js';
 import {
   createContextResolver,
   setCurrentContextResolver,
   getCurrentContextResolver,
 } from './context.js';
+import { UnchainedCore } from '@unchainedshop/core';
+import { AdminUiConfig } from './types.js';
 
 export * from './context.js';
+export * from './types.js';
 export * as acl from './acl.js';
 export * as errors from './errors.js';
-export * as express from './express/index.js';
-export { hashPassword } from './hashPassword.js';
 export * as roles from './roles/index.js';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
 
-export const loadJSON = (filename) => {
-  try {
-    const base = typeof __filename !== 'undefined' && __filename;
-    if (!base)
-      return {
-        version: process.env.npm_package_version,
-      };
-    const absolutePath = path.resolve(path.dirname(base), filename);
-    const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
-    return data;
-  } catch {
-    return null;
-  }
-};
-const packageJson = loadJSON('../package.json');
+import { buildDefaultTypeDefs } from './schema/index.js';
+import resolvers from './resolvers/index.js';
+import { actions } from './roles/index.js';
 
-const { UNCHAINED_API_VERSION = packageJson?.version || '2.x' } = process.env;
+export type UnchainedServerOptions = {
+  roles?: any;
+  adminUiConfig?: AdminUiConfig;
+  unchainedAPI: UnchainedCore;
+  context?: any;
+  events: Array<string>;
+  workTypes: Array<string>;
+} & GraphQLServerOptions;
 
-export const startAPIServer = async (options: UnchainedServerOptions): Promise<ApolloServer> => {
+export const startAPIServer = async (options: UnchainedServerOptions) => {
   const {
     unchainedAPI,
-    roles,
     context: customContext,
-    adminUiConfig,
-    ...apolloServerOptions
+    roles,
+    adminUiConfig = {},
+    events,
+    workTypes,
+    typeDefs: additionalTypeDefs = [],
+    resolvers: additionalResolvers = [],
+    ...serverOptions
   } = options || {};
 
-  const contextResolver = createContextResolver(
-    unchainedAPI,
-    roles,
-    UNCHAINED_API_VERSION,
-    adminUiConfig,
-  );
+  const contextResolver = createContextResolver(unchainedAPI, { roles, adminUiConfig });
 
   setCurrentContextResolver(
     customContext
-      ? ({ req, res }) => {
-          return customContext({ req, res }, contextResolver);
+      ? (props) => {
+          return customContext(props, contextResolver);
         }
       : contextResolver,
   );
 
-  return createGraphQLServer(apolloServerOptions);
+  return createGraphQLServer({
+    typeDefs: [
+      ...buildDefaultTypeDefs({
+        actions: Object.keys(actions),
+        events,
+        workTypes,
+      }),
+      ...additionalTypeDefs,
+    ],
+    resolvers: [resolvers, ...additionalResolvers],
+    ...serverOptions,
+  });
 };

package/src/context.ts

@@ -1,8 +1,10 @@
-import { UnchainedContextResolver, AdminUiConfig } from '@unchainedshop/types/api.js';
-import { UnchainedCore } from '@unchainedshop/types/core.js';
+import fs from 'fs';
+import path from 'path';
+import { UnchainedCore } from '@unchainedshop/core';
 import instantiateLoaders from './loaders/index.js';
 import { getLocaleContext } from './locale-context.js';
-import { getUserContext } from './user-context.js';
+import { UnchainedServerOptions } from './api-index.js';
+import { Context, UnchainedHTTPServerContext } from './types.js';
 
 let context;
 
@@ -12,28 +14,55 @@ export const setCurrentContextResolver = (newContext: UnchainedContextResolver)
   context = newContext;
 };
 
+export type UnchainedContextResolver = (
+  params: UnchainedHTTPServerContext & {
+    remoteAddress?: string;
+    remotePort?: number;
+    user?: any;
+    userId?: string;
+    login: (user: any) => Promise<{ _id: string; user: any; tokenExpires: Date }>;
+    logout: () => Promise<boolean>;
+  },
+) => Promise<Context>;
+
+export const loadJSON = (filename) => {
+  try {
+    const base = typeof __filename !== 'undefined' && __filename;
+    if (!base)
+      return {
+        version: process.env.npm_package_version,
+      };
+    const absolutePath = path.resolve(path.dirname(base), filename);
+    const data = JSON.parse(fs.readFileSync(absolutePath, 'utf-8'));
+    return data;
+  } catch {
+    return null;
+  }
+};
+
+const packageJson = loadJSON('../package.json');
+
+const { UNCHAINED_API_VERSION = packageJson?.version || '2.x' } = process.env;
+
 export const createContextResolver =
   (
     unchainedAPI: UnchainedCore,
-    roles: any,
-    version: string,
-    adminUiConfig?: AdminUiConfig,
+    unchainedConfig: Pick<UnchainedServerOptions, 'roles' | 'adminUiConfig'>,
   ): UnchainedContextResolver =>
-  async ({ req, res, ...apolloContext }) => {
-    const loaders = await instantiateLoaders(req, res, unchainedAPI);
-    const userContext = await getUserContext(req, res, unchainedAPI);
-    const localeContext = await getLocaleContext(req, res, unchainedAPI);
+  async ({ getHeader, setHeader, remoteAddress, remotePort, user, userId, login, logout }) => {
+    const abstractHttpServerContext = { remoteAddress, remotePort, getHeader, setHeader };
+    const loaders = await instantiateLoaders(unchainedAPI);
+    const localeContext = await getLocaleContext(abstractHttpServerContext, unchainedAPI);
+    const userContext = { user, userId, login, logout };
 
     return {
-      req,
-      res,
-      ...apolloContext,
       ...unchainedAPI,
-      ...userContext,
+      ...unchainedConfig,
       ...localeContext,
+      ...userContext,
       loaders,
-      roles,
-      version,
-      adminUiConfig,
+      version: UNCHAINED_API_VERSION,
+      setHeader,
+      getHeader,
     };
   };

package/src/createGraphQLServer.ts

@@ -1,53 +1,30 @@
-import { ApolloServer } from '@apollo/server';
-import { log, LogLevel } from '@unchainedshop/logger';
-import { GraphQLFormattedError } from 'graphql';
-import { buildDefaultTypeDefs } from './schema/index.js';
-import resolvers from './resolvers/index.js';
-import { actions } from './roles/index.js';
+import { createLogger } from '@unchainedshop/logger';
+import { createYoga, createSchema, YogaServerOptions } from 'graphql-yoga';
 
-const logGraphQLServerError = (error: GraphQLFormattedError) => {
-  try {
-    const {
-      message,
-      extensions: { stacktrace, ...parameters },
-      ...rest
-    } = error;
+const logger = createLogger('unchained:api');
 
-    const nativeError = new Error(message);
-    nativeError.stack = (stacktrace as string[]).join('\n');
-    nativeError.name = parameters.code as string;
-    log(nativeError, {
-      level: LogLevel.Error,
-      ...parameters,
-      ...rest,
-    });
-  } catch (e) {} // eslint-disable-line
+export type GraphQLServerOptions = YogaServerOptions<any, any> & {
+  typeDefs?: Array<string>;
+  resolvers?: Array<Record<string, any>>;
 };
 
-export default async (options) => {
-  const {
-    typeDefs: additionalTypeDefs = [],
-    resolvers: additionalResolvers = [],
-    events = [],
-    workTypes = [],
-    ...apolloServerOptions
-  } = options || {};
+export default async (options: GraphQLServerOptions) => {
+  const { typeDefs, resolvers, schema: customSchema, ...graphQLServerOptions } = options || {};
+
+  const schema =
+    customSchema ||
+    createSchema({
+      typeDefs,
+      resolvers,
+    });
 
-  const server = new ApolloServer({
-    typeDefs: [
-      ...buildDefaultTypeDefs({
-        actions: Object.keys(actions),
-        events,
-        workTypes,
-      }),
-      ...additionalTypeDefs,
-    ],
-    resolvers: [resolvers, ...additionalResolvers],
-    formatError: (error) => {
-      logGraphQLServerError(error);
-      return error;
+  const server = createYoga({
+    schema,
+    logging: logger,
+    context: async (ctx: any) => {
+      return (ctx.req as any)?.unchainedContext;
     },
-    ...apolloServerOptions,
+    ...graphQLServerOptions,
   });
 
   return server;

package/src/errors.ts

@@ -217,12 +217,12 @@ export const CyclicAssortmentLinkNotSupportedError = createError(
 
 export const EmailAlreadyExistsError = createError(
   'EmailAlreadyExists',
-  'Email already exist in the database',
+  'Email already exists or is invalid',
 );
 
 export const UsernameAlreadyExistsError = createError(
   'UsernameAlreadyExists',
-  'Username already exist in the database',
+  'Username already exists or is invalid',
 );
 
 export const UsernameOrEmailRequiredError = createError(
@@ -230,28 +230,27 @@ export const UsernameOrEmailRequiredError = createError(
   'No username or email is provided.',
 );
 
-export const TwoFactorCodeDidNotMatchError = createError(
-  'TwoFactorCodeDidNotMatch',
-  "2FA code didn't match",
+export const PasswordInvalidError = createError(
+  'PasswordInvalidError',
+  'The provided password is invalid, maybe too insecure',
 );
 
-export const TwoFactorCodeRequiredError = createError('TwoFactorCodeRequired', '2FA code required');
-
-export const TwoFactorAlreadySetError = createError('TwoFactorAlreadySet', '2FA already set for user');
-
-export const TwoFactorNotSetError = createError('TwoFactorNotSet', '2FA not set for user');
+export const PasswordOrWebAuthnPublicKeyRequiredError = createError(
+  'PasswordOrWebAuthnPublicKeyRequired',
+  'A password or a WebAuthn public key is required',
+);
 
 export const InvalidCredentialsError = createError('InvalidCredentials', 'Invalid credentials provided');
 
-export const InvalidResetTokenError = createError('InvalidResetTokenError', 'Token validation failed');
-
-export const NoEmailSetError = createError('NoEmailSet', 'User has no email set');
+export const InvalidResetTokenError = createError('InvalidResetTokenError', 'Token invalid or expired');
 
-export const ResetPasswordLinkExpiredError = createError(
-  'ResetPasswordLinkExpired',
-  'Token does not exist or is expired',
+export const InvalidEmailVerificationTokenError = createError(
+  'InvalidEmailVerificationTokenError',
+  'Token invalid or expired',
 );
 
+export const NoEmailSetError = createError('NoEmailSet', 'User has no email set');
+
 export const ResetPasswordLinkUnknownAddressError = createError(
   'ResetPasswordLinkUnknownAddress',
   'Valid token but no email address found for the entry',
@@ -292,11 +291,6 @@ export const ProductLinkedToQuotationError = createError(
   'Product is part of a requested/proposed quotations item, remove it from any requested/proposed quotations item before deleting',
 );
 
-export const ImpersonatingAdminUserError = createError(
-  'ImpersonatingAdminUserError',
-  'Can not impersonate a admin user account',
-);
-
 export const FileNotFoundError = createError('FileNotFoundError', 'File not found');
 
 export const FileUploadExpiredError = createError('FileUploadExpired', 'File upload has expired');

package/src/events.ts

@@ -0,0 +1,8 @@
+import { registerEvents } from '@unchainedshop/events';
+
+export enum API_EVENTS {
+  API_LOGIN_TOKEN_CREATED = 'API_LOGIN_TOKEN_CREATED',
+  API_LOGOUT = 'API_LOGOUT',
+}
+
+registerEvents(Object.keys(API_EVENTS));

package/src/express/createBulkImportMiddleware.ts

@@ -1,7 +1,8 @@
 import { createLogger } from '@unchainedshop/logger';
 import { checkAction } from '../acl.js';
 import { actions } from '../roles/index.js';
-import { getCurrentContextResolver } from '../context.js';
+import { IncomingMessage } from 'http';
+import { Context } from '../types.js';
 
 const logger = createLogger('unchained:bulk-import');
 
@@ -17,15 +18,18 @@ const methodWrongHandler = (res) => () => {
   res.end();
 };
 
-export default async function bulkImportMiddleware(req, res) {
+export default async function bulkImportMiddleware(
+  req: IncomingMessage & { query?: any; unchainedContext: Context },
+  res,
+) {
   try {
+    const context = req.unchainedContext;
+
     if (req.method !== 'POST') {
       methodWrongHandler(res)();
       return;
     }
 
-    const contextResolver = getCurrentContextResolver();
-    const context = await contextResolver({ req, res });
     await checkAction(context, (actions as any).bulkImport);
 
     const input: any = {