@unchainedshop/api 2.0.0-beta7 → 2.0.0-beta8

package/lib/api-index.d.ts

@@ -1,14 +1,11 @@
 import { UnchainedServerOptions } from '@unchainedshop/types/api';
 import type { ApolloServer } from '@apollo/server';
-import { createContextResolver, getCurrentContextResolver, setCurrentContextResolver } from './context';
+import { createContextResolver, setCurrentContextResolver, getCurrentContextResolver } from './context';
 export * from './context';
 export * as acl from './acl';
 export * as errors from './errors';
+export * as express from './express';
 export { hashPassword } from './hashPassword';
 export * as roles from './roles';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
-export declare const startAPIServer: (options: UnchainedServerOptions) => Promise<{
-    apolloGraphQLServer: ApolloServer;
-    bulkImportServer: any;
-    ercMetadataServer: any;
-}>;
+export declare const startAPIServer: (options: UnchainedServerOptions) => Promise<ApolloServer>;

package/lib/api-index.js

@@ -1,12 +1,11 @@
 import fs from 'fs';
 import path from 'path';
-import createBulkImportServer from './createBulkImportServer';
 import createGraphQLServer from './createGraphQLServer';
-import { createContextResolver, getCurrentContextResolver, setCurrentContextResolver } from './context';
-import createERCMetadataServer from './createERCMetadataServer';
+import { createContextResolver, setCurrentContextResolver, getCurrentContextResolver } from './context';
 export * from './context';
 export * as acl from './acl';
 export * as errors from './errors';
+export * as express from './express';
 export { hashPassword } from './hashPassword';
 export * as roles from './roles';
 export { createContextResolver, getCurrentContextResolver, setCurrentContextResolver };
@@ -28,20 +27,13 @@ const loadJSON = (filename) => {
 const packageJson = loadJSON('../package.json');
 const UNCHAINED_API_VERSION = process.env.UNCHAINED_API_VERSION || packageJson?.version || '1.2.x';
 export const startAPIServer = async (options) => {
-    const { unchainedAPI, roles, expressApp, context: customContext, ...apolloServerOptions } = options || {};
+    const { unchainedAPI, roles, context: customContext, ...apolloServerOptions } = options || {};
     const contextResolver = createContextResolver(unchainedAPI, roles, UNCHAINED_API_VERSION);
     setCurrentContextResolver(customContext
         ? ({ req, res }) => {
             return customContext({ req, res }, contextResolver);
         }
         : contextResolver);
-    const apolloGraphQLServer = await createGraphQLServer(expressApp, apolloServerOptions);
-    const bulkImportServer = createBulkImportServer(expressApp);
-    const ercMetadataServer = createERCMetadataServer(expressApp);
-    return {
-        apolloGraphQLServer,
-        bulkImportServer,
-        ercMetadataServer,
-    };
+    return createGraphQLServer(apolloServerOptions);
 };
 //# sourceMappingURL=api-index.js.map

package/lib/api-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../src/api-index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACxG,OAAO,uBAAuB,MAAM,2BAA2B,CAAC;AAEhE,cAAc,WAAW,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEvF,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,EAAE;IAC5B,IAAI;QACF,MAAM,IAAI,GAAG,OAAO,UAAU,KAAK,WAAW,IAAI,UAAU,CAAC;QAC7D,IAAI,CAAC,IAAI;YACP,OAAO;gBACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACzC,CAAC;QACJ,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AACF,MAAM,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAEhD,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,EAAE,OAAO,IAAI,OAAO,CAAC;AAEnG,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,OAA+B,EAK9B,EAAE;IACH,MAAM,EACJ,YAAY,EACZ,KAAK,EACL,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,eAAe,GAAG,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAE1F,yBAAyB,CACvB,aAAa;QACX,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;YACf,OAAO,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;QACtD,CAAC;QACH,CAAC,CAAC,eAAe,CACpB,CAAC;IAEF,MAAM,mBAAmB,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;IACvF,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,UAAU,CAAC,CAAC;IAE9D,OAAO;QACL,mBAAmB;QACnB,gBAAgB;QAChB,iBAAiB;KAClB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"api-index.js","sourceRoot":"","sources":["../src/api-index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAExG,cAAc,WAAW,CAAC;AAC1B,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAC7B,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,yBAAyB,EAAE,CAAC;AAEvF,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,EAAE;IAC5B,IAAI;QACF,MAAM,IAAI,GAAG,OAAO,UAAU,KAAK,WAAW,IAAI,UAAU,CAAC;QAC7D,IAAI,CAAC,IAAI;YACP,OAAO;gBACL,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;aACzC,CAAC;QACJ,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AACF,MAAM,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAEhD,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,WAAW,EAAE,OAAO,IAAI,OAAO,CAAC;AAEnG,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAA+B,EAAyB,EAAE;IAC7F,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,mBAAmB,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAE9F,MAAM,eAAe,GAAG,qBAAqB,CAAC,YAAY,EAAE,KAAK,EAAE,qBAAqB,CAAC,CAAC;IAE1F,yBAAyB,CACvB,aAAa;QACX,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE;YACf,OAAO,aAAa,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC;QACtD,CAAC;QACH,CAAC,CAAC,eAAe,CACpB,CAAC;IAEF,OAAO,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;AAClD,CAAC,CAAC"}

package/lib/context.d.ts

@@ -3,4 +3,3 @@ import { UnchainedCore } from '@unchainedshop/types/core';
 export declare const getCurrentContextResolver: () => UnchainedContextResolver;
 export declare const setCurrentContextResolver: (newContext: UnchainedContextResolver) => void;
 export declare const createContextResolver: (unchainedAPI: UnchainedCore, roles: any, version: string) => UnchainedContextResolver;
-export declare const useMiddlewareWithCurrentContext: (expressApp: any, path: any, ...middleware: any[]) => void;

package/lib/context.js

@@ -22,16 +22,4 @@ export const createContextResolver = (unchainedAPI, roles, version) => async ({
         version,
     };
 };
-export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
-    const addContext = async function middlewareWithContext(req, res, next) {
-        try {
-            req.unchainedContext = await context({ req, res });
-            next();
-        }
-        catch (error) {
-            next(error);
-        }
-    };
-    expressApp.use(path, addContext, ...middleware);
-};
 //# sourceMappingURL=context.js.map

package/lib/context.js.map

@@ -1 +1 @@
-{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,IAAI,OAAO,CAAC;AAEZ,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAA6B,EAAE,CAAC,OAAO,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,UAAoC,EAAE,EAAE;IAChF,OAAO,GAAG,UAAU,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAChC,CAAC,YAA2B,EAAE,KAAU,EAAE,OAAe,EAA4B,EAAE,CACvF,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,EAAE,EAAE,EAAE;IACvC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAErE,OAAO;QACL,GAAG;QACH,GAAG;QACH,GAAG,aAAa;QAChB,GAAG,YAAY;QACf,GAAG,WAAW;QACd,GAAG,aAAa;QAChB,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE;IACjF,MAAM,UAAU,GAAG,KAAK,UAAU,qBAAqB,CACrD,GAA2D,EAC3D,GAAoB,EACpB,IAAI;QAEJ,IAAI;YACF,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;AAClD,CAAC,CAAC"}
+{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAEA,OAAO,kBAAkB,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,IAAI,OAAO,CAAC;AAEZ,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAA6B,EAAE,CAAC,OAAO,CAAC;AAEjF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,UAAoC,EAAE,EAAE;IAChF,OAAO,GAAG,UAAU,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAChC,CAAC,YAA2B,EAAE,KAAU,EAAE,OAAe,EAA4B,EAAE,CACvF,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,EAAE,EAAE,EAAE;IACvC,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,CAAC;IAErE,OAAO;QACL,GAAG;QACH,GAAG;QACH,GAAG,aAAa;QAChB,GAAG,YAAY;QACf,GAAG,WAAW;QACd,GAAG,aAAa;QAChB,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC"}

package/lib/createGraphQLServer.d.ts

@@ -1,3 +1,3 @@
 import { ApolloServer } from '@apollo/server';
-declare const _default: (expressApp: any, options: any) => Promise<ApolloServer<import("@apollo/server").BaseContext>>;
+declare const _default: (options: any) => Promise<ApolloServer<import("@apollo/server").BaseContext>>;
 export default _default;

package/lib/createGraphQLServer.js

@@ -1,13 +1,8 @@
 import { ApolloServer } from '@apollo/server';
-import { expressMiddleware } from '@apollo/server/express4';
 import { GraphQLError } from 'graphql';
-import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.mjs';
 import { log, LogLevel } from '@unchainedshop/logger';
-import cors from 'cors';
-import bodyParser from 'body-parser';
 import typeDefs from './schema';
 import resolvers from './resolvers';
-import { getCurrentContextResolver } from './context';
 const { APOLLO_ENGINE_KEY } = process.env;
 const logGraphQLServerError = (error) => {
     try {
@@ -21,10 +16,8 @@ const logGraphQLServerError = (error) => {
     }
     catch (e) { } // eslint-disable-line
 };
-export default async (expressApp, options) => {
-    const { corsOrigins = null, // no cookie handling
-    typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], engine = {}, ...apolloServerOptions } = options || {};
-    const context = getCurrentContextResolver();
+export default async (options) => {
+    const { typeDefs: additionalTypeDefs = [], resolvers: additionalResolvers = [], engine = {}, ...apolloServerOptions } = options || {};
     const server = new ApolloServer({
         typeDefs: [...typeDefs, ...additionalTypeDefs],
         resolvers: [resolvers, ...additionalResolvers],
@@ -53,30 +46,6 @@ export default async (expressApp, options) => {
         ...apolloServerOptions,
     });
     await server.start();
-    const originFn = corsOrigins && Array.isArray(corsOrigins)
-        ? (origin, callback) => {
-            if (corsOrigins.length === 0 || !origin) {
-                callback(null, true);
-                return;
-            }
-            if (corsOrigins.indexOf(origin) !== -1) {
-                callback(null, true);
-            }
-            else {
-                callback(new Error('Not allowed by CORS'));
-            }
-        }
-        : corsOrigins;
-    expressApp.use('/graphql', cors(!originFn
-        ? undefined
-        : {
-            origin: originFn,
-            credentials: true,
-        }), bodyParser.json(), graphqlUploadExpress(), expressMiddleware(server, {
-        context,
-    }));
-    // expressApp.use(handleUploads({ maxFileSize: 10000000, maxFiles: 10 }));
-    // expressApp.use(middleware);
     return server;
 };
 //# sourceMappingURL=createGraphQLServer.js.map

package/lib/createGraphQLServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"createGraphQLServer.js","sourceRoot":"","sources":["../src/createGraphQLServer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createGraphQLServer.js","sourceRoot":"","sources":["../src/createGraphQLServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE1C,MAAM,qBAAqB,GAAG,CAAC,KAAK,EAAE,EAAE;IACtC,IAAI;QACF,MAAM,EACJ,OAAO,EACP,UAAU,EAAE,EACV,SAAS,EAAE,EAAE,UAAU,EAAE,GAAG,UAAU,EAAE,EACxC,GAAG,UAAU,EACd,EACD,GAAG,IAAI,EACR,GAAG,KAAK,CAAC;QACV,GAAG,CAAC,GAAG,OAAO,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,EAAE;YACjD,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,UAAU;YACb,GAAG,IAAI;SACR,CAAC,CAAC;QACH,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,sBAAsB;KAC9D;IAAC,OAAO,CAAC,EAAE,GAAE,CAAC,sBAAsB;AACvC,CAAC,CAAC;AAEF,eAAe,KAAK,EAAE,OAAO,EAAE,EAAE;IAC/B,MAAM,EACJ,QAAQ,EAAE,kBAAkB,GAAG,EAAE,EACjC,SAAS,EAAE,mBAAmB,GAAG,EAAE,EACnC,MAAM,GAAG,EAAE,EACX,GAAG,mBAAmB,EACvB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,QAAQ,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,kBAAkB,CAAC;QAC9C,SAAS,EAAE,CAAC,SAAS,EAAE,GAAG,mBAAmB,CAAC;QAC9C,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;YACrB,qBAAqB,CAAC,KAAK,CAAC,CAAC;YAC7B,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE,sBAAsB;cACvE,GAAG,KAAK,CAAC;YACV,MAAM,WAAW,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE;gBAC5C,UAAU,EAAE;oBACV,IAAI;oBACJ,GAAG,UAAU;iBACd;aACF,CAAC,CAAC;YACH,2BAA2B;YAC3B,aAAa;YACb,WAAW,CAAC,IAAI,GAAG,IAAI,CAAC;YACxB,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,MAAM,EAAE,iBAAiB;YACvB,CAAC,CAAC;gBACE,GAAG,EAAE,iBAAiB;gBACtB,gBAAgB,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;gBACpF,GAAG,MAAM;aACV;YACH,CAAC,CAAC,SAAS;QACb,GAAG,mBAAmB;KACvB,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IAErB,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/express/createApolloMiddleware.d.ts

@@ -0,0 +1,4 @@
+export default function createApolloMiddleware(contextResolver: any, { apolloGraphQLServer, corsOrigins }: {
+    apolloGraphQLServer: any;
+    corsOrigins?: any;
+}): any[];

package/lib/express/createApolloMiddleware.js

@@ -0,0 +1,34 @@
+import cors from 'cors';
+import { expressMiddleware } from '@apollo/server/express4';
+import graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.mjs';
+import e from 'express';
+export default function createApolloMiddleware(contextResolver, { apolloGraphQLServer, corsOrigins = undefined }) {
+    const originFn = corsOrigins && Array.isArray(corsOrigins)
+        ? (origin, callback) => {
+            if (corsOrigins.length === 0 || !origin) {
+                callback(null, true);
+                return;
+            }
+            if (corsOrigins.indexOf(origin) !== -1) {
+                callback(null, true);
+            }
+            else {
+                callback(new Error('Not allowed by CORS'));
+            }
+        }
+        : corsOrigins;
+    return [
+        cors(!originFn
+            ? undefined
+            : {
+                origin: originFn,
+                credentials: true,
+            }),
+        e.json(),
+        graphqlUploadExpress({ maxFileSize: 10000000, maxFiles: 10 }),
+        expressMiddleware(apolloGraphQLServer, {
+            context: contextResolver,
+        }),
+    ];
+}
+//# sourceMappingURL=createApolloMiddleware.js.map

package/lib/express/createApolloMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createApolloMiddleware.js","sourceRoot":"","sources":["../../src/express/createApolloMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,oBAAoB,MAAM,yCAAyC,CAAC;AAC3E,OAAO,CAAC,MAAM,SAAS,CAAC;AAExB,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAC5C,eAAe,EACf,EAAE,mBAAmB,EAAE,WAAW,GAAG,SAAS,EAAE;IAEhD,MAAM,QAAQ,GACZ,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;QACvC,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;YACnB,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE;gBACvC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrB,OAAO;aACR;YACD,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;gBACtC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aACtB;iBAAM;gBACL,QAAQ,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;aAC5C;QACH,CAAC;QACH,CAAC,CAAC,WAAW,CAAC;IAElB,OAAO;QACL,IAAI,CACF,CAAC,QAAQ;YACP,CAAC,CAAC,SAAS;YACX,CAAC,CAAC;gBACE,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,IAAI;aAClB,CACN;QACD,CAAC,CAAC,IAAI,EAAE;QACR,oBAAoB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC7D,iBAAiB,CAAC,mBAAmB,EAAE;YACrC,OAAO,EAAE,eAAe;SACzB,CAAC;KACH,CAAC;AACJ,CAAC"}

package/lib/express/createBulkImportMiddleware.d.ts

@@ -0,0 +1,2 @@
+import { UnchainedContextResolver } from '@unchainedshop/types/api';
+export default function bulkImportMiddleware(contextResolver: UnchainedContextResolver): (req: any, res: any) => Promise<void>;

package/lib/express/createBulkImportMiddleware.js

@@ -0,0 +1,79 @@
+import { createLogger } from '@unchainedshop/logger';
+import fs from 'fs';
+import { checkAction } from '../acl';
+import { actions } from '../roles';
+const logger = createLogger('unchained:bulk-import');
+const { BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
+const errorHandler = (res) => (e) => {
+    logger.error(e.message);
+    res.writeHead(503);
+    res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+};
+const methodWrongHandler = (res) => () => {
+    logger.error('Method not supported, return 404');
+    res.writeHead(404);
+    res.end();
+};
+const createWriteStreamToFilesystem = (cacheDirectory) => {
+    const date = new Date().toISOString();
+    const payloadFilePath = `${cacheDirectory}/${date}.json`;
+    const stream = fs.createWriteStream(payloadFilePath, { flags: 'a' });
+    return stream;
+};
+const createWriteStreamToMongoDB = (BulkImportPayloads) => {
+    const date = new Date().toISOString();
+    const stream = BulkImportPayloads.openUploadStreamWithId(date, `${date}.json`, {
+        contentType: 'application/json',
+    });
+    return stream;
+};
+export default function bulkImportMiddleware(contextResolver) {
+    return async (req, res) => {
+        try {
+            if (req.method !== 'POST') {
+                methodWrongHandler(res)();
+                return;
+            }
+            const context = await contextResolver({ req, res });
+            await checkAction(context, actions.bulkImport);
+            const input = {
+                createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
+                skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
+                fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
+                remoteAddress: context.remoteAddress,
+            };
+            const stream = input.fsPayloadCacheDirectory
+                ? createWriteStreamToFilesystem(input.fsPayloadCacheDirectory)
+                : createWriteStreamToMongoDB(context.bulkImporter.BulkImportPayloads);
+            req
+                .pipe(stream)
+                .on('error', errorHandler(res))
+                .on('finish', async (file) => {
+                try {
+                    if (input.fsPayloadCacheDirectory) {
+                        input.payloadFilePath = stream.path;
+                    }
+                    else {
+                        input.payloadId = file._id;
+                        input.payloadSize = file.length;
+                    }
+                    const work = await context.modules.worker.addWork({
+                        type: 'BULK_IMPORT',
+                        input: Object.fromEntries(Object.entries(input).filter(([, value]) => Boolean(value))),
+                        retries: 0,
+                        priority: 10,
+                    }, context.userId);
+                    res.writeHead(200);
+                    res.end(JSON.stringify(work));
+                }
+                catch (e) {
+                    errorHandler(res)(e);
+                }
+            });
+        }
+        catch (e) {
+            errorHandler(res)(e);
+        }
+    };
+}
+//# sourceMappingURL=createBulkImportMiddleware.js.map

package/lib/express/createBulkImportMiddleware.js.map

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

package/lib/express/createERCMetadataMiddleware.d.ts

@@ -0,0 +1,3 @@
+import { UnchainedContextResolver } from '@unchainedshop/types/api';
+import { IncomingMessage } from 'http';
+export default function ercMetadataMiddleware(contextResolver: UnchainedContextResolver): (req: IncomingMessage, res: any) => Promise<void>;

package/lib/express/createERCMetadataMiddleware.js

@@ -0,0 +1,56 @@
+import { createLogger } from '@unchainedshop/logger';
+import { systemLocale } from '@unchainedshop/utils';
+import localePkg from 'locale';
+import path from 'path';
+const { Locale } = localePkg;
+const logger = createLogger('unchained:erc-metadata');
+const errorHandler = (res) => (e) => {
+    logger.error(e.message);
+    res.writeHead(503);
+    res.end(JSON.stringify({ name: e.name, code: e.code, message: e.message }));
+};
+const methodWrongHandler = (res) => () => {
+    logger.error('Method not supported, return 404');
+    res.writeHead(404);
+    res.end();
+};
+export default function ercMetadataMiddleware(contextResolver) {
+    return async (req, res) => {
+        try {
+            if (req.method !== 'GET') {
+                methodWrongHandler(res)();
+                return;
+            }
+            const context = await contextResolver({ req, res });
+            const url = new URL(req.url, process.env.ROOT_URL);
+            const parsedPath = path.parse(url.pathname);
+            if (parsedPath.ext !== '.json')
+                throw new Error('Invalid ERC Metadata URI');
+            const [, productId, localeOrTokenFilename, tokenFileName] = url.pathname.split('/');
+            const locale = tokenFileName ? localeOrTokenFilename : systemLocale.language;
+            const chainTokenId = parsedPath.name;
+            const product = await context.modules.products.findProduct({
+                productId,
+            });
+            const [token] = await context.modules.warehousing.findTokens({
+                chainTokenId,
+                contractAddress: product?.tokenization?.contractAddress,
+            });
+            const ercMetadata = await context.modules.warehousing.tokenMetadata(chainTokenId, {
+                token,
+                product,
+                referenceDate: new Date(),
+            }, { ...context, localeContext: new Locale(locale) });
+            const body = JSON.stringify(ercMetadata);
+            res.writeHead(200, {
+                'Content-Length': Buffer.byteLength(body),
+                'Content-Type': 'text/plain',
+            });
+            res.end(body);
+        }
+        catch (e) {
+            errorHandler(res)(e);
+        }
+    };
+}
+//# sourceMappingURL=createERCMetadataMiddleware.js.map

package/lib/express/createERCMetadataMiddleware.js.map

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

package/lib/express/createSingleSignOnMiddleware.d.ts

@@ -0,0 +1,6 @@
+/// <reference lib="dom" />
+import { UnchainedContextResolver } from '@unchainedshop/types/api';
+import { IncomingMessage } from 'http';
+export default function singleSignOnMiddleware(contextResolver: UnchainedContextResolver): (req: IncomingMessage & {
+    query?: any;
+}, res: any, next: any) => Promise<void>;

package/lib/express/createSingleSignOnMiddleware.js

@@ -0,0 +1,71 @@
+/// <reference lib="dom" />
+import { createLogger } from '@unchainedshop/logger';
+import cookie from 'cookie';
+const { ROOT_URL, NODE_ENV, UNCHAINED_CLOUD_ENDPOINT } = process.env;
+const logger = createLogger('unchained:unchained-cloud-sso');
+const loginWithSingleSignOn = async (remoteToken, context) => {
+    const domain = process.env.UNCHAINED_COOKIE_DOMAIN || new URL(ROOT_URL).hostname || 'localhost';
+    const result = await fetch(UNCHAINED_CLOUD_ENDPOINT, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/json',
+        },
+        body: JSON.stringify({
+            operationName: 'consume',
+            variables: {
+                token: remoteToken,
+            },
+            query: 'mutation consume($token: ID!) { controlConsumeSingleSignOnToken(token: $token) { domain } }',
+        }),
+    });
+    const json = await result.json();
+    if (json?.errors?.length > 0) {
+        throw new Error(json.errors[0].message);
+    }
+    if (domain === 'localhost' || domain === json?.data?.controlConsumeSingleSignOnToken?.domain) {
+        // create sso user if not exist and login
+        const ssoUserId = (await context.modules.users.findUser({ username: 'sso' }))?._id ||
+            (await context.modules.accounts.createUser({
+                username: 'sso',
+                roles: ['admin'],
+                email: 'sso@unchained.local',
+                password: null,
+                guest: false,
+            }, { skipMessaging: true }));
+        const { tokenExpires, token } = await context.modules.accounts.createLoginToken(ssoUserId, context);
+        const expires = new Date(tokenExpires || new Date().getTime() + 100000);
+        const authCookie = cookie.serialize(process.env.UNCHAINED_COOKIE_NAME, token, {
+            domain,
+            httpOnly: true,
+            expires,
+            path: '/',
+            sameSite: 'strict',
+            secure: NODE_ENV === 'production',
+        });
+        return authCookie;
+    }
+    throw new Error('Invalid token/domain pair');
+};
+export default function singleSignOnMiddleware(contextResolver) {
+    return async (req, res, next) => {
+        try {
+            if (req.query?.token) {
+                const context = await contextResolver({ req, res });
+                const authCookie = await loginWithSingleSignOn(req.query.token, context);
+                if (authCookie) {
+                    res.writeHead(303, {
+                        'Set-Cookie': authCookie,
+                        Location: '/',
+                    });
+                    res.end();
+                    return;
+                }
+            }
+        }
+        catch (e) {
+            logger.error(e.message);
+        }
+        next();
+    };
+}
+//# sourceMappingURL=createSingleSignOnMiddleware.js.map

package/lib/express/createSingleSignOnMiddleware.js.map

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

package/lib/express/index.d.ts

@@ -0,0 +1,6 @@
+import { ApolloServer } from '@apollo/server';
+import type e from 'express';
+export declare const useMiddlewareWithCurrentContext: (expressApp: any, path: any, ...middleware: any[]) => void;
+export declare const connect: (expressApp: e.Express, { apolloGraphQLServer }: {
+    apolloGraphQLServer: ApolloServer;
+}) => void;

package/lib/express/index.js

@@ -0,0 +1,27 @@
+import { getCurrentContextResolver } from '../context';
+import createBulkImportMiddleware from './createBulkImportMiddleware';
+import createERCMetadataMiddleware from './createERCMetadataMiddleware';
+import createApolloMiddleware from './createApolloMiddleware';
+import createSingleSignOnMiddleware from './createSingleSignOnMiddleware';
+const { BULK_IMPORT_API_PATH = '/bulk-import', ERC_METADATA_API_PATH = '/erc-metadata', GRAPHQL_API_PATH = '/graphql', } = process.env;
+export const useMiddlewareWithCurrentContext = (expressApp, path, ...middleware) => {
+    const context = getCurrentContextResolver();
+    const addContext = async function middlewareWithContext(req, res, next) {
+        try {
+            req.unchainedContext = await context({ req, res });
+            next();
+        }
+        catch (error) {
+            next(error);
+        }
+    };
+    expressApp.use(path, addContext, ...middleware);
+};
+export const connect = (expressApp, { apolloGraphQLServer }) => {
+    const contextResolver = getCurrentContextResolver();
+    expressApp.use(GRAPHQL_API_PATH, createApolloMiddleware(contextResolver, { apolloGraphQLServer }));
+    expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware(contextResolver));
+    expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware(contextResolver));
+    expressApp.use(['/', '/.well-known/unchained/cloud-sso'], createSingleSignOnMiddleware(contextResolver));
+};
+//# sourceMappingURL=index.js.map

package/lib/express/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,0BAA0B,MAAM,8BAA8B,CAAC;AACtE,OAAO,2BAA2B,MAAM,+BAA+B,CAAC;AACxE,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,4BAA4B,MAAM,gCAAgC,CAAC;AAE1E,MAAM,EACJ,oBAAoB,GAAG,cAAc,EACrC,qBAAqB,GAAG,eAAe,EACvC,gBAAgB,GAAG,UAAU,GAC9B,GAAG,OAAO,CAAC,GAAG,CAAC;AAEhB,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,EAAE;IACjF,MAAM,OAAO,GAAG,yBAAyB,EAAE,CAAC;IAC5C,MAAM,UAAU,GAAG,KAAK,UAAU,qBAAqB,CACrD,GAA0D,EAC1D,GAAoB,EACpB,IAAI;QAEJ,IAAI;YACF,GAAG,CAAC,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC;SACR;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,KAAK,CAAC,CAAC;SACb;IACH,CAAC,CAAC;IAEF,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,UAAqB,EACrB,EAAE,mBAAmB,EAAyC,EAC9D,EAAE;IACF,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;IAEpD,UAAU,CAAC,GAAG,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,eAAe,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC,CAAC;IACnG,UAAU,CAAC,GAAG,CAAC,qBAAqB,EAAE,2BAA2B,CAAC,eAAe,CAAC,CAAC,CAAC;IACpF,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,eAAe,CAAC,CAAC,CAAC;IAClF,UAAU,CAAC,GAAG,CACZ,CAAC,GAAG,EAAE,kCAAkC,CAAC,EACzC,4BAA4B,CAAC,eAAe,CAAC,CAC9C,CAAC;AACJ,CAAC,CAAC"}

package/lib/resolvers/mutations/accounts/changePassword.d.ts

@@ -1,8 +1,6 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function changePassword(root: Root, params: {
-    oldPassword?: string;
     oldPlainPassword?: string;
-    newPassword?: string;
     newPlainPassword?: string;
 }, { modules, userId }: Context): Promise<{
     success: boolean;

package/lib/resolvers/mutations/accounts/changePassword.js

@@ -1,10 +1,10 @@
 import { log } from '@unchainedshop/logger';
 export default async function changePassword(root, params, { modules, userId }) {
     log('mutation changePassword', { userId });
-    if (!params.newPassword && !params.newPlainPassword) {
+    if (!params.newPlainPassword) {
         throw new Error('New password is required');
     }
-    if (!params.oldPassword && !params.oldPlainPassword) {
+    if (!params.oldPlainPassword) {
         throw new Error('Old password is required');
     }
     const success = await modules.accounts.changePassword(userId, params);

package/lib/resolvers/mutations/accounts/changePassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"changePassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAKC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}
+{"version":3,"file":"changePassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/changePassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,MAGC,EACD,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,yBAAyB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IACD,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;IAED,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEtE,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC"}

package/lib/resolvers/mutations/accounts/createUser.js

@@ -3,11 +3,11 @@ import { hashPassword } from '../../../hashPassword';
 export default async function createUser(root, params, context) {
     const { modules, userId } = context;
     log('mutation createUser', { email: params.email, username: params.username, userId });
-    if (!params.password && !params.plainPassword && !params.webAuthnPublicKeyCredentials) {
+    if (!params.plainPassword && !params.webAuthnPublicKeyCredentials) {
         throw new Error('Password or Public Key is required');
     }
     const mappedUser = { ...params };
-    if (!mappedUser.password && mappedUser.plainPassword) {
+    if (mappedUser.plainPassword) {
         mappedUser.password = hashPassword(mappedUser.plainPassword);
     }
     delete mappedUser.plainPassword;

package/lib/resolvers/mutations/accounts/createUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"createUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE;QACrF,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,aAAa,EAAE;QACpD,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KAC9D;IACD,OAAO,UAAU,CAAC,aAAa,CAAC;IAChC,OAAO,UAAU,CAAC,4BAA4B,CAAC;IAE/C,MAAM,eAAe,GACnB,MAAM,CAAC,4BAA4B;QACnC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CACvD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,4BAA4B,CACpC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;QAC9D,sBAAsB,EAAE,CAAC,CAAC,eAAe;KAC1C,CAAC,CAAC;IAEH,IAAI,SAAS,IAAI,eAAe,EAAE;QAChC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,SAAS,EAAE,EAClB;YACE,KAAK,EAAE;gBACL,mBAAmB,EAAE,eAAe;aACrC;SACF,EACD,EAAE,CACH,CAAC;KACH;IAED,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}
+{"version":3,"file":"createUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/createUser.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpC,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvF,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,4BAA4B,EAAE;QACjE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACvD;IAED,MAAM,UAAU,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;IACjC,IAAI,UAAU,CAAC,aAAa,EAAE;QAC5B,UAAU,CAAC,QAAQ,GAAG,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;KAC9D;IACD,OAAO,UAAU,CAAC,aAAa,CAAC;IAChC,OAAO,UAAU,CAAC,4BAA4B,CAAC;IAE/C,MAAM,eAAe,GACnB,MAAM,CAAC,4BAA4B;QACnC,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CACvD,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,4BAA4B,CACpC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,UAAU,EAAE;QAC9D,sBAAsB,EAAE,CAAC,CAAC,eAAe;KAC1C,CAAC,CAAC;IAEH,IAAI,SAAS,IAAI,eAAe,EAAE;QAChC,MAAM,OAAO,CAAC,KAAK,CAAC,UAAU,CAC5B,EAAE,GAAG,EAAE,SAAS,EAAE,EAClB;YACE,KAAK,EAAE;gBACL,mBAAmB,EAAE,eAAe;aACrC;SACF,EACD,EAAE,CACH,CAAC;KACH;IAED,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC/D,CAAC"}

package/lib/resolvers/mutations/accounts/enrollUser.js

@@ -5,7 +5,7 @@ export default async function enrollUser(root, params, context) {
     log('mutation enrollUser', { email: params.email, userId: context.userId });
     const mappedUserData = params;
     mappedUserData.initialPassword = true;
-    if (!mappedUserData.password && mappedUserData.plainPassword) {
+    if (mappedUserData.plainPassword) {
         mappedUserData.password = hashPassword(mappedUserData.plainPassword);
     }
     delete mappedUserData.plainPassword;

package/lib/resolvers/mutations/accounts/enrollUser.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrollUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,MAAM,CAAC;IAC9B,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,IAAI,CAAC,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,aAAa,EAAE;QAC5D,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACtE;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;QAC/D,aAAa,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ;KACzC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}
+{"version":3,"file":"enrollUser.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/enrollUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,UAAU,CAAC,IAAU,EAAE,MAAgB,EAAE,OAAgB;IACrF,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,GAAG,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAE5E,MAAM,cAAc,GAAG,MAAM,CAAC;IAC9B,cAAc,CAAC,eAAe,GAAG,IAAI,CAAC;IACtC,IAAI,cAAc,CAAC,aAAa,EAAE;QAChC,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;KACtE;IACD,OAAO,cAAc,CAAC,aAAa,CAAC;IAEpC,4CAA4C;IAC5C,oDAAoD;IACpD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;QAC/D,aAAa,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ;KACzC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC5C,CAAC"}

package/lib/resolvers/mutations/accounts/loginWithPassword.d.ts

@@ -2,7 +2,6 @@ import { Context, Root } from '@unchainedshop/types/api';
 export default function loginWithPassword(root: Root, params: {
     username?: string;
     email?: string;
-    password?: string;
     plainPassword?: string;
     totpCode?: string;
 }, context: Context): Promise<{

package/lib/resolvers/mutations/accounts/loginWithPassword.js

@@ -2,14 +2,14 @@ import { log } from '@unchainedshop/logger';
 import { hashPassword } from '../../../hashPassword';
 export default async function loginWithPassword(root, params, context) {
     const { modules } = context;
-    const { username, email, password: hashedPassword, plainPassword, totpCode } = params;
+    const { username, email, plainPassword, totpCode } = params;
     log('mutation loginWithPassword', { username, email });
-    if (!hashedPassword && !plainPassword) {
+    if (!plainPassword) {
         throw new Error('Password is required');
     }
     const mappedUserLoginParams = {
         user: email ? { email } : { username },
-        password: hashedPassword || hashPassword(plainPassword),
+        password: hashPassword(plainPassword),
         code: totpCode,
     };
     return modules.accounts.loginWithService({ service: 'password', ...mappedUserLoginParams }, context);

package/lib/resolvers/mutations/accounts/loginWithPassword.js.map

@@ -1 +1 @@
-{"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAMC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEtF,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,cAAc,IAAI,CAAC,aAAa,EAAE;QACrC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,qBAAqB,GAAG;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;QACtC,QAAQ,EAAE,cAAc,IAAI,YAAY,CAAC,aAAa,CAAC;QACvD,IAAI,EAAE,QAAQ;KACf,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,qBAAqB,EAAE,EAAE,OAAO,CAAC,CAAC;AACvG,CAAC"}
+{"version":3,"file":"loginWithPassword.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/accounts/loginWithPassword.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iBAAiB,CAC7C,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAE5D,GAAG,CAAC,4BAA4B,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,MAAM,qBAAqB,GAAG;QAC5B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE;QACtC,QAAQ,EAAE,YAAY,CAAC,aAAa,CAAC;QACrC,IAAI,EAAE,QAAQ;KACf,CAAC;IAEF,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,qBAAqB,EAAE,EAAE,OAAO,CAAC,CAAC;AACvG,CAAC"}