@unchainedshop/api 3.0.0-alpha3 → 3.0.0-alpha4

package/lib/express/index.d.ts

@@ -1,9 +1,9 @@
 import type e from 'express';
-import { YogaServer } from 'graphql-yoga';
+import { YogaServerInstance } from 'graphql-yoga';
 import { mongodb } from '@unchainedshop/mongodb';
 import { UnchainedCore } from '@unchainedshop/core';
 export declare const connect: (expressApp: e.Express, { graphqlHandler, db, unchainedAPI, }: {
-    graphqlHandler: YogaServer<any, any>;
+    graphqlHandler: YogaServerInstance<any, any>;
     db: mongodb.Db;
     unchainedAPI: UnchainedCore;
 }) => void;

package/lib/express/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAM7B,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAuGpD,eAAO,MAAM,OAAO,eACN,CAAC,CAAC,OAAO,yCAKlB;IAAE,cAAc,EAAE,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAE,SAgCzF,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/express/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAM7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAuGpD,eAAO,MAAM,OAAO,eACN,CAAC,CAAC,OAAO,yCAKlB;IAAE,cAAc,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAE,SAgCjG,CAAC"}

package/lib/express/index.js.map

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

package/lib/fastify/index.d.ts

@@ -0,0 +1,9 @@
+import { YogaServerInstance } from 'graphql-yoga';
+import { mongodb } from '@unchainedshop/mongodb';
+import { UnchainedCore } from '@unchainedshop/core';
+export declare const connect: (fastify: any, { graphqlHandler, db, }: {
+    graphqlHandler: YogaServerInstance<any, any>;
+    db: mongodb.Db;
+    unchainedAPI: UnchainedCore;
+}) => void;
+//# sourceMappingURL=index.d.ts.map

package/lib/fastify/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/fastify/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAyEpD,eAAO,MAAM,OAAO,YACT,GAAG,2BAIT;IAAE,cAAc,EAAE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC;IAAC,YAAY,EAAE,aAAa,CAAA;CAAE,SA2CjG,CAAC"}

package/lib/fastify/index.js

@@ -0,0 +1,99 @@
+import { getCurrentContextResolver } from '../context.js';
+// import createBulkImportMiddleware from './createBulkImportMiddleware.js';
+// import createERCMetadataMiddleware from './createERCMetadataMiddleware.js';
+import MongoStore from 'connect-mongo';
+import { emit } from '@unchainedshop/events';
+import { API_EVENTS } from '../events.js';
+import fastifySession from '@fastify/session';
+import fastifyCookie from '@fastify/cookie';
+const resolveUserRemoteAddress = (req) => {
+    const remoteAddress = req.headers['x-real-ip'] ||
+        req.headers['x-forwarded-for'] ||
+        req.socket?.remoteAddress;
+    const remotePort = req.socket?.remotePort;
+    return { remoteAddress, remotePort };
+};
+const { GRAPHQL_API_PATH = '/graphql', UNCHAINED_COOKIE_NAME = 'unchained_token', UNCHAINED_COOKIE_PATH = '/', UNCHAINED_COOKIE_DOMAIN, NODE_ENV, } = process.env;
+const middlewareHook = async function middlewareHook(req, reply) {
+    const setHeader = (key, value) => reply.header(key, value);
+    const getHeader = (key) => req.headers[key];
+    const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+    const context = getCurrentContextResolver();
+    async function login(user) {
+        req.session.user = user;
+        req.session.userId = user._id;
+        const tokenObject = {
+            _id: req.session.sessionId,
+            /* eslint-disable-next-line */
+            tokenExpires: new Date(req.session?.cookie._expires),
+        };
+        await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, { userId: user._id, ...tokenObject });
+        /* eslint-disable-next-line */
+        user._inLoginMethodResponse = true;
+        return { user, ...tokenObject };
+    }
+    async function logout() {
+        /* eslint-disable-line */
+        if (!req.session?.userId)
+            return false;
+        const tokenObject = {
+            _id: req.session.sessionId,
+            userId: req.session?.userId,
+        };
+        req.session.user = null;
+        req.session.userId = null;
+        await emit(API_EVENTS.API_LOGOUT, tokenObject);
+        return true;
+    }
+    req.unchainedContext = await context({
+        setHeader,
+        getHeader,
+        remoteAddress,
+        remotePort,
+        login,
+        logout,
+        user: req.session.user,
+        userId: req.session.userId,
+    });
+};
+export const connect = (fastify, { graphqlHandler, db, }) => {
+    fastify.register(fastifyCookie);
+    fastify.register(fastifySession, {
+        secret: process.env.UNCHAINED_TOKEN_SECRET,
+        cookieName: UNCHAINED_COOKIE_NAME,
+        store: MongoStore.create({
+            client: db.client,
+            dbName: db.databaseName,
+            collectionName: 'sessions',
+        }),
+        cookie: {
+            domain: UNCHAINED_COOKIE_DOMAIN,
+            httpOnly: Boolean(NODE_ENV === 'production'),
+            path: UNCHAINED_COOKIE_PATH,
+            secure: NODE_ENV === 'production',
+            maxAge: 1000 * 60 * 60 * 24 * 7,
+        },
+    });
+    fastify.decorateRequest('unchainedContext');
+    fastify.addHook('onRequest', middlewareHook);
+    fastify.route({
+        url: GRAPHQL_API_PATH,
+        method: ['GET', 'POST', 'OPTIONS'],
+        handler: async (req, reply) => {
+            // Second parameter adds Fastify's `req` and `reply` to the GraphQL Context
+            const response = await graphqlHandler.handleNodeRequestAndResponse(req, reply, {
+                req,
+                reply,
+            });
+            response.headers.forEach((value, key) => {
+                reply.header(key, value);
+            });
+            reply.status(response.status);
+            reply.send(response.body);
+            return reply;
+        },
+    });
+    //   expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware);
+    //   expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware);
+};
+//# sourceMappingURL=index.js.map

package/lib/fastify/index.js.map

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

package/lib/resolvers/index.js

@@ -1,4 +1,4 @@
-import { JSONResolver, TimestampResolver, DateTimeResolver, DateResolver, LocaleResolver, } from 'graphql-scalars';
+import { GraphQLJSON, GraphQLTimestamp, GraphQLDateTimeISO, GraphQLDate, GraphQLLocale, } from 'graphql-scalars';
 import Query from './queries/index.js';
 import Mutation from './mutations/index.js';
 import Types from './type/index.js';
@@ -6,12 +6,12 @@ import CustomScalars from './scalars/index.js';
 export default {
     ...Types,
     ...CustomScalars,
-    JSON: JSONResolver,
+    JSON: GraphQLJSON,
     Query,
     Mutation,
-    DateTime: DateTimeResolver,
-    Date: DateResolver,
-    Timestamp: TimestampResolver,
-    Locale: LocaleResolver,
+    DateTime: GraphQLDateTimeISO,
+    Date: GraphQLDate,
+    Timestamp: GraphQLTimestamp,
+    Locale: GraphQLLocale,
 };
 //# sourceMappingURL=index.js.map

package/lib/resolvers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACZ,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,eAAe;IACb,GAAG,KAAK;IACR,GAAG,aAAa;IAChB,IAAI,EAAE,YAAY;IAClB,KAAK;IACL,QAAQ;IACR,QAAQ,EAAE,gBAAgB;IAC1B,IAAI,EAAE,YAAY;IAClB,SAAS,EAAE,iBAAiB;IAC5B,MAAM,EAAE,cAAc;CACW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/resolvers/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,kBAAkB,EAClB,WAAW,EACX,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,aAAa,MAAM,oBAAoB,CAAC;AAE/C,eAAe;IACb,GAAG,KAAK;IACR,GAAG,aAAa;IAChB,IAAI,EAAE,WAAW;IACjB,KAAK;IACL,QAAQ;IACR,QAAQ,EAAE,kBAAkB;IAC5B,IAAI,EAAE,WAAW;IACjB,SAAS,EAAE,gBAAgB;IAC3B,MAAM,EAAE,aAAa;CACY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "3.0.0-alpha3",
+  "version": "3.0.0-alpha4",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -43,34 +43,37 @@
     "graphql-yoga": "^5.7.0"
   },
   "optionalDependencies": {
+    "@fastify/cookie": "^11.0.1",
+    "@fastify/session": "^11.0.1",
     "connect-mongo": "~5",
-    "cookie-parser": "^1.4.6",
+    "cookie-parser": "^1.4.7",
     "express": "~4",
     "express-session": "~1",
+    "fastify": "^5.0.0",
     "passport": "^0.7.0",
     "passport-strategy": "^1.0.0"
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.3",
-    "@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",
+    "@unchainedshop/core": "^3.0.0-alpha4",
+    "@unchainedshop/events": "^3.0.0-alpha4",
+    "@unchainedshop/logger": "^3.0.0-alpha4",
+    "@unchainedshop/roles": "^3.0.0-alpha4",
+    "@unchainedshop/utils": "^3.0.0-alpha4",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
     "memoizee": "^0.4.17"
   },
   "devDependencies": {
-    "@types/node": "^22.5.5",
+    "@types/node": "^22.7.8",
     "connect-mongo": "^5.1.0",
-    "express": "^4.21.0",
-    "express-session": "^1.18.0",
+    "express": "^4.21.1",
+    "express-session": "^1.18.1",
     "jest": "^29.7.0",
     "passport": "^0.7.0",
     "passport-strategy": "^1.0.0",
     "ts-jest": "^29.2.5",
-    "typescript": "^5.6.2"
+    "typescript": "^5.6.3"
   }
 }

package/src/express/index.ts

@@ -4,7 +4,7 @@ import createBulkImportMiddleware from './createBulkImportMiddleware.js';
 import createERCMetadataMiddleware from './createERCMetadataMiddleware.js';
 import session from 'express-session';
 import MongoStore from 'connect-mongo';
-import { YogaServer } from 'graphql-yoga';
+import { YogaServerInstance } from 'graphql-yoga';
 import setupPassport from './passport/setup.js';
 import { mongodb } from '@unchainedshop/mongodb';
 import { UnchainedCore } from '@unchainedshop/core';
@@ -116,7 +116,7 @@ export const connect = (
     graphqlHandler,
     db,
     unchainedAPI,
-  }: { graphqlHandler: YogaServer<any, any>; db: mongodb.Db; unchainedAPI: UnchainedCore },
+  }: { graphqlHandler: YogaServerInstance<any, any>; db: mongodb.Db; unchainedAPI: UnchainedCore },
 ) => {
   const passport = setupPassport(unchainedAPI);
 

package/src/fastify/index.ts

@@ -0,0 +1,128 @@
+import { getCurrentContextResolver } from '../context.js';
+// import createBulkImportMiddleware from './createBulkImportMiddleware.js';
+// import createERCMetadataMiddleware from './createERCMetadataMiddleware.js';
+import MongoStore from 'connect-mongo';
+import { YogaServerInstance } from 'graphql-yoga';
+import { mongodb } from '@unchainedshop/mongodb';
+import { UnchainedCore } from '@unchainedshop/core';
+import { emit } from '@unchainedshop/events';
+import { API_EVENTS } from '../events.js';
+import { User } from '@unchainedshop/core-users';
+import { IncomingMessage } from 'http';
+import fastifySession from '@fastify/session';
+import fastifyCookie from '@fastify/cookie';
+
+const resolveUserRemoteAddress = (req: IncomingMessage) => {
+  const remoteAddress =
+    (req.headers['x-real-ip'] as string) ||
+    (req.headers['x-forwarded-for'] as string) ||
+    req.socket?.remoteAddress;
+
+  const remotePort = req.socket?.remotePort;
+
+  return { remoteAddress, remotePort };
+};
+
+const {
+  GRAPHQL_API_PATH = '/graphql',
+  UNCHAINED_COOKIE_NAME = 'unchained_token',
+  UNCHAINED_COOKIE_PATH = '/',
+  UNCHAINED_COOKIE_DOMAIN,
+  NODE_ENV,
+} = process.env;
+
+const middlewareHook = async function middlewareHook(req: any, reply: any) {
+  const setHeader = (key, value) => reply.header(key, value);
+  const getHeader = (key) => req.headers[key];
+  const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+
+  const context = getCurrentContextResolver();
+
+  async function login(user: User) {
+    req.session.user = user;
+    req.session.userId = user._id;
+    const tokenObject = {
+      _id: req.session.sessionId,
+      /* eslint-disable-next-line */
+      tokenExpires: new Date((req as any).session?.cookie._expires),
+    };
+    await emit(API_EVENTS.API_LOGIN_TOKEN_CREATED, { userId: user._id, ...tokenObject });
+    /* eslint-disable-next-line */
+    (user as any)._inLoginMethodResponse = true;
+    return { user, ...tokenObject };
+  }
+
+  async function logout() {
+    /* eslint-disable-line */
+    if (!req.session?.userId) return false;
+    const tokenObject = {
+      _id: (req as any).session.sessionId,
+      userId: req.session?.userId,
+    };
+    req.session.user = null;
+    req.session.userId = null;
+    await emit(API_EVENTS.API_LOGOUT, tokenObject);
+    return true;
+  }
+
+  (req as any).unchainedContext = await context({
+    setHeader,
+    getHeader,
+    remoteAddress,
+    remotePort,
+    login,
+    logout,
+    user: req.session.user,
+    userId: req.session.userId,
+  });
+};
+
+export const connect = (
+  fastify: any,
+  {
+    graphqlHandler,
+    db,
+  }: { graphqlHandler: YogaServerInstance<any, any>; db: mongodb.Db; unchainedAPI: UnchainedCore },
+) => {
+  fastify.register(fastifyCookie);
+  fastify.register(fastifySession, {
+    secret: process.env.UNCHAINED_TOKEN_SECRET,
+    cookieName: UNCHAINED_COOKIE_NAME,
+    store: MongoStore.create({
+      client: (db as any).client,
+      dbName: db.databaseName,
+      collectionName: 'sessions',
+    }),
+    cookie: {
+      domain: UNCHAINED_COOKIE_DOMAIN,
+      httpOnly: Boolean(NODE_ENV === 'production'),
+      path: UNCHAINED_COOKIE_PATH,
+      secure: NODE_ENV === 'production',
+      maxAge: 1000 * 60 * 60 * 24 * 7,
+    },
+  });
+
+  fastify.decorateRequest('unchainedContext');
+  fastify.addHook('onRequest', middlewareHook);
+
+  fastify.route({
+    url: GRAPHQL_API_PATH,
+    method: ['GET', 'POST', 'OPTIONS'],
+    handler: async (req, reply) => {
+      // Second parameter adds Fastify's `req` and `reply` to the GraphQL Context
+      const response = await graphqlHandler.handleNodeRequestAndResponse(req, reply, {
+        req,
+        reply,
+      });
+      response.headers.forEach((value, key) => {
+        reply.header(key, value);
+      });
+      reply.status(response.status);
+      reply.send(response.body);
+      return reply;
+    },
+  });
+
+  //   expressApp.use(ERC_METADATA_API_PATH, createERCMetadataMiddleware);
+  //   expressApp.use(BULK_IMPORT_API_PATH, createBulkImportMiddleware);
+};

package/src/resolvers/index.ts

@@ -1,9 +1,9 @@
 import {
-  JSONResolver,
-  TimestampResolver,
-  DateTimeResolver,
-  DateResolver,
-  LocaleResolver,
+  GraphQLJSON,
+  GraphQLTimestamp,
+  GraphQLDateTimeISO,
+  GraphQLDate,
+  GraphQLLocale,
 } from 'graphql-scalars';
 import Query from './queries/index.js';
 import Mutation from './mutations/index.js';
@@ -13,11 +13,11 @@ import CustomScalars from './scalars/index.js';
 export default {
   ...Types,
   ...CustomScalars,
-  JSON: JSONResolver,
+  JSON: GraphQLJSON,
   Query,
   Mutation,
-  DateTime: DateTimeResolver,
-  Date: DateResolver,
-  Timestamp: TimestampResolver,
-  Locale: LocaleResolver,
+  DateTime: GraphQLDateTimeISO,
+  Date: GraphQLDate,
+  Timestamp: GraphQLTimestamp,
+  Locale: GraphQLLocale,
 } as unknown as Record<string, any>;

package/tests/api-index.test.ts

@@ -1,15 +1,14 @@
 // Import the function to be tested.
-import {admin} from '../lib/roles/admin.js'
-import {actions} from '../lib/roles/index.js';
-import {checkAction, ensureActionExists, ensureIsFunction} from '../lib/acl.js'
+import { admin } from '../lib/roles/admin.js';
+import { actions } from '../lib/roles/index.js';
+import { checkAction, ensureActionExists, ensureIsFunction } from '../lib/acl.js';
 import { NoPermissionError, PermissionSystemError } from '../lib/errors.js';
 import { Roles } from '@unchainedshop/roles';
 
 describe('API', () => {
-
   describe('roles', () => {
     const role = {
-      allow: import.meta.jest.fn()
+      allow: import.meta.jest.fn(),
     };
 
     it('creates the admin role and grants permissions to all actions', () => {
@@ -17,15 +16,14 @@ describe('API', () => {
       for (const actionName of Object.keys(actions)) {
         expect(role.allow).toHaveBeenCalledWith(actions[actionName], expect.any(Function));
       }
-    })
-
-  })
+    });
+  });
 
   describe('ensureActionExists', () => {
     it('should throw a PermissionSystemError if the action is undefined', () => {
       expect(() => ensureActionExists(undefined, {})).toThrow(PermissionSystemError);
     });
-    
+
     it('should not throw an error if the action is defined', () => {
       expect(() => ensureActionExists('some action', {})).not.toThrow();
     });
@@ -38,40 +36,44 @@ describe('API', () => {
       const key = 'some key';
       expect(() => ensureIsFunction(null, action, options, key)).toThrow(PermissionSystemError);
     });
-    
+
     it('should not throw an error if the provided value is a function', () => {
       const action = 'some action';
       const options = { showKey: true };
       const key = 'some key';
-      expect(() => ensureIsFunction(() => {}, action, options, key)).not.toThrow();
+      expect(() =>
+        ensureIsFunction(
+          () => {
+            /**/
+          },
+          action,
+          options,
+          key,
+        ),
+      ).not.toThrow();
     });
   });
 
-
   describe('checkAction', () => {
-    
-  it('should throw a NoPermissionError if the user does not have permission to perform the action', async () => {
-    Roles.userHasPermission = import.meta.jest.fn(async () => false);
+    it('should throw a NoPermissionError if the user does not have permission to perform the action', async () => {
+      Roles.userHasPermission = import.meta.jest.fn(async () => false);
+
+      const context = { userId: '123' };
+      const action = 'some action';
+      const args: any = [];
+      const options = { key: 'some key' };
 
-    const context = { userId: '123' };
-    const action = 'some action';
-    const args: any = [];
-    const options = { key: 'some key' };
+      return expect(checkAction(context, action, args, options)).rejects.toThrow(NoPermissionError);
+    });
 
-    await expect(checkAction(context, action, args, options)).rejects.toThrow(NoPermissionError);
-  });
-  
-  it('should not throw an error if the user has permission to perform the action', async () => {
-    Roles.userHasPermission = import.meta.jest.fn(async () => true);
-    const context = { userId: '123' };
-    const action = 'some action';
-    const args: any = {};
-    const options = { key: 'some key' };
+    it('should not throw an error if the user has permission to perform the action', async () => {
+      Roles.userHasPermission = import.meta.jest.fn(async () => true);
+      const context = { userId: '123' };
+      const action = 'some action';
+      const args: any = {};
+      const options = { key: 'some key' };
 
-    await expect(checkAction(context, action, args, options)).resolves.not.toThrow();
+      return expect(checkAction(context, action, args, options)).resolves.not.toThrow();
+    });
   });
 });
-
-
-
-});