emilsoftware-utilities 1.3.94 → 1.3.95

package/dist/Utilities.d.ts

@@ -108,7 +108,6 @@ export declare class CryptUtilities {
      */
     static decrypt(encryptedData: string, key: string): string | null;
 }
-export declare function Deprecated(message: string): (target: any, key?: string, descriptor?: PropertyDescriptor) => void;
 /**
  * Utility class for managing database-related configurations and operations.
  */
@@ -136,3 +135,4 @@ export declare class DatabaseUtilities {
      */
     static createOption(host: string, port: number, database: string, username?: string, password?: string): Options;
 }
+export declare function Deprecated(message: string): (target: any, key?: string, descriptor?: PropertyDescriptor) => void;

package/dist/Utilities.js

@@ -269,11 +269,6 @@ class CryptUtilities {
     }
 }
 exports.CryptUtilities = CryptUtilities;
-function Deprecated(message) {
-    return function (target, key, descriptor) {
-        console.warn(`⚠️ [DEPRECATED] ${message}`);
-    };
-}
 /**
  * Utility class for managing database-related configurations and operations.
  */
@@ -315,3 +310,8 @@ class DatabaseUtilities {
     }
 }
 exports.DatabaseUtilities = DatabaseUtilities;
+function Deprecated(message) {
+    return function (target, key, descriptor) {
+        console.warn(`⚠️ [DEPRECATED] ${message}`);
+    };
+}

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

@@ -81,7 +81,7 @@ let AccessiController = AccessiController_1 = class AccessiController {
     resetPassword(res, token, newPassword) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.authService.resetPassword(token, newPassword);
+                yield this.authService.confirmResetPassword(token, newPassword);
                 return Utilities_1.RestUtilities.sendOKMessage(res, 'Password aggiornata con successo!');
             }
             catch (error) {

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

@@ -69,7 +69,7 @@ let AuthController = AuthController_1 = class AuthController {
     resetPassword(res, token, newPassword) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.authService.resetPassword(token, newPassword);
+                yield this.authService.confirmResetPassword(token, newPassword);
                 return Utilities_1.RestUtilities.sendOKMessage(res, 'Password aggiornata con successo!');
             }
             catch (error) {
@@ -113,7 +113,7 @@ let AuthController = AuthController_1 = class AuthController {
 };
 exports.AuthController = AuthController;
 __decorate([
-    (0, common_1.Post)('reset-password/:token'),
+    (0, common_1.Post)('confirm-reset-password/:token'),
     __param(0, (0, common_1.Res)()),
     __param(1, (0, common_1.Param)('token')),
     __param(2, (0, common_1.Body)("newPassword")),

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

@@ -59,7 +59,7 @@ let EmailController = class EmailController {
 exports.EmailController = EmailController;
 __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Serve una pagina per il reset della password' }),
-    (0, common_1.Get)('reset-password/:token'),
+    (0, common_1.Get)('reset-password-page/:token'),
     __param(0, (0, common_1.Res)()),
     __param(1, (0, common_1.Param)('token')),
     __metadata("design:type", Function),
@@ -67,8 +67,8 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EmailController.prototype, "serveResetPasswordPage", null);
 __decorate([
-    (0, swagger_1.ApiOperation)({ summary: 'Registra un nuovo utente' }),
-    (0, common_1.Post)('send-reset-password'),
+    (0, swagger_1.ApiOperation)({ summary: 'Invia una e-mail per il reset della password' }),
+    (0, common_1.Post)('send-reset-password-email'),
     __param(0, (0, common_1.Req)()),
     __param(1, (0, common_1.Body)()),
     __param(2, (0, common_1.Res)()),
@@ -77,7 +77,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EmailController.prototype, "sendPasswordResetEmail", null);
 exports.EmailController = EmailController = __decorate([
-    (0, swagger_1.ApiTags)('Auth'),
+    (0, swagger_1.ApiTags)('Email'),
     (0, common_1.Controller)('accessi/email'),
     __param(1, (0, common_1.Inject)('ACCESSI_OPTIONS')),
     __metadata("design:paramtypes", [EmailService_1.EmailService, Object])

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

@@ -12,5 +12,5 @@ export declare class AuthService implements IAuthService {
     verifyPassword(codiceUtente: string, passwordCifrata: string): Promise<boolean>;
     getAdminUser(): ILoginResult;
     getDemoUser(): ILoginResult;
-    resetPassword(token: string, newPassword: string): Promise<void>;
+    confirmResetPassword(token: string, newPassword: string): Promise<void>;
 }

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

@@ -129,7 +129,7 @@ let AuthService = class AuthService {
             abilitazioni: []
         };
     }
-    resetPassword(token, newPassword) {
+    confirmResetPassword(token, newPassword) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 // Controlliamo se il token esiste

package/dist/accessi-module/Services/AuthService/IAuthService.d.ts

@@ -60,5 +60,5 @@ export interface IAuthService {
    * @returns {Promise<void>} - Nessun valore di ritorno se il reset ha successo.
    * @throws {Error} - Se il token è invalido o già usato, o se si verifica un errore nel database.
    */
-    resetPassword(token: string, newPassword: string): Promise<void>;
+    confirmResetPassword(token: string, newPassword: string): Promise<void>;
 }

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

@@ -29,6 +29,7 @@ const nodemailer_1 = __importDefault(require("nodemailer"));
 const uuid_1 = require("uuid");
 const Orm_1 = require("../../../Orm");
 const common_1 = require("@nestjs/common");
+const StatoRegistrazione_1 = require("../../models/StatoRegistrazione");
 let EmailService = class EmailService {
     constructor(accessiOptions) {
         this.accessiOptions = accessiOptions;
@@ -42,11 +43,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(this.accessiOptions.databaseOptions, "UPDATE UTENTI SET KEYREG = ? WHERE USRNAME = ? RETURNING CODUTE", [resetToken, email]);
+                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "UPDATE UTENTI SET KEYREG = ?, STAREG = ? WHERE USRNAME = ? RETURNING CODUTE", [resetToken, StatoRegistrazione_1.StatoRegistrazione.INVIO, email]);
                 if (result.length === 0) {
                     throw new Error("Email non trovata.");
                 }
-                const resetUrl = `${baseUrl}/api/accessi/reset-password/${resetToken}`;
+                const resetUrl = `${baseUrl}/api/accessi/email/reset-password/${resetToken}`;
                 const mailOptions = {
                     from: this.accessiOptions.emailOptions.from,
                     to: email,

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

@@ -107,12 +107,4 @@ export interface IUserService {
    * @throws {Error} Se la query fallisce o si verifica un problema durante l'esecuzione.
    */
     getUserFilters(codiceUtente: string): Promise<IFiltriUtente[]>;
-    /**
-   * Verifica l'email di un utente utilizzando un token univoco.
-   *
-   * @param {string} token - Il token di verifica (`keyReg`) ricevuto via email.
-   * @returns {Promise<void>} - Nessun valore di ritorno se la verifica ha successo.
-   * @throws {Error} - Se il token è invalido o già usato, o se si verifica un errore nel database.
-   */
-    verifyEmail(token: string): Promise<void>;
 }

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

@@ -19,5 +19,4 @@ export declare class UserService implements IUserService {
     deleteUser(codiceCliente: string): Promise<void>;
     setGdpr(codiceUtente: string): Promise<any>;
     setStatoRegistrazione(statoRegistrazione: StatoRegistrazione, codiceUtente: string): Promise<any>;
-    verifyEmail(token: string): Promise<void>;
 }

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

@@ -56,8 +56,9 @@ let UserService = class UserService {
                 G.PAGDEF as pagina_default,
                 G.JSON_METADATA as json_metadata
             FROM UTENTI U INNER JOIN UTENTI_CONFIG G ON U.CODUTE = G.CODUTE  
+            WHERE STAREG <> ?
             ORDER BY U.CODUTE`;
-                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, []);
+                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [StatoRegistrazione_1.StatoRegistrazione.DELETE]);
                 return result.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
             }
             catch (error) {
@@ -181,8 +182,8 @@ let UserService = class UserService {
     deleteUser(codiceCliente) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const query = `DELETE FROM UTENTI WHERE CODUTE = ?`;
-                yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, query, [codiceCliente]);
+                const query = `UPDATE UTENTI SET STAREG = ? WHERE CODUTE = ?`;
+                yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, query, [StatoRegistrazione_1.StatoRegistrazione.DELETE, codiceCliente]);
             }
             catch (error) {
                 throw error;
@@ -192,8 +193,8 @@ let UserService = class UserService {
     setGdpr(codiceUtente) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                let query = ` UPDATE OR INSERT UTENTI_GDPR SET CODUTE = ? `;
-                let params = [codiceUtente];
+                let query = ` UPDATE OR INSERT UTENTI_GDPR SET CODUTE = ?, GDPR = ? `;
+                let params = [codiceUtente, true];
                 let result = yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, query, params);
                 return result;
             }
@@ -215,23 +216,6 @@ let UserService = class UserService {
             }
         });
     }
-    verifyEmail(token) {
-        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]);
-                if (result.length === 0) {
-                    throw new Error("Token non valido o già usato.");
-                }
-                // Attiviamo l'account e rimuoviamo il token
-                yield Orm_1.Orm.query({}, "UPDATE UTENTI SET STAREG = ?, KEYREG = NULL WHERE CODUTE = ?", [StatoRegistrazione_1.StatoRegistrazione.CONF, result[0].CODUTE]);
-            }
-            catch (error) {
-                console.error("Errore nella verifica email:", error);
-                throw new Error("Errore durante la verifica dell'email.");
-            }
-        });
-    }
 };
 exports.UserService = UserService;
 exports.UserService = UserService = __decorate([

package/dist/accessi-module/Views/reset-password.html

@@ -1,51 +1,177 @@
 <!DOCTYPE html>
 <html lang="it">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Reset Password</title>
+    <style>
+        * {
+            box-sizing: border-box;
+            margin: 0;
+            padding: 0;
+            font-family: Arial, sans-serif;
+        }
+
+        body {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            background: linear-gradient(135deg, #0068ae, #004e80, #002c50);
+            color: #fff;
+        }
+
+        .container {
+            background: rgba(255, 255, 255, 0.15);
+            padding: 25px;
+            border-radius: 12px;
+            backdrop-filter: blur(12px);
+            box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.3);
+            width: 380px;
+            text-align: center;
+            border: 1px solid rgba(255, 255, 255, 0.2);
+        }
+
+        h1 {
+            font-size: 24px;
+            margin-bottom: 15px;
+            color: #ffffff;
+        }
+
+        .form-group {
+            margin: 12px 0;
+            text-align: left;
+        }
+
+        label {
+            font-size: 14px;
+            font-weight: bold;
+            display: block;
+            margin-bottom: 5px;
+            color: #ffffff;
+        }
+
+        input {
+            width: 100%;
+            padding: 12px;
+            border: none;
+            border-radius: 6px;
+            font-size: 14px;
+            margin-top: 5px;
+            background: rgba(255, 255, 255, 0.15);
+            color: #ffffff;
+            border: 1px solid rgba(255, 255, 255, 0.3);
+        }
+
+        input:focus {
+            outline: none;
+            border: 2px solid #ffffff;
+            background: rgba(255, 255, 255, 0.2);
+        }
+
+        .error {
+            color: #ff6b6b;
+            font-size: 12px;
+            margin-top: 5px;
+            display: none;
+        }
+
+        button {
+            background: linear-gradient(90deg, #0080ff, #0068ae);
+            border: none;
+            padding: 12px;
+            font-size: 16px;
+            border-radius: 6px;
+            width: 100%;
+            color: #ffffff;
+            cursor: pointer;
+            font-weight: bold;
+            transition: all 0.3s ease;
+            box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2);
+        }
+
+        button:hover {
+            background: linear-gradient(90deg, #0095ff, #0070c0);
+            transform: scale(1.05);
+        }
+    </style>
 </head>
+
 <body>
-    <h1>Reimposta la tua password</h1>
-    <form id="resetForm">
-        <input type="hidden" id="token" value="">
-        <input type="hidden" id="redirectUrl" value="">
-        <label for="password">Nuova Password:</label>
-        <input type="password" id="password" required>
-        <button type="submit">Aggiorna Password</button>
-    </form>
+    <div class="container">
+        <h1>Reimposta la tua password</h1>
+        <form id="resetForm">
+            <input type="hidden" id="token" value="">
+            <input type="hidden" id="redirectUrl" value="">
+
+            <div class="form-group">
+                <label for="password">Nuova Password:</label>
+                <input type="password" id="password" required>
+                <p class="error" id="passwordError">La password deve avere almeno 6 caratteri.</p>
+            </div>
+
+            <div class="form-group">
+                <label for="confirmPassword">Conferma Password:</label>
+                <input type="password" id="confirmPassword" required>
+                <p class="error" id="confirmError">Le password non corrispondono.</p>
+            </div>
+
+            <button type="submit">Aggiorna password</button>
+        </form>
+    </div>
+
     <script>
-        document.addEventListener("DOMContentLoaded", function() {
+        document.addEventListener("DOMContentLoaded", function () {
             const urlParams = new URLSearchParams(window.location.search);
             const token = window.location.pathname.split("/").pop();
-            const redirectUrl = urlParams.get("redirectUrl") || "/"; // Default: Home
+            const redirectUrl = urlParams.get("redirectUrl") || "/";
 
             document.getElementById("token").value = token;
             document.getElementById("redirectUrl").value = redirectUrl;
-            
-            document.getElementById("resetForm").addEventListener("submit", async function(event) {
+
+            document.getElementById("resetForm").addEventListener("submit", async function (event) {
                 event.preventDefault();
                 const password = document.getElementById("password").value;
+                const confirmPassword = document.getElementById("confirmPassword").value;
+                const passwordError = document.getElementById("passwordError");
+                const confirmError = document.getElementById("confirmError");
+
+                // Reset messaggi di errore
+                passwordError.style.display = "none";
+                confirmError.style.display = "none";
+
+                // Validazioni
+                if (password.length < 6) {
+                    passwordError.style.display = "block";
+                    return;
+                }
 
-                if (!password) {
-                    alert("Inserisci una nuova password.");
+                if (password !== confirmPassword) {
+                    confirmError.style.display = "block";
                     return;
                 }
-                
-                const response = await fetch(`/api/accessi/reset-password/${token}`, {
-                    method: "POST",
-                    headers: { "Content-Type": "application/json" },
-                    body: JSON.stringify({ newPassword: password })
-                });
-
-                const data = await response.json();
-                alert(data.message || "Password aggiornata con successo!");
-                
-                if (response.ok) {
-                    window.location.href = redirectUrl;
+
+                // Effettua la richiesta API
+                try {
+                    const response = await fetch(`/api/accessi/auth/confirm-reset-password/${token}`, {
+                        method: "POST",
+                        headers: { "Content-Type": "application/json" },
+                        body: JSON.stringify({ newPassword: password })
+                    });
+
+                    const data = await response.json();
+                    alert(data.message || "Password aggiornata con successo!");
+
+                    if (response.ok) {
+                        window.location.href = redirectUrl;
+                    }
+                } catch (error) {
+                    alert("Errore nel reset della password. Riprova più tardi.");
                 }
             });
         });
     </script>
 </body>
+
 </html>

package/dist/accessi-module/index.js

@@ -13,8 +13,8 @@ exports.StatoRegistrazione = exports.AccessiModule = void 0;
 exports.initializeAccessiModule = initializeAccessiModule;
 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 SwaggerConfig_1 = require("./swagger/SwaggerConfig");
 function initializeAccessiModule(app, options) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -28,8 +28,8 @@ function initializeAccessiModule(app, options) {
             nestApp.setGlobalPrefix('api', {
                 exclude: ['/swagger', '/swagger/(.*)']
             });
+            (0, SwaggerConfig_1.setupSwagger)(nestApp);
             yield nestApp.init();
-            (0, SwaggerConfig_1.serveSwaggerDocs)(nestApp);
             console.log('Verifica API NestJS registrate:');
             const server = nestApp.getHttpAdapter().getInstance();
             const router = server.router;

package/dist/accessi-module/swagger/SwaggerConfig.d.ts

@@ -1,2 +1,2 @@
-import { INestApplication } from '@nestjs/common';
-export declare function serveSwaggerDocs(app: INestApplication): void;
+import { INestApplication } from "@nestjs/common";
+export declare function setupSwagger(app: INestApplication): void;

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

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serveSwaggerDocs = serveSwaggerDocs;
+exports.setupSwagger = setupSwagger;
 const swagger_1 = require("@nestjs/swagger");
-function serveSwaggerDocs(app) {
+function setupSwagger(app) {
     const config = new swagger_1.DocumentBuilder()
-        .setTitle('Accessi API')
-        .setDescription('Documentazione delle API per la gestione degli accessi')
-        .setVersion('1.0')
+        .setTitle("Accessi API")
+        .setDescription("API per la gestione degli accessi utenti")
+        .setVersion("1.0")
+        .addBearerAuth() // Per abilitare l'autenticazione JWT
         .build();
-    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');
+    const document = swagger_1.SwaggerModule.createDocument(app, config);
+    swagger_1.SwaggerModule.setup("swagger", app, document);
+    console.log("✅ Swagger disponibile su: http://localhost:3000/swagger");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.3.94",
+  "version": "1.3.95",
   "description": "Utilities for EmilSoftware",
   "main": "dist/index.js",
   "module": "dist/index.js",