emilsoftware-utilities 1.3.111 → 1.3.113

package/dist/ContractGenerator.js

@@ -76,7 +76,7 @@ class DocumentGenerator {
             const absolutePath = path_1.default.resolve(fontPath);
             const buffer = yield fs_1.promises.readFile(absolutePath);
             const base64Font = buffer.toString('base64');
-            console.log(`Installing font ${fontName} from ${absolutePath}`);
+            //console.log(`Installing font ${fontName} from ${absolutePath}`);
             this.doc.addFileToVFS(`${fontName}.ttf`, base64Font);
             this.doc.addFont(`${fontName}.ttf`, fontName, 'normal');
             this.doc.setFont(fontName);
@@ -227,7 +227,7 @@ class DocumentGenerator {
                         this.curY = this.config.margini.alto;
                     }
                     this.doc.addImage(base64Image, format, startX, this.curY, imgConf.dimensioni[0], imgConf.dimensioni[1]);
-                    console.log(`Image inserted at X: ${startX}, Y: ${this.curY}`);
+                    //console.log(`Image inserted at X: ${startX}, Y: ${this.curY}`);
                     this.curY = this.curY + imgConf.dimensioni[1] + this.config.staccoriga;
                 }
             }

package/dist/Logger.js

@@ -92,6 +92,7 @@ class Logger {
                 }),
             ],
             levels: {
+                log: 0,
                 error: 1,
                 warn: 2,
                 warning: 2,

package/dist/accessi-module/AccessiModule.js

@@ -9,7 +9,6 @@ var AccessiModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessiModule = void 0;
 const common_1 = require("@nestjs/common");
-const AccessiController_1 = require("./Controllers/AccessiController");
 const AuthService_1 = require("./Services/AuthService/AuthService");
 const EmailService_1 = require("./Services/EmailService/EmailService");
 const PermissionService_1 = require("./Services/PermissionService/PermissionService");
@@ -40,7 +39,7 @@ exports.AccessiModule = AccessiModule;
 exports.AccessiModule = AccessiModule = AccessiModule_1 = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
-        controllers: [AccessiController_1.AccessiController, EmailController_1.EmailController, AuthController_1.AuthController, PermissionController_1.PermissionController, UserController_1.UserController],
+        controllers: [EmailController_1.EmailController, AuthController_1.AuthController, PermissionController_1.PermissionController, UserController_1.UserController],
         providers: [AuthService_1.AuthService, UserService_1.UserService, EmailService_1.EmailService, PermissionService_1.PermissionService],
         exports: [AuthService_1.AuthService, UserService_1.UserService, EmailService_1.EmailService, PermissionService_1.PermissionService],
     })

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

@@ -19,5 +19,6 @@ export declare class PermissionController {
     assignPermissionsToUser(res: Response, codiceUtente: number, assignPermissionsRequest: AssignPermissionsToUserRequest): Promise<Response<any, Record<string, any>>>;
     deleteRole(codiceRuolo: number, res: Response): Promise<Response<any, Record<string, any>>>;
     getMenus(res: Response): Promise<Response<any, Record<string, any>>>;
+    getGroupsWithMenus(res: Response): Promise<Response<any, Record<string, any>>>;
     getUserRolesAndGrants(codiceUtente: number, res: Response): Promise<Response<any, Record<string, any>>>;
 }

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

@@ -33,6 +33,7 @@ const AssignPermissionsToUserRequest_1 = require("../Dtos/AssignPermissionsToUse
 const GetMenusResponse_1 = require("../Dtos/GetMenusResponse");
 const GetRolesResponse_1 = require("../Dtos/GetRolesResponse");
 const UserGrantsDto_1 = require("../Dtos/UserGrantsDto");
+const GetGroupsWithMenusResponse_1 = require("../Dtos/GetGroupsWithMenusResponse");
 let PermissionController = PermissionController_1 = class PermissionController {
     constructor(permissionService, options) {
         this.permissionService = permissionService;
@@ -157,6 +158,17 @@ let PermissionController = PermissionController_1 = class PermissionController {
             }
         });
     }
+    getGroupsWithMenus(res) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const menus = yield this.permissionService.getGroupsWithMenus();
+                return Utilities_1.RestUtilities.sendBaseResponse(res, menus);
+            }
+            catch (error) {
+                return Utilities_1.RestUtilities.sendErrorMessage(res, error, PermissionController_1.name);
+            }
+        });
+    }
     getUserRolesAndGrants(codiceUtente, res) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -288,7 +300,7 @@ __decorate([
 ], PermissionController.prototype, "deleteRole", null);
 __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Recupera tutti i menù disponibili', operationId: "getMenus" }),
-    (0, swagger_1.ApiOkResponse)({ description: 'Elenco menù', type: GetMenusResponse_1.MenuEntity }),
+    (0, swagger_1.ApiOkResponse)({ description: 'Elenco menù', type: GetMenusResponse_1.GetMenusResponse }),
     (0, swagger_1.ApiResponse)({ status: 200, description: "Lista dei menù recuperata con successo" }),
     (0, swagger_1.ApiResponse)({ status: 500, description: "Errore interno del server" }),
     (0, common_1.Get)('menus'),
@@ -297,6 +309,17 @@ __decorate([
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
 ], PermissionController.prototype, "getMenus", null);
+__decorate([
+    (0, swagger_1.ApiOperation)({ summary: 'Recupera tutti i gruppi disponibili con i relativi menù', operationId: "getGroupsWithMenus" }),
+    (0, swagger_1.ApiOkResponse)({ description: 'Elenco gruppi con relativi menù', type: GetGroupsWithMenusResponse_1.GetGroupsWithMenusResponse }),
+    (0, swagger_1.ApiResponse)({ status: 200, description: "Lista dei menù recuperata con successo" }),
+    (0, swagger_1.ApiResponse)({ status: 500, description: "Errore interno del server" }),
+    (0, common_1.Get)('groups-with-menus'),
+    __param(0, (0, common_1.Res)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object]),
+    __metadata("design:returntype", Promise)
+], PermissionController.prototype, "getGroupsWithMenus", null);
 __decorate([
     (0, swagger_1.ApiOperation)({ summary: 'Recupera i ruoli e i menù di un utente', operationId: "getUserRolesAndGrants" }),
     (0, swagger_1.ApiOkResponse)({ description: 'Elenco menù', type: UserGrantsDto_1.UserGrantsDto }),

package/dist/accessi-module/Dtos/GetGroupsWithMenusResponse.d.ts

@@ -0,0 +1,11 @@
+import { BaseResponse } from "./BaseResponse";
+import { MenuEntity } from "./GetMenusResponse";
+export declare class GroupWithMenusEntity {
+    codiceGruppo: string;
+    descrizioneGruppo: string;
+    ordineGruppo: number;
+    menus: MenuEntity[];
+}
+export declare class GetGroupsWithMenusResponse extends BaseResponse {
+    Result: GroupWithMenusEntity[];
+}

package/dist/accessi-module/Dtos/GetGroupsWithMenusResponse.js

@@ -0,0 +1,63 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetGroupsWithMenusResponse = exports.GroupWithMenusEntity = void 0;
+const swagger_1 = require("@nestjs/swagger");
+const BaseResponse_1 = require("./BaseResponse");
+const class_validator_1 = require("class-validator");
+const class_transformer_1 = require("class-transformer");
+const GetMenusResponse_1 = require("./GetMenusResponse");
+class GroupWithMenusEntity {
+}
+exports.GroupWithMenusEntity = GroupWithMenusEntity;
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: "Codice univoco del gruppo.",
+        type: String,
+        example: "GRP01"
+    }),
+    __metadata("design:type", String)
+], GroupWithMenusEntity.prototype, "codiceGruppo", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: "Descrizione del gruppo.",
+        type: String,
+        example: "Gestione Accessi"
+    }),
+    __metadata("design:type", String)
+], GroupWithMenusEntity.prototype, "descrizioneGruppo", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: "Ordine del gruppo.",
+        type: Number,
+        example: 1
+    }),
+    __metadata("design:type", Number)
+], GroupWithMenusEntity.prototype, "ordineGruppo", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: "Lista dei menù associati al gruppo.",
+        type: [GetMenusResponse_1.MenuEntity]
+    }),
+    (0, class_validator_1.ValidateNested)({ each: true }),
+    (0, class_transformer_1.Type)(() => GetMenusResponse_1.MenuEntity),
+    (0, class_validator_1.IsArray)(),
+    __metadata("design:type", Array)
+], GroupWithMenusEntity.prototype, "menus", void 0);
+class GetGroupsWithMenusResponse extends BaseResponse_1.BaseResponse {
+}
+exports.GetGroupsWithMenusResponse = GetGroupsWithMenusResponse;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: [GroupWithMenusEntity] }),
+    (0, class_validator_1.ValidateNested)({ each: true }),
+    (0, class_transformer_1.Type)(() => GroupWithMenusEntity),
+    __metadata("design:type", Array)
+], GetGroupsWithMenusResponse.prototype, "Result", void 0);

package/dist/accessi-module/Dtos/GetMenusResponse.d.ts

@@ -1,6 +1,4 @@
-export declare class GetMenusResponse {
-    menus: MenuEntity[];
-}
+import { BaseResponse } from "./BaseResponse";
 export declare class MenuEntity {
     codiceMenu: string;
     descrizioneMenu: string;
@@ -9,4 +7,9 @@ export declare class MenuEntity {
     icona?: string;
     tipo?: string;
     pagina?: string;
+    ordineMenu: number;
+    ordineGruppo: number;
+}
+export declare class GetMenusResponse extends BaseResponse {
+    Result: MenuEntity[];
 }

package/dist/accessi-module/Dtos/GetMenusResponse.js

@@ -9,11 +9,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MenuEntity = exports.GetMenusResponse = void 0;
+exports.GetMenusResponse = exports.MenuEntity = void 0;
 const swagger_1 = require("@nestjs/swagger");
-class GetMenusResponse {
-}
-exports.GetMenusResponse = GetMenusResponse;
+const BaseResponse_1 = require("./BaseResponse");
+const class_validator_1 = require("class-validator");
+const class_transformer_1 = require("class-transformer");
 class MenuEntity {
 }
 exports.MenuEntity = MenuEntity;
@@ -78,3 +78,28 @@ __decorate([
     }),
     __metadata("design:type", String)
 ], MenuEntity.prototype, "pagina", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: "Ordine del menu.",
+        type: Number,
+        example: 1
+    }),
+    __metadata("design:type", Number)
+], MenuEntity.prototype, "ordineMenu", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        description: "Ordine del gruppo.",
+        type: Number,
+        example: 1
+    }),
+    __metadata("design:type", Number)
+], MenuEntity.prototype, "ordineGruppo", void 0);
+class GetMenusResponse extends BaseResponse_1.BaseResponse {
+}
+exports.GetMenusResponse = GetMenusResponse;
+__decorate([
+    (0, swagger_1.ApiProperty)({ type: [MenuEntity] }),
+    (0, class_validator_1.ValidateNested)({ each: true }),
+    (0, class_transformer_1.Type)(() => MenuEntity),
+    __metadata("design:type", Array)
+], GetMenusResponse.prototype, "Result", void 0);

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

@@ -47,7 +47,7 @@ let EmailService = class EmailService {
                 if (result.length === 0) {
                     throw new Error("Email non trovata.");
                 }
-                const resetUrl = `${baseUrl}/api/accessi/email/reset-password/${resetToken}`;
+                const resetUrl = `${baseUrl}/api/accessi/email/reset-password-page/${resetToken}`;
                 const mailOptions = {
                     from: this.accessiOptions.emailOptions.from,
                     to: email,

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

@@ -1,6 +1,7 @@
 import { AccessiOptions } from "../../AccessiModule";
 import { Permission } from "../../Dtos";
 import { AbilitazioneMenu } from "../../Dtos/AbilitazioneMenu";
+import { GroupWithMenusEntity } from "../../Dtos/GetGroupsWithMenusResponse";
 import { MenuEntity } from "../../Dtos/GetMenusResponse";
 import { Role } from "../../Dtos/Role";
 export declare class PermissionService {
@@ -14,6 +15,7 @@ export declare class PermissionService {
     assignPermissionsToUser(codiceUtente: number, permissions: Permission[]): Promise<void>;
     deleteRole(codiceRuolo: number): Promise<void>;
     getMenus(): Promise<MenuEntity[]>;
+    getGroupsWithMenus(): Promise<GroupWithMenusEntity[]>;
     getUserRolesAndGrants(codiceUtente: number): Promise<{
         abilitazioni: AbilitazioneMenu[];
         ruoli: Role[];

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

@@ -213,6 +213,50 @@ let PermissionService = class PermissionService {
             }
         });
     }
+    getGroupsWithMenus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const query = `
+                SELECT
+                    M.CODMNU AS codice_menu,
+                    M.DESMNU AS descrizione_menu,
+                    M.CODGRP AS codice_gruppo,
+                    G.DESGRP AS descrizione_gruppo,
+                    M.ICON AS icona,
+                    M.CODTIP AS tipo,
+                    M.PAGINA AS pagina,
+                    G.ORDINE AS ordine_gruppo,
+                    M.ORDINE as ordine_menu
+                FROM MENU M
+                LEFT JOIN MENU_GRP G ON M.CODGRP = G.CODGRP
+                WHERE M.FLGENABLED = 1
+                ORDER BY G.CODGRP, M.CODMNU
+            `;
+                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, []);
+                // Process the result to group menus by their respective groups
+                const groupMap = new Map();
+                result.forEach(row => {
+                    const menu = Utilities_1.RestUtilities.convertKeysToCamelCase(row);
+                    const groupKey = menu.codiceGruppo;
+                    if (!groupMap.has(groupKey)) {
+                        groupMap.set(groupKey, {
+                            codiceGruppo: menu.codiceGruppo,
+                            descrizioneGruppo: menu.descrizioneGruppo,
+                            ordineGruppo: menu.ordineGruppo,
+                            menus: []
+                        });
+                    }
+                    groupMap.get(groupKey).menus.push(menu);
+                    groupMap.get(groupKey).menus = groupMap.get(groupKey).menus.sort((a, b) => a.ordineMenu - b.ordineMenu);
+                });
+                let groupsArray = Array.from(groupMap.values()).sort((a, b) => a.ordineGruppo - b.ordineGruppo);
+                return groupsArray;
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
     getUserRolesAndGrants(codiceUtente) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/accessi-module/index.js

@@ -29,8 +29,10 @@ const core_1 = require("@nestjs/core");
 const platform_express_1 = require("@nestjs/platform-express");
 const AccessiModule_1 = require("./AccessiModule");
 const SwaggerConfig_1 = require("./swagger/SwaggerConfig");
+const Logger_1 = require("../Logger");
 function initializeAccessiModule(app, options) {
     return __awaiter(this, void 0, void 0, function* () {
+        const logger = new Logger_1.Logger("initializeAccessiModule");
         try {
             // Creiamo un'istanza Express separata per NestJS
             const nestExpressInstance = new platform_express_1.ExpressAdapter(app);
@@ -44,30 +46,9 @@ function initializeAccessiModule(app, options) {
             });
             (0, SwaggerConfig_1.setupSwagger)(nestApp);
             yield nestApp.init();
-            /*
-                console.log('Verifica API NestJS registrate:');
-            const server = nestApp.getHttpAdapter().getInstance();
-            const router = server.router;
-    
-    
-            const availableRoutes: [] = router.stack
-                .map(layer => {
-                    if (layer.route) {
-                        return {
-                            route: {
-                                path: layer.route?.path,
-                                method: layer.route?.stack[0].method,
-                            },
-                        };
-                    }
-                })
-                .filter(item => item !== undefined);
-            console.log(availableRoutes);
-            
-            */
         }
         catch (error) {
-            console.error("Errore in initialize AccessiModule:", error);
+            logger.error("Errore in initialize AccessiModule:", error);
             throw error;
         }
     });

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

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSwagger = setupSwagger;
 const swagger_1 = require("@nestjs/swagger");
-const swaggerPath = "swagger/accessi";
-const swaggerJsonPath = `${swaggerPath}-json`;
+const Logger_1 = require("../../Logger");
 function setupSwagger(app) {
+    var _a, _b;
+    const logger = new Logger_1.Logger("SwaggerConfig");
+    const swaggerPath = "swagger/accessi";
+    const swaggerJsonPath = `${swaggerPath}-json`;
     const config = new swagger_1.DocumentBuilder()
         .setTitle("Accessi API")
         .setDescription("API per la gestione degli accessi utenti")
@@ -14,9 +17,9 @@ function setupSwagger(app) {
     const document = swagger_1.SwaggerModule.createDocument(app, config);
     swagger_1.SwaggerModule.setup(swaggerPath, app, document);
     app.use(`/${swaggerJsonPath}`, (_, res) => {
-        res.setHeader('Content-Type', 'application/json');
+        res.setHeader("Content-Type", "application/json");
         res.send(document);
     });
-    console.log("Swagger disponibile su: http://localhost:3000/" + swaggerPath);
-    console.log(`Swagger JSON disponibile su: http://localhost:3000/${swaggerJsonPath}`);
+    let port = ((_b = (_a = app.getHttpServer()) === null || _a === void 0 ? void 0 : _a.address) === null || _b === void 0 ? void 0 : _b.port) || 3000;
+    logger.info(`Swagger disponibile su: http://localhost:${port}/${swaggerPath}`);
 }

package/dist/tests/contract/test.js

@@ -58,7 +58,7 @@ function testDocumentGenerator() {
         };
         try {
             const output = yield generator.generateDocument(params);
-            console.log("Document generated successfully:", output);
+            //console.log("Document generated successfully:", output);
         }
         catch (error) {
             console.error("Error generating document:", error);

package/package.json

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