emilsoftware-utilities 1.3.87 → 1.3.89

package/dist/accessi-module/AccessiModule.js

@@ -16,7 +16,6 @@ const PermissionService_1 = require("./Services/PermissionService/PermissionServ
 const UserService_1 = require("./Services/UserService/UserService");
 let AccessiModule = AccessiModule_1 = class AccessiModule {
     static forRoot(options) {
-        console.log("✅ AccessiModule inizializzato con opzioni:", options);
         return {
             module: AccessiModule_1,
             providers: [

package/dist/accessi-module/Controllers/AccessiController.d.ts

@@ -4,6 +4,7 @@ import { AuthService } from '../Services/AuthService/AuthService';
 import { PermissionService } from '../Services/PermissionService/PermissionService';
 import { UserService } from '../Services/UserService/UserService';
 import { EmailService } from '../Services/EmailService/EmailService';
+import { IUser } from '../Services/UserService/IUserService';
 export declare class AccessiController {
     private readonly userService;
     private readonly authService;
@@ -11,6 +12,8 @@ export declare class AccessiController {
     private readonly permissionService;
     private readonly options;
     constructor(userService: UserService, authService: AuthService, emailService: EmailService, permissionService: PermissionService, options: AccessiOptions);
+    serveResetPasswordPage(res: Response, token: string): Promise<void>;
+    resetPassword(res: Response, token: string, newPassword: string): Promise<Response<any, Record<string, any>>>;
     getUserByToken(token: string, res: Response): Promise<Response<any, Record<string, any>>>;
     login(loginDto: {
         username: string;
@@ -18,7 +21,7 @@ export declare class AccessiController {
     }, res: Response): Promise<Response<any, Record<string, any>>>;
     getUsers(res: Response): Promise<Response<any, Record<string, any>>>;
     deleteUser(codiceUtente: string, res: Response): Promise<Response<any, Record<string, any>>>;
-    register(request: any, res: Response): Promise<Response<any, Record<string, any>>>;
+    register(request: Request, registrationData: IUser, res: Response): Promise<Response<any, Record<string, any>>>;
     encrypt(data: string, res: Response): Promise<Response<any, Record<string, any>>>;
     decrypt(data: string, res: Response): Promise<Response<any, Record<string, any>>>;
     resetAbilitazioni(codiceUtente: string, res: Response): Promise<Response<any, Record<string, any>>>;

package/dist/accessi-module/Controllers/AccessiController.js

@@ -64,6 +64,7 @@ const AuthService_1 = require("../Services/AuthService/AuthService");
 const PermissionService_1 = require("../Services/PermissionService/PermissionService");
 const UserService_1 = require("../Services/UserService/UserService");
 const EmailService_1 = require("../Services/EmailService/EmailService");
+const path_1 = require("path");
 let AccessiController = AccessiController_1 = class AccessiController {
     constructor(userService, authService, emailService, permissionService, options) {
         this.userService = userService;
@@ -72,6 +73,22 @@ let AccessiController = AccessiController_1 = class AccessiController {
         this.permissionService = permissionService;
         this.options = options;
     }
+    serveResetPasswordPage(res, token) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return res.sendFile((0, path_1.join)(__dirname, '..', 'Views', 'reset-password.html'));
+        });
+    }
+    resetPassword(res, token, newPassword) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.authService.resetPassword(token, newPassword);
+                return Utilities_1.RestUtilities.sendOKMessage(res, 'Password aggiornata con successo!');
+            }
+            catch (error) {
+                return Utilities_1.RestUtilities.sendErrorMessage(res, error, AccessiController_1.name);
+            }
+        });
+    }
     getUserByToken(token, res) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -129,11 +146,17 @@ let AccessiController = AccessiController_1 = class AccessiController {
             }
         });
     }
-    register(request, res) {
+    register(request, registrationData, res) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.userService.register(request);
-                return Utilities_1.RestUtilities.sendOKMessage(res, 'L\'utente è stato registrato con successo.');
+                let protocol = request["protocol"];
+                let host = request.headers["host"];
+                if (!protocol || !host) {
+                    return Utilities_1.RestUtilities.sendErrorMessage(res, "Impossibile procedere: protocollo e host non impostati negli header della richiesta.", AccessiController_1.name);
+                }
+                let confirmationEmailPrefix = protocol + "://" + host;
+                yield this.userService.register(registrationData, confirmationEmailPrefix);
+                return Utilities_1.RestUtilities.sendOKMessage(res, "L'utente è stato registrato con successo.");
             }
             catch (error) {
                 return Utilities_1.RestUtilities.sendErrorMessage(res, error, AccessiController_1.name);
@@ -210,6 +233,23 @@ let AccessiController = AccessiController_1 = class AccessiController {
 exports.AccessiController = AccessiController;
 __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Recupera le informazioni utente dal token JWT' }),
+    (0, common_1.Get)('reset-password/:token'),
+    __param(0, (0, common_1.Res)()),
+    __param(1, (0, common_1.Param)('token')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, String]),
+    __metadata("design:returntype", Promise)
+], AccessiController.prototype, "serveResetPasswordPage", null);
+__decorate([
+    (0, common_1.Post)('reset-password/:token'),
+    __param(0, (0, common_1.Res)()),
+    __param(1, (0, common_1.Param)('token')),
+    __param(2, (0, common_1.Body)("newPassword")),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, String, String]),
+    __metadata("design:returntype", Promise)
+], AccessiController.prototype, "resetPassword", null);
+__decorate([
     (0, common_1.Post)('get-user-by-token'),
     __param(0, (0, common_1.Body)('token')),
     __param(1, (0, common_1.Res)()),
@@ -228,7 +268,7 @@ __decorate([
 ], AccessiController.prototype, "login", null);
 __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Recupera la lista degli utenti' }),
-    (0, common_1.Get)('users'),
+    (0, common_1.Post)('get-users'),
     __param(0, (0, common_1.Res)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
@@ -246,10 +286,11 @@ __decorate([
 __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Registra un nuovo utente' }),
     (0, common_1.Post)('register'),
-    __param(0, (0, common_1.Body)()),
-    __param(1, (0, common_1.Res)()),
+    __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Body)()),
+    __param(2, (0, common_1.Res)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object, Object]),
+    __metadata("design:paramtypes", [Request, Object, Object]),
     __metadata("design:returntype", Promise)
 ], AccessiController.prototype, "register", null);
 __decorate([

package/dist/accessi-module/Services/AuthService/AuthService.js

@@ -73,7 +73,8 @@ let AuthService = class AuthService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const query = `UPDATE OR INSERT INTO UTENTI_PWD (CODUTE, PWD) VALUES (?, ?)`;
-                return yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, query, [codiceUtente, nuovaPassword]);
+                const hashedPassword = Utilities_1.CryptUtilities.encrypt(nuovaPassword, this.accessiOptions.encryptionKey);
+                return yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, query, [codiceUtente, hashedPassword]);
             }
             catch (error) {
                 throw error;
@@ -132,18 +133,18 @@ let AuthService = class AuthService {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Controlliamo se il token esiste
-                const result = yield Orm_1.Orm.query({}, "SELECT CODUTE FROM UTENTI WHERE KEYREG = ?", [token]);
+                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "SELECT CODUTE FROM UTENTI WHERE KEYREG = ?", [token]);
                 if (result.length === 0) {
                     throw new Error("Token non valido o già usato.");
                 }
                 // Hashiamo la nuova password
                 const hashedPassword = Utilities_1.CryptUtilities.encrypt(newPassword, this.accessiOptions.encryptionKey);
                 // Aggiorniamo la password e rimuoviamo il token di reset
-                yield Orm_1.Orm.query({}, "UPDATE UTENTI SET PASSWORD = ?, KEYREG = NULL WHERE CODUTE = ?", [hashedPassword, result[0].CODUTE]);
+                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "UPDATE UTENTI SET KEYREG = NULL, STAREG = ? WHERE CODUTE = ?", [StatoRegistrazione_1.StatoRegistrazione.CONF, result[0].CODUTE]);
+                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "UPDATE OR INSERT INTO UTENTI_PWD (CODUTE, PWD) VALUES (?, ?)", [result[0].CODUTE, hashedPassword]);
             }
             catch (error) {
-                console.error("Errore nel reset della password:", error);
-                throw new Error("Errore durante il reset della password.");
+                throw error;
             }
         });
     }

package/dist/accessi-module/Services/EmailService/EmailService.d.ts

@@ -6,5 +6,4 @@ export declare class EmailService implements IEmailService {
     sendAccountUpdateEmail(email: string, message: string): Promise<void>;
     private transporter;
     sendPasswordResetEmail(email: string, baseUrl: string): Promise<void>;
-    sendVerificationEmail(email: string, codiceUtente: string, baseUrl: string): Promise<void>;
 }

package/dist/accessi-module/Services/EmailService/EmailService.js

@@ -42,11 +42,11 @@ let EmailService = class EmailService {
             try {
                 const resetToken = (0, uuid_1.v4)(); // Generiamo un nuovo token unico
                 // Aggiorna il campo keyReg nel database
-                const result = yield Orm_1.Orm.query({}, "UPDATE UTENTI SET KEYREG = ? WHERE USRNAME = ? RETURNING CODUTE", [resetToken, email]);
+                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "UPDATE UTENTI SET KEYREG = ? WHERE USRNAME = ? RETURNING CODUTE", [resetToken, email]);
                 if (result.length === 0) {
                     throw new Error("Email non trovata.");
                 }
-                const resetUrl = `${baseUrl}/reset-password/${resetToken}`;
+                const resetUrl = `${baseUrl}/api/accessi/reset-password/${resetToken}`;
                 const mailOptions = {
                     from: this.accessiOptions.emailOptions.from,
                     to: email,
@@ -62,27 +62,6 @@ let EmailService = class EmailService {
             }
         });
     }
-    sendVerificationEmail(email, codiceUtente, baseUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const userKey = (0, uuid_1.v4)();
-                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "UPDATE UTENTI SET KEYREG = ? WHERE CODUTE = ?", [userKey, codiceUtente]);
-                const verificationUrl = `${baseUrl}/${userKey}`;
-                const mailOptions = {
-                    from: '"Supporto" <noreply@example.com>',
-                    to: email,
-                    subject: 'Verifica la tua email',
-                    text: `Clicca sul seguente link per verificare il tuo account: ${verificationUrl}`,
-                    html: `<p>Clicca sul seguente link per verificare il tuo account:</p><a href="${verificationUrl}">${verificationUrl}</a>`
-                };
-                yield this.transporter.sendMail(mailOptions);
-            }
-            catch (error) {
-                console.error("Errore nell'invio dell'email di verifica:", error);
-                throw new Error("Errore durante l'invio dell'email di verifica.");
-            }
-        });
-    }
 };
 exports.EmailService = EmailService;
 exports.EmailService = EmailService = __decorate([

package/dist/accessi-module/Services/EmailService/IEmailService.d.ts

@@ -1,14 +1,4 @@
 export interface IEmailService {
-    /**
-     * Invia un'email di verifica all'utente e aggiorna la chiave di registrazione nel database.
-     *
-     * @param {string} email - Email del destinatario.
-     * @param {string} codiceUtente - Codice utente per il database.
-     * @param {string} baseUrl - URL base per il link di verifica.
-     * @returns {Promise<void>} Una Promise che si risolve al completamento dell'invio.
-     * @throws {Error} Se l'invio dell'email fallisce.
-     */
-    sendVerificationEmail(email: string, codiceUtente: string, baseUrl: string): Promise<void>;
     /**
      * Invia un'email di recupero password con un link per reimpostarla.
      *

package/dist/accessi-module/Services/UserService/IUserService.d.ts

@@ -42,7 +42,7 @@ export interface IUserService {
      * @returns {Promise<void>} Una Promise che si risolve al completamento dell'operazione.
      * @throws {Error} Se l'inserimento fallisce per qualsiasi motivo.
      */
-    register(request: UserQueryResult): Promise<void>;
+    register(request: UserQueryResult, confirmationEmailPrefix: string): Promise<void>;
     /**
      * Recupera un utente in base al suo username.
      *

package/dist/accessi-module/Services/UserService/UserService.d.ts

@@ -2,16 +2,18 @@ import { AccessiOptions } from "../../AccessiModule";
 import { UserQueryResult } from "../../models/QueryResults/UserQueryResult";
 import { StatoRegistrazione } from "../../models/StatoRegistrazione";
 import { IFiltriUtente, IUser, IUserService } from "./IUserService";
+import { EmailService } from "../EmailService/EmailService";
 export declare class UserService implements IUserService {
     private readonly accessiOptions;
-    constructor(accessiOptions: AccessiOptions);
+    private readonly emailService;
+    constructor(accessiOptions: AccessiOptions, emailService: EmailService);
     getUsers(): Promise<UserQueryResult[]>;
     getCodiceUtenteByUsername(username: string): Promise<{
         codiceUtente: string;
     }>;
     getUserByUsername(username: string): Promise<IUser | null>;
     getUserFilters(codiceUtente: string): Promise<IFiltriUtente[]>;
-    register(request: IUser): Promise<void>;
+    register(request: IUser, confirmationEmailPrefix: string): Promise<void>;
     setRegistrazioneConfermata(userKey: string): Promise<void>;
     updateUser(user: UserQueryResult): Promise<void>;
     deleteUser(codiceCliente: string): Promise<void>;

package/dist/accessi-module/Services/UserService/UserService.js

@@ -27,9 +27,11 @@ const autobind_1 = require("../../../autobind");
 const Orm_1 = require("../../../Orm");
 const Utilities_1 = require("../../../Utilities");
 const StatoRegistrazione_1 = require("../../models/StatoRegistrazione");
+const EmailService_1 = require("../EmailService/EmailService");
 let UserService = class UserService {
-    constructor(accessiOptions) {
+    constructor(accessiOptions, emailService) {
         this.accessiOptions = accessiOptions;
+        this.emailService = emailService;
     }
     getUsers() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -119,16 +121,20 @@ let UserService = class UserService {
                 .then(results => results.map(Utilities_1.RestUtilities.convertKeysToCamelCase));
         });
     }
-    register(request) {
+    register(request, confirmationEmailPrefix) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const queryUtenti = `INSERT INTO UTENTI (USRNAME, STAREG, FLGGDPR) VALUES (?,?,?,?) RETURNING CODUTE`;
-                const paramsUtenti = [request.username, request.statoRegistrazione, false];
+                const existingUser = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "SELECT CODUTE FROM UTENTI WHERE USRNAME = ?", [request.username]);
+                if (existingUser.length > 0) {
+                    throw new Error("Utente già esistente!");
+                }
+                const queryUtenti = `INSERT INTO UTENTI (USRNAME, STAREG) VALUES (?,?) RETURNING CODUTE`;
+                const paramsUtenti = [request.username, StatoRegistrazione_1.StatoRegistrazione.INVIO];
                 const codiceUtente = (yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, queryUtenti, paramsUtenti)).CODUTE;
-                const queryUtentiConfig = `INSERT INTO UTENTI_CONFIG (CODUTE,COGNOME,NOME,CODLINGUA,FLGSUPER) VALUES (?,?,?,?,?)`;
-                const paramsUtentiConfig = [codiceUtente, request.cognome, request.nome, request.codiceLingua, request.flagSuper];
-                //await this.sendVerificationEmail(request.username, codiceUtente, "");
+                const queryUtentiConfig = `INSERT INTO UTENTI_CONFIG (CODUTE,COGNOME,NOME,CODLINGUA) VALUES (?,?,?,?)`;
+                const paramsUtentiConfig = [codiceUtente, request.cognome, request.nome, request.codiceLingua];
                 yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, queryUtentiConfig, paramsUtentiConfig);
+                yield this.emailService.sendPasswordResetEmail(request.username, confirmationEmailPrefix);
             }
             catch (error) {
                 throw error;
@@ -233,5 +239,5 @@ exports.UserService = UserService = __decorate([
     autobind_1.autobind,
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)('ACCESSI_OPTIONS')),
-    __metadata("design:paramtypes", [Object])
+    __metadata("design:paramtypes", [Object, EmailService_1.EmailService])
 ], UserService);

package/dist/accessi-module/index.js

@@ -8,6 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatoRegistrazione = exports.AccessiModule = void 0;
 exports.initializeAccessiModule = initializeAccessiModule;
@@ -15,6 +18,7 @@ const core_1 = require("@nestjs/core");
 const platform_express_1 = require("@nestjs/platform-express");
 const SwaggerConfig_1 = require("./swagger/SwaggerConfig");
 const AccessiModule_1 = require("./AccessiModule");
+const express_1 = __importDefault(require("express"));
 function initializeAccessiModule(app, options) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -49,11 +53,47 @@ function initializeAccessiModule(app, options) {
             console.log(availableRoutes);
         }
         catch (error) {
-            console.error("Errore in initializeAccessiModule:", error);
+            console.error("Errore in initialize AccessiModule:", error);
             throw error;
         }
     });
 }
+function start() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const app = (0, express_1.default)();
+        yield initializeAccessiModule(app, {
+            databaseOptions: {
+                host: '127.0.0.1',
+                port: 3050,
+                database: 'C:/Siti/Autoclub/ACCESSI.GDB',
+                user: "SYSDBA",
+                password: "masterkey",
+            },
+            encryptionKey: "BNB_KIT7GRP2023!",
+            mockDemoUser: true,
+            jwtOptions: {
+                expiresIn: "24h",
+                secret: "fabriziocorona",
+            },
+            emailOptions: {
+                auth: {
+                    user: "form@emilsoftware.it",
+                    pass: "ForES713",
+                },
+                from: "noreply@emilsoftware.it",
+                host: "smtp.qboxmail.com",
+                port: 587,
+                secure: false,
+            },
+            baseUrl: "http://localhost:3000"
+        });
+        const PORT = 3000;
+        app.listen(PORT, () => {
+            console.log(`Server avviato su http://localhost:${PORT}`);
+        });
+    });
+}
+start();
 var AccessiModule_2 = require("./AccessiModule");
 Object.defineProperty(exports, "AccessiModule", { enumerable: true, get: function () { return AccessiModule_2.AccessiModule; } });
 var StatoRegistrazione_1 = require("./models/StatoRegistrazione");

package/dist/accessi-module/swagger/SwaggerConfig.js

@@ -7,9 +7,8 @@ function serveSwaggerDocs(app) {
         .setTitle('Accessi API')
         .setDescription('Documentazione delle API per la gestione degli accessi')
         .setVersion('1.0')
-        .addServer('/')
         .build();
-    const document = swagger_1.SwaggerModule.createDocument(app, config);
-    swagger_1.SwaggerModule.setup('swagger/accessi', app, document);
+    const documentFactory = () => swagger_1.SwaggerModule.createDocument(app, config);
+    swagger_1.SwaggerModule.setup('swagger', app, documentFactory);
     console.log('Swagger UI disponibile su http://localhost:3000/swagger/accessi');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.3.87",
+  "version": "1.3.89",
   "description": "Utilities for EmilSoftware",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -30,7 +30,7 @@
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "colorette": "^2.0.20",
-    "es-node-firebird": "^1.2.6",
+    "es-node-firebird": "^1.2.7",
     "jsonwebtoken": "^9.0.2",
     "jspdf": "^3.0.0",
     "jspdf-autotable": "^5.0.2",