emilsoftware-utilities 1.3.143 → 1.3.145

package/dist/EmilsoftwareModule.js

@@ -11,19 +11,39 @@ exports.EmilsoftwareModule = void 0;
 const common_1 = require("@nestjs/common");
 const AccessiModule_1 = require("./accessi-module/AccessiModule");
 const AllegatiModule_1 = require("./allegati-module/AllegatiModule");
+const Logger_1 = require("./Logger");
 /**
  * Unified module that combines user access management (Accessi) and file attachment management (Allegati)
  * into a single NestJS module with shared Swagger documentation
  */
 let EmilsoftwareModule = EmilsoftwareModule_1 = class EmilsoftwareModule {
     static forRoot(options) {
+        const logger = new Logger_1.Logger(EmilsoftwareModule_1.name);
+        let imports = [];
+        let exports = [];
+        if (!options) {
+            throw new Error("EmilsoftwareModule requires valid accessiOptions and allegatiOptions");
+        }
+        if (options.accessiOptions) {
+            logger.info("Initializing AccessiModule with provided options.");
+            imports.push(AccessiModule_1.AccessiModule.forRoot(options.accessiOptions));
+            exports.push(AccessiModule_1.AccessiModule);
+        }
+        else {
+            logger.warning("Accessi options are not provided. AccessiModule will not be initialized.");
+        }
+        if (options.allegatiOptions) {
+            logger.info("Initializing AllegatiModule with provided options.");
+            imports.push(AllegatiModule_1.AllegatiModule.forRoot(options.allegatiOptions));
+            exports.push(AllegatiModule_1.AllegatiModule);
+        }
+        else {
+            logger.warning("Allegati options are not provided. AllegatiModule will not be initialized.");
+        }
         return {
             module: EmilsoftwareModule_1,
-            imports: [
-                AccessiModule_1.AccessiModule.forRoot(options.accessiOptions),
-                AllegatiModule_1.AllegatiModule.forRoot(options.allegatiOptions),
-            ],
-            exports: [AccessiModule_1.AccessiModule, AllegatiModule_1.AllegatiModule],
+            imports,
+            exports
         };
     }
 };

package/dist/Logger.js

@@ -93,7 +93,6 @@ class Logger {
             ],
             levels: {
                 error: 1,
-                warn: 2,
                 warning: 2,
                 info: 3,
                 http: 4,
@@ -185,6 +184,9 @@ class Logger {
             case LogLevels.DEBUG:
                 console.debug((0, colorette_1.magenta)(`[DEBUG][${now}][${fileName}]`), logEntry.message);
                 break;
+            case LogLevels.WARNING:
+                console.debug((0, colorette_1.yellow)(`[WARNING][${now}][${fileName}]`), logEntry.message);
+                break;
             case LogLevels.LOG:
                 console.log((0, colorette_1.cyan)(`[LOG][${now}][${fileName}]`), logEntry.message);
                 break;

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/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

@@ -127,7 +127,18 @@
             const urlParams = new URLSearchParams(window.location.search);
             const token = window.location.pathname.split("/").pop();
             const returnUrl = urlParams.get("returnUrl") || "/";
-            const prefix = urlParams.get("prefix") || "";
+            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;
@@ -181,4 +192,4 @@
     </script>
 </body>
 
-</html>
+</html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emilsoftware-utilities",
-  "version": "1.3.143",
+  "version": "1.3.145",
   "description": "Utilities for EmilSoftware",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -10,7 +10,8 @@
     "build": "tsc && npm run copy-views",
     "copy-views": "node copy-views.js",
     "prepublishOnly": "npm run build",
-    "test:allegati": "ts-node src/tests/allegati/allegati.ts"
+    "test:allegati": "ts-node src/tests/allegati/allegati.ts",
+    "test:accessi": "npm run build && ts-node test/index.js"
   },
   "repository": {
     "type": "git",