npm - @flowerforce/flowerbase - Versions diffs - 1.2.1-beta.2 → 1.2.1-beta.4 - Mend

@flowerforce/flowerbase 1.2.1-beta.2 → 1.2.1-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/auth/providers/local-userpass/controller.d.ts.map +1 -1
package/dist/auth/providers/local-userpass/controller.js +52 -36
package/dist/auth/providers/local-userpass/dtos.d.ts +7 -1
package/dist/auth/providers/local-userpass/dtos.d.ts.map +1 -1
package/dist/auth/utils.d.ts +28 -2
package/dist/auth/utils.d.ts.map +1 -1
package/dist/auth/utils.js +16 -4
package/dist/utils/crypto/index.js +1 -1
package/package.json +1 -1
package/src/auth/providers/local-userpass/controller.ts +80 -52
package/src/auth/providers/local-userpass/dtos.ts +8 -1
package/src/auth/utils.ts +17 -3
package/src/utils/crypto/index.ts +1 -1

package/dist/auth/providers/local-userpass/controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;~~AAuBzC~~;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,eAAe,~~iBAqOjE~~"}
1	+ {"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAyBzC;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,eAAe,iBA+PjE"}

package/dist/auth/providers/local-userpass/controller.js CHANGED Viewed

@@ -32,6 +32,48 @@ function localUserPassController(app) {
         const functionsList = state_1.StateManager.select('functions');
         const { authCollection, userCollection, user_id_field, on_user_creation_function_name } = constants_1.AUTH_CONFIG;
         const db = app.mongo.client.db(constants_1.DB_NAME);
+        const handleResetPasswordRequest = (email, password, extraArguments) => __awaiter(this, void 0, void 0, function* () {
+            const { resetPasswordCollection, resetPasswordConfig } = constants_1.AUTH_CONFIG;
+            const authUser = yield db.collection(authCollection).findOne({
+                email
+            });
+            if (!authUser) {
+                throw new Error(utils_1.AUTH_ERRORS.INVALID_CREDENTIALS);
+            }
+            const token = (0, crypto_1.generateToken)();
+            const tokenId = (0, crypto_1.generateToken)();
+            yield (db === null || db === void 0 ? void 0 : db.collection(resetPasswordCollection).updateOne({ email }, { $set: { token, tokenId, email, createdAt: new Date() } }, { upsert: true }));
+            if (resetPasswordConfig.runResetFunction && resetPasswordConfig.resetFunctionName) {
+                const functionsList = state_1.StateManager.select('functions');
+                const services = state_1.StateManager.select('services');
+                const currentFunction = functionsList[resetPasswordConfig.resetFunctionName];
+                const baseArgs = { token, tokenId, email, password };
+                const args = Array.isArray(extraArguments) ? [baseArgs, ...extraArguments] : [baseArgs];
+                yield (0, context_1.GenerateContext)({
+                    args,
+                    app,
+                    rules: {},
+                    user: {},
+                    currentFunction,
+                    functionsList,
+                    services
+                });
+                return;
+            }
+            try {
+                const { from, subject, mailToken, body } = (0, utils_1.getMailConfig)(resetPasswordConfig, token, tokenId);
+                mail_1.default.setApiKey(mailToken);
+                yield mail_1.default.send({
+                    to: email,
+                    from,
+                    subject,
+                    html: body
+                });
+            }
+            catch (error) {
+                console.log("Error send mail reset:", error);
+            }
+        });
         /**
          * Endpoint for user registration.
          *
@@ -121,48 +163,22 @@ function localUserPassController(app) {
         /**
          * Endpoint for reset password.
          *
-         * @route {POST} /reset/call
+         * @route {POST} /reset/send
          * @param {ResetPasswordDto} req - The request object with th reset request.
          * @returns {Promise<void>}
          */
         app.post(utils_1.AUTH_ENDPOINTS.RESET, {
-            schema: utils_1.RESET_SCHEMA
+            schema: utils_1.RESET_SEND_SCHEMA
         }, function (req) {
             return __awaiter(this, void 0, void 0, function* () {
-                const { resetPasswordCollection, resetPasswordConfig } = constants_1.AUTH_CONFIG;
-                const email = req.body.email;
-                const authUser = yield db.collection(authCollection).findOne({
-                    email
-                });
-                if (!authUser) {
-                    throw new Error(utils_1.AUTH_ERRORS.INVALID_CREDENTIALS);
-                }
-                const token = (0, crypto_1.generateToken)();
-                const tokenId = (0, crypto_1.generateToken)();
-                yield (db === null || db === void 0 ? void 0 : db.collection(resetPasswordCollection).updateOne({ email }, { $set: { token, tokenId, email, createdAt: new Date() } }, { upsert: true }));
-                if (resetPasswordConfig.runResetFunction && resetPasswordConfig.resetFunctionName) {
-                    const functionsList = state_1.StateManager.select('functions');
-                    const services = state_1.StateManager.select('services');
-                    const currentFunction = functionsList[resetPasswordConfig.resetFunctionName];
-                    yield (0, context_1.GenerateContext)({
-                        args: [{ token, tokenId, email }],
-                        app,
-                        rules: {},
-                        user: {},
-                        currentFunction,
-                        functionsList,
-                        services
-                    });
-                    return;
-                }
-                const { from, subject, mailToken, body } = (0, utils_1.getMailConfig)(resetPasswordConfig, token, tokenId);
-                mail_1.default.setApiKey(mailToken);
-                yield mail_1.default.send({
-                    to: email,
-                    from,
-                    subject,
-                    html: body
-                });
+                yield handleResetPasswordRequest(req.body.email);
+            });
+        });
+        app.post(utils_1.AUTH_ENDPOINTS.RESET_CALL, {
+            schema: utils_1.RESET_CALL_SCHEMA
+        }, function (req) {
+            return __awaiter(this, void 0, void 0, function* () {
+                yield handleResetPasswordRequest(req.body.email, req.body.password, req.body.arguments);
             });
         });
         /**

package/dist/auth/providers/local-userpass/dtos.d.ts CHANGED Viewed

@@ -19,10 +19,16 @@ export interface LoginDto {
     Body: LoginUserDto;
     Reply: LoginSuccessDto;
 }
-export interface ResetPasswordDto {
+export interface ResetPasswordSendDto {
+    Body: {
+        email: string;
+    };
+}
+export interface ResetPasswordCallDto {
     Body: {
         email: string;
         password: string;
+        arguments?: unknown[];
     };
 }
 export interface ConfirmResetPasswordDto {

package/dist/auth/providers/local-userpass/dtos.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dtos.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/dtos.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,eAAe,CAAA;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,~~gBAAgB~~;~~IAC/B~~,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,QAAQ,EAAE,MAAM,CAAA;~~KACjB~~,CAAA;CACF;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF"}
1	+ {"version":3,"file":"dtos.d.ts","sourceRoot":"","sources":["../../../../src/auth/providers/local-userpass/dtos.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,eAAe,CAAA;CACtB;AAED,MAAM,WAAW,QAAQ;IACvB,IAAI,EAAE,YAAY,CAAA;IAClB,KAAK,EAAE,eAAe,CAAA;CACvB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;KACd,CAAA;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,QAAQ,EAAE,MAAM,CAAA;QAChB,SAAS,CAAC,EAAE,OAAO,EAAE,CAAA;KACtB,CAAA;CACF;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAA;QACb,OAAO,EAAE,MAAM,CAAA;QACf,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF"}

package/dist/auth/utils.d.ts CHANGED Viewed

@@ -12,7 +12,18 @@ export declare const LOGIN_SCHEMA: {
         required: string[];
     };
 };
-export declare const RESET_SCHEMA: {
+export declare const RESET_SEND_SCHEMA: {
+    body: {
+        type: string;
+        properties: {
+            email: {
+                type: string;
+            };
+        };
+        required: string[];
+    };
+};
+export declare const RESET_CALL_SCHEMA: {
     body: {
         type: string;
         properties: {
@@ -22,6 +33,9 @@ export declare const RESET_SCHEMA: {
             password: {
                 type: string;
             };
+            arguments: {
+                type: string;
+            };
         };
         required: string[];
     };
@@ -43,6 +57,17 @@ export declare const CONFIRM_RESET_SCHEMA: {
         required: string[];
     };
 };
+export declare const RESET_SCHEMA: {
+    body: {
+        type: string;
+        properties: {
+            email: {
+                type: string;
+            };
+        };
+        required: string[];
+    };
+};
 export declare const REGISTRATION_SCHEMA: {
     body: {
         type: string;
@@ -62,7 +87,8 @@ export declare enum AUTH_ENDPOINTS {
     REGISTRATION = "/register",
     PROFILE = "/profile",
     SESSION = "/session",
-    RESET = "/reset/call",
+    RESET = "/reset/send",
+    RESET_CALL = "/reset/call",
     CONFIRM_RESET = "/reset",
     FIRST_USER = "/setup/first-user"
 }

package/dist/auth/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/auth/utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;;;;;;;;;;;;;CASxB,CAAA;AAED,eAAO,MAAM,~~YAAY;;;;;;;;;;;;;CASxB~~,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;CAUhC,CAAA;AAED,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;CAS/B,CAAA;AAED,oBAAY,cAAc;IACxB,KAAK,WAAW;IAChB,YAAY,cAAc;IAC1B,OAAO,aAAa;IACpB,OAAO,aAAa;IACpB,KAAK,gBAAgB;IACrB,aAAa,WAAW;IACxB,UAAU,sBAAsB;CACjC;AAED,oBAAY,WAAW;IACrB,mBAAmB,wBAAwB;IAC3C,aAAa,mCAAmC;IAChD,oBAAoB,sCAAsC;CAC3D;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,aAAa,CAAA;IAC/B,iBAAiB,EAAE,cAAc,CAAA;CAClC;AAED,UAAU,MAAM;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;CAClB;AACD,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE;QACN,kBAAkB,EAAE,MAAM,CAAA;KAC3B,CAAA;CACF;AAED,MAAM,WAAW,MAAM;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,gBAAgB,EAAE,MAAM,CAAA;IACxB,uBAAuB,EAAE,OAAO,CAAA;IAChC,gBAAgB,EAAE,OAAO,CAAA;IACzB,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,8BAA8B,EAAE,MAAM,CAAA;CACvC;AAMD;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAO,UAGjC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAO,oBAGrC,CAAA;AAED,eAAO,MAAM,aAAa,GACxB,qBAAqB,MAAM,EAC3B,OAAO,MAAM,EACb,SAAS,MAAM;;;;;CA2DhB,CAAA;AAMD,eAAO,MAAM,gBAAgB,GAAI,eAAW,WAG3C,CAAA"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/auth/utils.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY;;;;;;;;;;;;;CASxB,CAAA;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;CAQ7B,CAAA;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;CAU7B,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;CAUhC,CAAA;AAED,eAAO,MAAM,YAAY;;;;;;;;;;CAAoB,CAAA;AAE7C,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;CAS/B,CAAA;AAED,oBAAY,cAAc;IACxB,KAAK,WAAW;IAChB,YAAY,cAAc;IAC1B,OAAO,aAAa;IACpB,OAAO,aAAa;IACpB,KAAK,gBAAgB;IACrB,UAAU,gBAAgB;IAC1B,aAAa,WAAW;IACxB,UAAU,sBAAsB;CACjC;AAED,oBAAY,WAAW;IACrB,mBAAmB,wBAAwB;IAC3C,aAAa,mCAAmC;IAChD,oBAAoB,sCAAsC;CAC3D;AAED,MAAM,WAAW,UAAU;IACzB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,SAAS,EAAE,MAAM,CAAA;IACjB,gBAAgB,EAAE,aAAa,CAAA;IAC/B,iBAAiB,EAAE,cAAc,CAAA;CAClC;AAED,UAAU,MAAM;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;CAClB;AACD,UAAU,aAAa;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,OAAO,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,EAAE,iBAAiB,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,MAAM,EAAE;QACN,kBAAkB,EAAE,MAAM,CAAA;KAC3B,CAAA;CACF;AAED,MAAM,WAAW,MAAM;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,iBAAiB,EAAE,MAAM,CAAA;IACzB,gBAAgB,EAAE,MAAM,CAAA;IACxB,uBAAuB,EAAE,OAAO,CAAA;IAChC,gBAAgB,EAAE,OAAO,CAAA;IACzB,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,OAAO,EAAE,MAAM,CAAA;QACf,SAAS,EAAE,MAAM,CAAA;KAClB,CAAA;CACF;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,OAAO,CAAA;IAChB,kBAAkB,EAAE,MAAM,CAAA;IAC1B,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;IACvB,aAAa,EAAE,MAAM,CAAA;IACrB,8BAA8B,EAAE,MAAM,CAAA;CACvC;AAMD;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAO,UAGjC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAO,oBAGrC,CAAA;AAED,eAAO,MAAM,aAAa,GACxB,qBAAqB,MAAM,EAC3B,OAAO,MAAM,EACb,SAAS,MAAM;;;;;CA2DhB,CAAA;AAMD,eAAO,MAAM,gBAAgB,GAAI,eAAW,WAG3C,CAAA"}

package/dist/auth/utils.js CHANGED Viewed

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generatePassword = exports.getMailConfig = exports.loadCustomUserData = exports.loadAuthConfig = exports.AUTH_ERRORS = exports.AUTH_ENDPOINTS = exports.REGISTRATION_SCHEMA = exports.CONFIRM_RESET_SCHEMA = exports.RESET_SCHEMA = exports.LOGIN_SCHEMA = void 0;
+exports.generatePassword = exports.getMailConfig = exports.loadCustomUserData = exports.loadAuthConfig = exports.AUTH_ERRORS = exports.AUTH_ENDPOINTS = exports.REGISTRATION_SCHEMA = exports.RESET_SCHEMA = exports.CONFIRM_RESET_SCHEMA = exports.RESET_CALL_SCHEMA = exports.RESET_SEND_SCHEMA = exports.LOGIN_SCHEMA = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -18,12 +18,22 @@ exports.LOGIN_SCHEMA = {
         required: ['username', 'password']
     }
 };
-exports.RESET_SCHEMA = {
+exports.RESET_SEND_SCHEMA = {
+    body: {
+        type: 'object',
+        properties: {
+            email: { type: 'string' }
+        },
+        required: ['email']
+    }
+};
+exports.RESET_CALL_SCHEMA = {
     body: {
         type: 'object',
         properties: {
             email: { type: 'string' },
-            password: { type: 'string' }
+            password: { type: 'string' },
+            arguments: { type: 'array' }
         },
         required: ['email', 'password']
     }
@@ -39,6 +49,7 @@ exports.CONFIRM_RESET_SCHEMA = {
         required: ['password', 'token', 'tokenId']
     }
 };
+exports.RESET_SCHEMA = exports.RESET_SEND_SCHEMA;
 exports.REGISTRATION_SCHEMA = {
     body: {
         type: 'object',
@@ -55,7 +66,8 @@ var AUTH_ENDPOINTS;
     AUTH_ENDPOINTS["REGISTRATION"] = "/register";
     AUTH_ENDPOINTS["PROFILE"] = "/profile";
     AUTH_ENDPOINTS["SESSION"] = "/session";
-    AUTH_ENDPOINTS["RESET"] = "/reset/call";
+    AUTH_ENDPOINTS["RESET"] = "/reset/send";
+    AUTH_ENDPOINTS["RESET_CALL"] = "/reset/call";
     AUTH_ENDPOINTS["CONFIRM_RESET"] = "/reset";
     AUTH_ENDPOINTS["FIRST_USER"] = "/setup/first-user";
 })(AUTH_ENDPOINTS || (exports.AUTH_ENDPOINTS = AUTH_ENDPOINTS = {}));

package/dist/utils/crypto/index.js CHANGED Viewed

@@ -47,7 +47,7 @@ exports.comparePassword = comparePassword;
  * > Generate a random token
  * @param length -> the token length
  */
-const generateToken = (length = 32) => {
+const generateToken = (length = 64) => {
     return node_crypto_1.default.randomBytes(length).toString('hex');
 };
 exports.generateToken = generateToken;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flowerbase",
-  "version": "1.2.1-beta.2",
+  "version": "1.2.1-beta.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/auth/providers/local-userpass/controller.ts CHANGED Viewed

@@ -14,13 +14,15 @@ import {
   getMailConfig,
   LOGIN_SCHEMA,
   REGISTRATION_SCHEMA,
-  RESET_SCHEMA
+  RESET_CALL_SCHEMA,
+  RESET_SEND_SCHEMA
 } from '../../utils'
 import {
   ConfirmResetPasswordDto,
   LoginDto,
   RegistrationDto,
-  ResetPasswordDto
+  ResetPasswordCallDto,
+  ResetPasswordSendDto
 } from './dtos'
 /**
  * Controller for handling local user registration and login.
@@ -37,6 +39,66 @@ export async function localUserPassController(app: FastifyInstance) {
     on_user_creation_function_name
   } = AUTH_CONFIG
   const db = app.mongo.client.db(DB_NAME)
+  const handleResetPasswordRequest = async (
+    email: string,
+    password?: string,
+    extraArguments?: unknown[]
+  ) => {
+    const { resetPasswordCollection, resetPasswordConfig } = AUTH_CONFIG
+    const authUser = await db.collection(authCollection!).findOne({
+      email
+    })
+    if (!authUser) {
+      throw new Error(AUTH_ERRORS.INVALID_CREDENTIALS)
+    }
+    const token = generateToken()
+    const tokenId = generateToken()
+    await db
+      ?.collection(resetPasswordCollection)
+      .updateOne(
+        { email },
+        { $set: { token, tokenId, email, createdAt: new Date() } },
+        { upsert: true }
+      )
+    if (resetPasswordConfig.runResetFunction && resetPasswordConfig.resetFunctionName) {
+      const functionsList = StateManager.select('functions')
+      const services = StateManager.select('services')
+      const currentFunction = functionsList[resetPasswordConfig.resetFunctionName]
+      const baseArgs = { token, tokenId, email, password }
+      const args = Array.isArray(extraArguments) ? [baseArgs, ...extraArguments] : [baseArgs]
+      await GenerateContext({
+        args,
+        app,
+        rules: {},
+        user: {},
+        currentFunction,
+        functionsList,
+        services
+      })
+      return
+    }
+    try {
+      const { from, subject, mailToken, body } = getMailConfig(
+        resetPasswordConfig,
+        token,
+        tokenId
+      )
+      sendGrid.setApiKey(mailToken)
+      await sendGrid.send({
+        to: email,
+        from,
+        subject,
+        html: body
+      })
+    } catch (error) {
+      console.log("Error send mail reset:", error)
+    }
+  }
   /**
    * Endpoint for user registration.
@@ -158,65 +220,31 @@ export async function localUserPassController(app: FastifyInstance) {
   /**
    * Endpoint for reset password.
    *
-   * @route {POST} /reset/call
+   * @route {POST} /reset/send
    * @param {ResetPasswordDto} req - The request object with th reset request.
    * @returns {Promise<void>}
    */
-  app.post<ResetPasswordDto>(
+  app.post<ResetPasswordSendDto>(
     AUTH_ENDPOINTS.RESET,
     {
-      schema: RESET_SCHEMA
+      schema: RESET_SEND_SCHEMA
     },
     async function (req) {
-      const { resetPasswordCollection, resetPasswordConfig } = AUTH_CONFIG
-      const email = req.body.email
-      const authUser = await db.collection(authCollection!).findOne({
-        email
-      })
-      if (!authUser) {
-        throw new Error(AUTH_ERRORS.INVALID_CREDENTIALS)
-      }
-      const token = generateToken()
-      const tokenId = generateToken()
-      await db
-        ?.collection(resetPasswordCollection)
-        .updateOne(
-          { email },
-          { $set: { token, tokenId, email, createdAt: new Date() } },
-          { upsert: true }
-        )
-      if (resetPasswordConfig.runResetFunction && resetPasswordConfig.resetFunctionName) {
-        const functionsList = StateManager.select('functions')
-        const services = StateManager.select('services')
-        const currentFunction = functionsList[resetPasswordConfig.resetFunctionName]
-        await GenerateContext({
-          args: [{ token, tokenId, email }],
-          app,
-          rules: {},
-          user: {},
-          currentFunction,
-          functionsList,
-          services
-        })
-        return
-      }
+      await handleResetPasswordRequest(req.body.email)
+    }
+  )
-      const { from, subject, mailToken, body } = getMailConfig(
-        resetPasswordConfig,
-        token,
-        tokenId
+  app.post<ResetPasswordCallDto>(
+    AUTH_ENDPOINTS.RESET_CALL,
+    {
+      schema: RESET_CALL_SCHEMA
+    },
+    async function (req) {
+      await handleResetPasswordRequest(
+        req.body.email,
+        req.body.password,
+        req.body.arguments
       )
-      sendGrid.setApiKey(mailToken)
-      await sendGrid.send({
-        to: email,
-        from,
-        subject,
-        html: body
-      })
     }
   )

package/src/auth/providers/local-userpass/dtos.ts CHANGED Viewed

@@ -24,10 +24,17 @@ export interface LoginDto {
   Reply: LoginSuccessDto
 }
-export interface ResetPasswordDto {
+export interface ResetPasswordSendDto {
+  Body: {
+    email: string
+  }
+}
+export interface ResetPasswordCallDto {
   Body: {
     email: string
     password: string
+    arguments?: unknown[]
   }
 }

package/src/auth/utils.ts CHANGED Viewed

@@ -15,12 +15,23 @@ export const LOGIN_SCHEMA = {
   }
 }
-export const RESET_SCHEMA = {
+export const RESET_SEND_SCHEMA = {
+  body: {
+    type: 'object',
+    properties: {
+      email: { type: 'string' }
+    },
+    required: ['email']
+  }
+}
+export const RESET_CALL_SCHEMA = {
   body: {
     type: 'object',
     properties: {
       email: { type: 'string' },
-      password: { type: 'string' }
+      password: { type: 'string' },
+      arguments: { type: 'array' }
     },
     required: ['email', 'password']
   }
@@ -38,6 +49,8 @@ export const CONFIRM_RESET_SCHEMA = {
   }
 }
+export const RESET_SCHEMA = RESET_SEND_SCHEMA
 export const REGISTRATION_SCHEMA = {
   body: {
     type: 'object',
@@ -54,7 +67,8 @@ export enum AUTH_ENDPOINTS {
   REGISTRATION = '/register',
   PROFILE = '/profile',
   SESSION = '/session',
-  RESET = '/reset/call',
+  RESET = '/reset/send',
+  RESET_CALL = '/reset/call',
   CONFIRM_RESET = "/reset",
   FIRST_USER = '/setup/first-user'
 }

package/src/utils/crypto/index.ts CHANGED Viewed

@@ -36,6 +36,6 @@ export const comparePassword = async (plaintext: string, storedPassword: string)
  * > Generate a random token
  * @param length -> the token length
  */
-export const generateToken = (length = 32) => {
+export const generateToken = (length = 64) => {
   return crypto.randomBytes(length).toString('hex')
 }