emilsoftware-utilities 1.3.142 → 1.3.144

package/dist/accessi-module/AccessiModule.d.ts

@@ -31,6 +31,7 @@ export interface AccessiOptions {
     databaseOptions: Options;
     confirmationEmailUrl: string;
     confirmationEmailReturnUrl: string;
+    confirmationEmailPrefix?: string;
     encryptionKey: string;
     mockDemoUser: boolean;
     jwtOptions: JwtOptions;

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

@@ -11,7 +11,7 @@ export declare class UserController {
     private readonly logger;
     constructor(userService: UserService, emailService: EmailService, options: AccessiOptions);
     serveResetPasswordPage(res: Response, token: string): Promise<void>;
-    getUsers(res: Response): Promise<Response<any, Record<string, any>>>;
+    getUsers(res: Response, email?: string): Promise<Response<any, Record<string, any>>>;
     deleteUser(codiceUtente: number, res: Response): Promise<Response<any, Record<string, any>>>;
     register(request: Request, registrationData: RegisterRequest, res: Response): Promise<Response<any, Record<string, any>>>;
     updateUtente(codiceUtente: number, user: UserDto, res: Response): Promise<Response<any, Record<string, any>>>;

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

@@ -46,10 +46,10 @@ let UserController = UserController_1 = class UserController {
             return res.sendFile((0, path_1.join)(__dirname, '..', 'Views', 'reset-password.html'));
         });
     }
-    getUsers(res) {
+    getUsers(res, email) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const users = yield this.userService.getUsers();
+                const users = yield this.userService.getUsers(email);
                 return Utilities_1.RestUtilities.sendBaseResponse(res, users);
             }
             catch (error) {
@@ -127,8 +127,9 @@ __decorate([
     (0, swagger_1.ApiResponse)({ status: 401, description: 'Credenziali non valide' }),
     (0, common_1.Get)('get-users'),
     __param(0, (0, common_1.Res)()),
+    __param(1, (0, common_1.Query)('email')),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
+    __metadata("design:paramtypes", [Object, String]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "getUsers", null);
 __decorate([

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

@@ -40,6 +40,7 @@ let EmailService = class EmailService {
     }
     sendPasswordResetEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 const resetToken = (0, uuid_1.v4)(); // Generiamo un nuovo token unico
                 // Aggiorna il campo keyReg nel database
@@ -47,7 +48,7 @@ let EmailService = class EmailService {
                 if (result.length === 0) {
                     throw new Error("Email non trovata.");
                 }
-                const returnUrlQueryParams = "?returnUrl=" + this.accessiOptions.confirmationEmailReturnUrl;
+                const returnUrlQueryParams = "?returnUrl=" + this.accessiOptions.confirmationEmailReturnUrl + "&prefix=" + ((_a = this.accessiOptions.confirmationEmailPrefix) !== null && _a !== void 0 ? _a : '');
                 const { confirmationEmailUrl } = this.accessiOptions;
                 const resetUrl = `${confirmationEmailUrl}/api/accessi/email/reset-password-page/${resetToken}${returnUrlQueryParams}`;
                 let sPhrase;

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

@@ -10,7 +10,7 @@ export declare class UserService {
     private readonly emailService;
     private readonly permissionService;
     constructor(accessiOptions: AccessiOptions, emailService: EmailService, permissionService: PermissionService);
-    getUsers(): Promise<GetUsersResult[]>;
+    getUsers(email?: string): Promise<GetUsersResult[]>;
     getCodiceUtenteByEmail(email: string): Promise<{
         codiceUtente: number;
     }>;

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

@@ -35,10 +35,10 @@ let UserService = class UserService {
         this.emailService = emailService;
         this.permissionService = permissionService;
     }
-    getUsers() {
+    getUsers(email) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const query = ` 
+                let query = ` 
             SELECT  
                 U.CODUTE as codice_utente, 
                 U.USRNAME as email, 
@@ -66,10 +66,17 @@ let UserService = class UserService {
                 F.CODCLIENTI AS codice_clienti,
                 F.TIPFIL AS tip_fil
             FROM UTENTI U 
-            INNER JOIN UTENTI_CONFIG G ON U.CODUTE = G.CODUTE
+            WHERE 1=1
+            `;
+                let queryParams = [];
+                if (email) {
+                    query += ` AND LOWER(U.USRNAME) = ? `;
+                    queryParams.push(email.trim().toLowerCase());
+                }
+                query += `INNER JOIN UTENTI_CONFIG G ON U.CODUTE = G.CODUTE
             LEFT JOIN FILTRI F ON F.CODUTE = U.CODUTE
             ORDER BY U.CODUTE`;
-                let users = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query);
+                let users = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, queryParams);
                 users = users.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
                 let usersResponse = [];
                 for (const user of users) {

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

@@ -104,6 +104,7 @@
         <form id="resetForm">
             <input type="hidden" id="token" value="">
             <input type="hidden" id="returnUrl" value="">
+            <input type="hidden" id="prefix" value="">
 
             <div class="form-group">
                 <label for="password">Nuova Password:</label>
@@ -126,9 +127,22 @@
             const urlParams = new URLSearchParams(window.location.search);
             const token = window.location.pathname.split("/").pop();
             const returnUrl = urlParams.get("returnUrl") || "/";
+            let prefix = urlParams.get("prefix") || "";
+
+            if (prefix !== "") {
+                if (!prefix.startsWith("/")) { 
+                    prefix = "/" + prefix; 
+                }
+
+                if(prefix.endsWith("/")) {
+                    prefix = prefix.slice(0, -1);
+                }
+            }
+
 
             document.getElementById("token").value = token;
             document.getElementById("returnUrl").value = returnUrl;
+            document.getElementById("prefix").value = prefix;
 
             document.getElementById("resetForm").addEventListener("submit", async function (event) {
                 event.preventDefault();
@@ -154,7 +168,7 @@
 
                 // Effettua la richiesta API
                 try {
-                    const response = await fetch(`/api/accessi/auth/confirm-reset-password/${token}`, {
+                    const response = await fetch(`${prefix}/api/accessi/auth/confirm-reset-password/${token}`, {
                         method: "POST",
                         headers: { "Content-Type": "application/json" },
                         body: JSON.stringify({ newPassword: password })
@@ -162,23 +176,16 @@
 
                     const data = await response.json();
                     alert(data.message || "Password aggiornata con successo!");
-
-
                 } catch (error) {
                     alert("Errore nel reset della password. Riprova più tardi.");
-                }
-                finally {
-
+                } finally {
                     setTimeout(() => {
-
                         if (returnUrl.startsWith("https://") || returnUrl.startsWith("http://")) {
                             window.location.href = returnUrl;
                         } else {
                             window.location.href = "https://" + returnUrl;
                         }
-
                     }, 500);
-
                 }
             });
         });

package/package.json

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