@devmoods/express-extras 0.17.4 → 0.17.7

package/bin/migrate

@@ -0,0 +1,5 @@
+#/bin/bash 
+
+set -e
+
+node_modules/.bin/ts-node --esm cli.cjs ${*:1}

package/dist/auth.js

@@ -63,28 +63,27 @@ export function createAuth({ getUserByToken, methods: { emailAndPassword }, filt
             type: 'string',
             minLength: 4,
         };
-        router.post('/reset/:token', validateParams(tokenSchema), validateBody({
-            type: 'object',
-            properties: {
-                password: { type: 'string', minLength: 8 },
-            },
-            required: ['password'],
-        }), route(async (req) => {
-            const { password } = req.body;
-            const { token } = req.params;
-            if (!emailAndPassword) {
-                throw new Error('Not applicable for login method');
-            }
-            const email = await redis.get(token);
-            if (!email) {
-                throw BadRequest('invalid reset token');
-            }
-            const user = await emailAndPassword(email, skipPasswordCheck);
-            await onPasswordChanged?.(user, await hashPassword(password));
-            await redis.del(token);
-            logger.info('user changed password', { email });
-            return 200;
-        }));
+        if (emailAndPassword) {
+            router.post('/reset/:token', validateParams(tokenSchema), validateBody({
+                type: 'object',
+                properties: {
+                    password: { type: 'string', minLength: 8 },
+                },
+                required: ['password'],
+            }), route(async (req) => {
+                const { password } = req.body;
+                const { token } = req.params;
+                const email = await redis.get(token);
+                if (!email) {
+                    throw BadRequest('invalid reset token');
+                }
+                const user = await emailAndPassword(email, skipPasswordCheck);
+                await onPasswordChanged?.(user, await hashPassword(password));
+                await redis.del(token);
+                logger.info('user changed password', { email });
+                return 200;
+            }));
+        }
         router.get('/reset/:token', validateParams(tokenSchema), route(async (req) => {
             const token = req.params.token;
             const email = await redis.get(token);

package/dist/migrate.d.ts

@@ -29,7 +29,7 @@ export declare class Migrator {
     log(...args: any[]): void;
     executeMigration(migrations: Migration[], currentVersion: number, direction: 'up' | 'down'): Promise<number>;
     readMigrationFile(filename: string): Promise<MigrationFileAPI>;
-    migrate(tx: Connection, migrator: MigrationFileAPI, direction: 'up' | 'down'): Promise<void>;
+    migrate(connection: Connection, migrator: MigrationFileAPI, direction: 'up' | 'down'): Promise<void>;
     updateCurrentVersion(connection: Connection, version: number): Promise<import("pg").QueryResult<import("pg").QueryResultRow>>;
     getCurrentVersion(): Promise<number>;
     getMigrations(): Promise<{

package/dist/migrate.js

@@ -161,7 +161,7 @@ export class Migrator {
         const content = await fs.readFile(filename, 'utf-8');
         const [up, down] = content.split('-- ROLLBACK --');
         return {
-            useTransaction: content.includes('-- NO TRANSACTION --'),
+            useTransaction: !content.includes('-- NO TRANSACTION --'),
             up() {
                 return up.trim();
             },
@@ -170,13 +170,13 @@ export class Migrator {
             },
         };
     }
-    async migrate(tx, migrator, direction) {
+    async migrate(connection, migrator, direction) {
         try {
             const queryWithLog = (sql) => {
                 this.log(chalk.yellow(sql.toString()));
-                return tx.query(sql);
+                return connection.query(sql);
             };
-            const returnValue = await migrator[direction](queryWithLog.bind(tx));
+            const returnValue = await migrator[direction](queryWithLog.bind(connection));
             if (typeof returnValue === 'string') {
                 if (returnValue !== '') {
                     await queryWithLog(returnValue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devmoods/express-extras",
-  "version": "0.17.4",
+  "version": "0.17.7",
   "description": "Kubernetes-ready utilities for rapid Node.js application development",
   "type": "module",
   "main": "./dist/index.js",

package/bin/migrate.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env -S node --loader ts-node/esm
-
-import 'dotenv/config';
-
-async function run() {
-  const { cli } = await import('../dist/migrate.js');
-  cli();
-}
-
-run();