emilsoftware-utilities 1.3.97 → 1.3.99

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

@@ -0,0 +1,29 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Abilitazione"), exports);
+__exportStar(require("./AbilitazioneMenu"), exports);
+__exportStar(require("./AssignPermissionsToUserRequest"), exports);
+__exportStar(require("./AssignRolesToUserRequest"), exports);
+__exportStar(require("./FiltriUtente"), exports);
+__exportStar(require("./LoginRequest"), exports);
+__exportStar(require("./LoginResult"), exports);
+__exportStar(require("./Permission"), exports);
+__exportStar(require("./Role"), exports);
+__exportStar(require("./StatoRegistrazione"), exports);
+__exportStar(require("./TipoAbilitazione"), exports);
+__exportStar(require("./TokenResult"), exports);
+__exportStar(require("./User"), exports);

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

@@ -1,16 +1,17 @@
 import { AccessiOptions } from "../../AccessiModule";
-import { IAuthService, ILoginResult, LoginRequest } from "./IAuthService";
 import { UserService } from "../UserService/UserService";
 import { PermissionService } from "../PermissionService/PermissionService";
-export declare class AuthService implements IAuthService {
+import { LoginRequest } from "../../Dtos/LoginRequest";
+import { LoginResult } from "../../Dtos/LoginResult";
+export declare class AuthService {
     private userService;
     private permissionService;
     private readonly accessiOptions;
     constructor(userService: UserService, permissionService: PermissionService, accessiOptions: AccessiOptions);
-    login(request: LoginRequest): Promise<ILoginResult>;
+    login(request: LoginRequest): Promise<LoginResult>;
     setPassword(codiceUtente: string, nuovaPassword: string): Promise<any>;
     verifyPassword(codiceUtente: string, passwordCifrata: string): Promise<boolean>;
-    getAdminUser(): ILoginResult;
-    getDemoUser(): ILoginResult;
+    getAdminUser(): Promise<LoginResult>;
+    getDemoUser(): LoginResult;
     confirmResetPassword(token: string, newPassword: string): Promise<void>;
 }

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

@@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthService = void 0;
 const Orm_1 = require("../../../Orm");
 const Utilities_1 = require("../../../Utilities");
-const StatoRegistrazione_1 = require("../../models/StatoRegistrazione");
+const StatoRegistrazione_1 = require("../../Dtos/StatoRegistrazione");
 const common_1 = require("@nestjs/common");
 const UserService_1 = require("../UserService/UserService");
 const PermissionService_1 = require("../PermissionService/PermissionService");
@@ -36,13 +36,14 @@ let AuthService = class AuthService {
     }
     login(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.accessiOptions.mockDemoUser && request.username.toLowerCase() === "demo")
+            //TODO: gestione campi esterni con variabili di ambiente
+            if (this.accessiOptions.mockDemoUser && request.email.toLowerCase() === "demo")
                 return this.getDemoUser();
-            if (this.accessiOptions.mockDemoUser && request.username.toLowerCase() === "admin")
+            if (this.accessiOptions.mockDemoUser && request.email.toLowerCase() === "admin")
                 return this.getAdminUser();
             const passwordCifrata = Utilities_1.CryptUtilities.encrypt(request.password, this.accessiOptions.encryptionKey);
             // Recupera l'utente dal database
-            const utente = yield this.userService.getUserByUsername(request.username.toLowerCase());
+            const utente = yield this.userService.getUserByEmail(request.email.toLowerCase());
             if (!utente)
                 throw new Error("Nome utente o password errata!");
             // Verifica lo stato della registrazione
@@ -62,10 +63,17 @@ let AuthService = class AuthService {
             const isPasswordValid = yield this.verifyPassword(utente.codiceUtente, passwordCifrata);
             if (!isPasswordValid)
                 throw new Error("Nome utente o password errata!");
+            const today = new Date();
+            const targetDate = new Date(utente.dataScadenzaPassword);
+            if (today >= targetDate) {
+                throw new Error("Password scaduta!");
+            }
             // Recupera le abilitazioni
             const abilitazioni = yield this.permissionService.getAbilitazioniMenu(utente.codiceUtente, utente.flagSuper);
             // Recupera i filtri
             const filtri = yield this.userService.getUserFilters(utente.codiceUtente);
+            const updateLastAccessDateQuery = "UPDATE UTENTI SET DATLASTLOGIN = CURRENT_TIMESTAMP WHERE CODUTE = ?";
+            yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, updateLastAccessDateQuery, [utente.codiceUtente]);
             return { utente, filtri, abilitazioni };
         });
     }
@@ -90,30 +98,36 @@ let AuthService = class AuthService {
         });
     }
     getAdminUser() {
-        return {
-            utente: {
-                codiceUtente: "6789",
-                username: "admin",
-                statoRegistrazione: StatoRegistrazione_1.StatoRegistrazione.CONF,
-                cognome: "Admin",
-                nome: "Admin",
-                flagGdpr: true,
-                avatar: "/path/to/avatar.jpg",
-                flagDueFattori: false,
-                codiceLingua: "IT",
-                cellulare: "+391234567890",
-                flagSuper: true,
-                paginaDefault: "/home",
-            },
-            filtri: null,
-            abilitazioni: []
-        };
+        return __awaiter(this, void 0, void 0, function* () {
+            const abilitazioni = yield this.permissionService.getAbilitazioniMenu("6789", true);
+            const filtri = yield this.userService.getUserFilters("6789");
+            return {
+                utente: {
+                    codiceUtente: "6789",
+                    email: "admin",
+                    statoRegistrazione: StatoRegistrazione_1.StatoRegistrazione.CONF,
+                    cognome: "Admin",
+                    nome: "Admin",
+                    flagGdpr: true,
+                    avatar: "/path/to/avatar.jpg",
+                    flagDueFattori: false,
+                    codiceLingua: "IT",
+                    cellulare: "+391234567890",
+                    flagSuper: true,
+                    paginaDefault: "/home",
+                    roles: [],
+                    permissions: []
+                },
+                filtri,
+                abilitazioni
+            };
+        });
     }
     getDemoUser() {
         return {
             utente: {
                 codiceUtente: "12345",
-                username: "jdoe",
+                email: "jdoe",
                 statoRegistrazione: StatoRegistrazione_1.StatoRegistrazione.CONF,
                 cognome: "Doe",
                 nome: "John",
@@ -124,6 +138,8 @@ let AuthService = class AuthService {
                 cellulare: "+391234567890",
                 flagSuper: false,
                 paginaDefault: "/home",
+                roles: [],
+                permissions: []
             },
             filtri: null,
             abilitazioni: []

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

@@ -1,6 +1,5 @@
 import { AccessiOptions } from '../../AccessiModule';
-import { IEmailService } from './IEmailService';
-export declare class EmailService implements IEmailService {
+export declare class EmailService {
     private readonly accessiOptions;
     constructor(accessiOptions: AccessiOptions);
     sendAccountUpdateEmail(email: string, message: string): Promise<void>;

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

@@ -29,7 +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");
+const StatoRegistrazione_1 = require("../../Dtos/StatoRegistrazione");
 let EmailService = class EmailService {
     constructor(accessiOptions) {
         this.accessiOptions = accessiOptions;

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

@@ -1,11 +1,18 @@
 import { AccessiOptions } from "../../AccessiModule";
-import { IAbilitazioneMenu } from "../UserService/IUserService";
-import { IPermissionService, IRoleWithMenus } from "./IPermissionService";
-export declare class PermissionService implements IPermissionService {
+import { Permission } from "../../Dtos";
+import { AbilitazioneMenu } from "../../Dtos/AbilitazioneMenu";
+import { MenuEntity } from "../../Dtos/GetMenusResponse";
+import { Role } from "../../Dtos/Role";
+export declare class PermissionService {
     private readonly accessiOptions;
     constructor(accessiOptions: AccessiOptions);
     addAbilitazioni(codiceUtente: string, menuAbilitazioni: any[]): Promise<void>;
     resetAbilitazioni(codiceUtente: string): Promise<void>;
-    getRolesWithMenus(): Promise<IRoleWithMenus[]>;
-    getAbilitazioniMenu(codiceUtente: string, isSuperAdmin: boolean): Promise<IAbilitazioneMenu[]>;
+    updateOrInsertRole(role: Role, codiceRuolo?: string): Promise<void>;
+    getRolesWithMenus(): Promise<Role[]>;
+    getAbilitazioniMenu(codiceUtente: string, isSuperAdmin: boolean): Promise<AbilitazioneMenu[]>;
+    assignRolesToUser(codiceUtente: string, roles: string[]): Promise<void>;
+    assignPermissionsToUser(codiceUtente: string, permissions: Permission[]): Promise<void>;
+    deleteRole(codiceRuolo: number): Promise<void>;
+    getMenus(): Promise<MenuEntity[]>;
 }

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

@@ -59,6 +59,33 @@ let PermissionService = class PermissionService {
             }
         });
     }
+    updateOrInsertRole(role_1) {
+        return __awaiter(this, arguments, void 0, function* (role, codiceRuolo = null) {
+            try {
+                // creazione nuovo ruolo
+                if (!codiceRuolo) {
+                    let createRoleQuery = `INSERT INTO RUOLI (DESRUO) VALUES (?) RETURNING CODRUO`;
+                    let result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, createRoleQuery, [role.descrizioneRuolo]);
+                    codiceRuolo = result[0].CODRUO;
+                }
+                else 
+                // aggiornamento ruolo esistente
+                {
+                    let updateRoleQuery = `UPDATE RUOLI SET DESRUO = ? WHERE CODRUO = ?`;
+                    yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, updateRoleQuery, [role.descrizioneRuolo, codiceRuolo]);
+                    let deleteRoleMenuQuery = `DELETE FROM RUOLI_MNU WHERE CODRUO = ?`;
+                    yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, deleteRoleMenuQuery, [codiceRuolo]);
+                }
+                let createRoleMenuQuery = `INSERT INTO RUOLI_MNU (CODRUO, CODMNU, TIPABI) VALUES (?, ?, ?)`;
+                for (let menu of role.menu) {
+                    yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, createRoleMenuQuery, [codiceRuolo, menu.codiceMenu, menu.tipoAbilitazione]);
+                }
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
     getRolesWithMenus() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -76,7 +103,6 @@ let PermissionService = class PermissionService {
             `;
                 let result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, []);
                 result = result.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
-                console.log("RESULT: ", result);
                 const ruoliMap = new Map();
                 for (const row of result) {
                     const { codiceRuolo, descrizioneRuolo, codiceMenu, descrizioneMenu, tipoAbilitazione } = row;
@@ -107,7 +133,7 @@ let PermissionService = class PermissionService {
             const query = isSuperAdmin
                 ? `SELECT 
                     M.CODMNU AS codice_menu, 
-                    10 AS tipo_abilitazione, 
+                    30 AS tipo_abilitazione, 
                     M.DESMNU AS descrizione_menu, 
                     G.DESGRP AS descrizione_gruppo, 
                     G.CODGRP AS codice_gruppo, 
@@ -117,7 +143,8 @@ let PermissionService = class PermissionService {
                 FROM MENU M 
                 INNER JOIN MENU_GRP G ON G.CODGRP = M.CODGRP 
                 WHERE M.FLGENABLED = 1 AND G.FLGENABLED = 1`
-                : `SELECT 
+                : `WITH AbilitazioniTotali AS (
+                SELECT 
                     A.CODMNU AS codice_menu, 
                     A.TIPABI AS tipo_abilitazione, 
                     M.DESMNU AS descrizione_menu, 
@@ -129,11 +156,122 @@ let PermissionService = class PermissionService {
                 FROM ABILITAZIONI A 
                 INNER JOIN MENU M ON A.CODMNU = M.CODMNU 
                 INNER JOIN MENU_GRP G ON G.CODGRP = M.CODGRP
-                WHERE A.CODUTE = ? AND M.FLGENABLED = 1 AND G.FLGENABLED = 1`;
-            return yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, isSuperAdmin ? [] : [codiceUtente])
+                WHERE A.CODUTE = ? AND M.FLGENABLED = 1 AND G.FLGENABLED = 1
+    
+                UNION ALL
+    
+                SELECT 
+                    RM.CODMNU AS codice_menu, 
+                    5 AS tipo_abilitazione,
+                    M.DESMNU AS descrizione_menu, 
+                    G.DESGRP AS descrizione_gruppo, 
+                    G.CODGRP AS codice_gruppo, 
+                    M.ICON AS icona, 
+                    M.CODTIP AS tipo, 
+                    M.PAGINA AS pagina
+                FROM RUOLI_UTENTI RU
+                INNER JOIN RUOLI R ON RU.CODRUL = R.CODRUL
+                INNER JOIN RUOLI_MENU RM ON R.CODRUL = RM.CODRUL
+                INNER JOIN MENU M ON RM.CODMNU = M.CODMNU
+                INNER JOIN MENU_GRP G ON G.CODGRP = M.CODGRP
+                WHERE RU.CODUTE = ? AND M.FLGENABLED = 1 AND G.FLGENABLED = 1
+            )
+            SELECT codice_menu, tipo_abilitazione, descrizione_menu, descrizione_gruppo, codice_gruppo, icona, tipo, pagina
+            FROM (
+                SELECT *, ROW_NUMBER() OVER (PARTITION BY codice_menu ORDER BY tipo_abilitazione DESC) AS row_num
+                FROM AbilitazioniTotali
+            ) AS Ranked
+            WHERE row_num = 1`;
+            const queryParams = isSuperAdmin ? [] : [codiceUtente, codiceUtente];
+            return yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, queryParams)
                 .then(results => results.map(Utilities_1.RestUtilities.convertKeysToCamelCase));
         });
     }
+    assignRolesToUser(codiceUtente, roles) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const userExistsQuery = `SELECT COUNT(*) FROM UTENTI WHERE CODUTE = ?`;
+                let result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, userExistsQuery, [codiceUtente]);
+                if (result[0].COUNT === 0) {
+                    throw new Error(`L'utente con codice ${codiceUtente} non esiste.`);
+                }
+                const deleteQuery = `DELETE FROM UTENTI_RUOLI WHERE CODUTE = ?`;
+                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, deleteQuery, [codiceUtente]);
+                const insertQuery = `INSERT INTO UTENTI_RUOLI (CODUTE, CODRUO) VALUES (?, ?)`;
+                for (const codiceRuolo of roles) {
+                    yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, insertQuery, [codiceUtente, codiceRuolo]);
+                }
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    assignPermissionsToUser(codiceUtente, permissions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const userExistsQuery = `SELECT COUNT(*) FROM UTENTI WHERE CODUTE = ?`;
+                let result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, userExistsQuery, [codiceUtente]);
+                if (result[0].COUNT === 0) {
+                    throw new Error(`L'utente con codice ${codiceUtente} non esiste.`);
+                }
+                const deleteQuery = `DELETE FROM ABILITAZIONI WHERE CODUTE = ?`;
+                yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, deleteQuery, [codiceUtente]);
+                const insertQuery = `INSERT INTO ABILITAZIONI (CODUTE, CODMNU, TIPABI) VALUES (?, ?, ?)`;
+                for (const permission of permissions) {
+                    yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, insertQuery, [codiceUtente, permission.codiceMenu, permission.tipoAbilitazione]);
+                }
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    deleteRole(codiceRuolo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const existsQuery = `SELECT COUNT(*) FROM RUOLI WHERE CODRUO = ?`;
+                let result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, existsQuery, [codiceRuolo]);
+                if (result[0].COUNT === 0) {
+                    throw new Error(`Il ruolo con codice ${codiceRuolo} non esiste.`);
+                }
+                const deleteRoleMenusQuery = `DELETE FROM RUOLI_MNU WHERE CODRUO = ?`;
+                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, deleteRoleMenusQuery, [codiceRuolo]);
+                const deleteRoleUsersQuery = `DELETE FROM UTENTI_RUOLI WHERE CODRUO = ?`;
+                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, deleteRoleUsersQuery, [codiceRuolo]);
+                const deleteRoleQuery = `DELETE FROM RUOLI WHERE CODRUO = ?`;
+                yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, deleteRoleQuery, [codiceRuolo]);
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    getMenus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const query = `
+                SELECT 
+                    M.CODMNU AS codiceMenu, 
+                    M.DESMNU AS descrizioneMenu,
+                    M.CODGRP AS codiceGruppo,
+                    G.DESGRP AS descrizioneGruppo,
+                    M.ICON AS icona,
+                    M.CODTIP AS tipo,
+                    M.PAGINA AS pagina
+                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, []);
+                return result.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
 };
 exports.PermissionService = PermissionService;
 exports.PermissionService = PermissionService = __decorate([

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

@@ -1,21 +1,22 @@
 import { AccessiOptions } from "../../AccessiModule";
-import { UserQueryResult } from "../../models/QueryResults/UserQueryResult";
-import { StatoRegistrazione } from "../../models/StatoRegistrazione";
-import { IFiltriUtente, IUser, IUserService } from "./IUserService";
+import { StatoRegistrazione } from "../../Dtos/StatoRegistrazione";
 import { EmailService } from "../EmailService/EmailService";
-export declare class UserService implements IUserService {
+import { User } from "../../Dtos/User";
+import { FiltriUtente } from "../../Dtos/FiltriUtente";
+import { GetUsersResponse } from "../../Dtos/GetUsersResponse";
+export declare class UserService {
     private readonly accessiOptions;
     private readonly emailService;
     constructor(accessiOptions: AccessiOptions, emailService: EmailService);
-    getUsers(): Promise<UserQueryResult[]>;
-    getCodiceUtenteByUsername(username: string): Promise<{
+    getUsers(): Promise<GetUsersResponse[]>;
+    getCodiceUtenteByEmail(email: string): Promise<{
         codiceUtente: string;
     }>;
-    getUserByUsername(username: string): Promise<IUser | null>;
-    getUserFilters(codiceUtente: string): Promise<IFiltriUtente[]>;
-    register(registrationData: IUser): Promise<void>;
+    getUserByEmail(email: string): Promise<User | null>;
+    getUserFilters(codiceUtente: string): Promise<FiltriUtente[]>;
+    register(registrationData: User): Promise<void>;
     setRegistrazioneConfermata(userKey: string): Promise<void>;
-    updateUser(user: UserQueryResult): Promise<void>;
+    updateUser(codiceUtente: string, user: User): Promise<void>;
     deleteUser(codiceCliente: string): Promise<void>;
     setGdpr(codiceUtente: string): Promise<any>;
     setStatoRegistrazione(statoRegistrazione: StatoRegistrazione, codiceUtente: string): Promise<any>;

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

@@ -26,7 +26,7 @@ const common_1 = require("@nestjs/common");
 const autobind_1 = require("../../../autobind");
 const Orm_1 = require("../../../Orm");
 const Utilities_1 = require("../../../Utilities");
-const StatoRegistrazione_1 = require("../../models/StatoRegistrazione");
+const StatoRegistrazione_1 = require("../../Dtos/StatoRegistrazione");
 const EmailService_1 = require("../EmailService/EmailService");
 let UserService = class UserService {
     constructor(accessiOptions, emailService) {
@@ -39,7 +39,7 @@ let UserService = class UserService {
                 const query = ` 
             SELECT  
                 U.CODUTE as codice_utente, 
-                U.USRNAME as username, 
+                U.USRNAME as email, 
                 U.FLGGDPR as flag_gdpr, 
                 U.DATGDPR as data_gdpr, 
                 U.DATINS as data_inserimento, 
@@ -66,11 +66,11 @@ let UserService = class UserService {
             }
         });
     }
-    getCodiceUtenteByUsername(username) {
+    getCodiceUtenteByEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const query = `SELECT CODUTE as codice_utente FROM UTENTI WHERE LOWER(USRNAME) = ?`;
-                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [username.trim().toLowerCase()]);
+                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [email.trim().toLowerCase()]);
                 return result.map(Utilities_1.RestUtilities.convertKeysToCamelCase)[0];
             }
             catch (error) {
@@ -78,13 +78,14 @@ let UserService = class UserService {
             }
         });
     }
-    getUserByUsername(username) {
+    getUserByEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
             const query = `
             SELECT 
                 U.CODUTE AS codice_utente, 
-                U.USRNAME AS username, 
+                U.USRNAME AS email, 
                 U.FLGGDPR AS flag_gdpr,
+                U.DATSCAPWD as data_scadenza_password,
                 U.STAREG AS stato_registrazione, 
                 C.COGNOME AS cognome, 
                 C.NOME AS nome, 
@@ -98,7 +99,7 @@ let UserService = class UserService {
             INNER JOIN UTENTI_CONFIG C ON C.CODUTE = U.CODUTE
             WHERE LOWER(U.USRNAME) = ?
         `;
-            const utenti = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [username])
+            const utenti = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [email])
                 .then(results => results.map(Utilities_1.RestUtilities.convertKeysToCamelCase));
             return utenti.length > 0 ? utenti[0] : null;
         });
@@ -125,16 +126,20 @@ let UserService = class UserService {
     register(registrationData) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const existingUser = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "SELECT CODUTE FROM UTENTI WHERE USRNAME = ?", [registrationData.username]);
+                const existingUser = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, "SELECT CODUTE FROM UTENTI WHERE USRNAME = ?", [registrationData.email]);
                 if (existingUser.length > 0) {
-                    throw new Error("Utente già esistente!");
+                    throw new Error("Questa e-mail è già stata utilizzata!");
                 }
                 const queryUtenti = `INSERT INTO UTENTI (USRNAME, STAREG) VALUES (?,?) RETURNING CODUTE`;
-                const paramsUtenti = [registrationData.username, StatoRegistrazione_1.StatoRegistrazione.INVIO];
+                const paramsUtenti = [registrationData.email, 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) VALUES (?,?,?,?)`;
                 const paramsUtentiConfig = [codiceUtente, registrationData.cognome, registrationData.nome, registrationData.codiceLingua];
                 yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, queryUtentiConfig, paramsUtentiConfig);
+                // TODO: Aggiungere la gestione dei ruoli
+                //registrationData.roles
+                // TODO: Aggiungere la gestione delle abilitazioni
+                //registrationData.permissions
             }
             catch (error) {
                 throw error;
@@ -156,22 +161,22 @@ let UserService = class UserService {
             }
         });
     }
-    updateUser(user) {
+    updateUser(codiceUtente, user) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (!user.codiceUtente)
+                if (!codiceUtente)
                     throw new Error("Impossibile aggiornare senza codice utente.");
                 const queryUtenti = `
                 UPDATE UTENTI 
-                SET usrname = ?, flggdpr = ?, datgdpr=?, datins=?, datscapwd=?, stareg=? 
+                SET usrname = ?, flggdpr = ?, stareg=? 
                 WHERE CODUTE = ?`;
-                const paramsUtenti = [user.username, user.flagGdpr, user.dataGdpr, user.dataInserimento, user.dataScadenzaPassword, user.statoRegistrazione, user.codiceUtente];
+                const paramsUtenti = [user.email, user.flagGdpr, user.statoRegistrazione, codiceUtente];
                 yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, queryUtenti, paramsUtenti);
                 const queryUtentiConfig = `
                 UPDATE UTENTI_CONFIG 
                 SET cognome = ?, nome = ?, avatar=?, flg2fatt=?, codlingua=?, cellulare=?, flgsuper=?, pagdef=?, json_metadata=? 
                 WHERE CODUTE = ?`;
-                const paramsUtentiConfig = [user.cognome, user.nome, user.avatar, user.flagDueFattori, user.codiceLingua, user.cellulare, user.flagSuper, user.pagDef, user.jsonMetadata, user.codiceUtente];
+                const paramsUtentiConfig = [user.cognome, user.nome, user.avatar, user.flagDueFattori, user.codiceLingua, user.cellulare, user.flagSuper, user.paginaDefault, user.jsonMetadata, codiceUtente];
                 yield Orm_1.Orm.execute(this.accessiOptions.databaseOptions, queryUtentiConfig, paramsUtentiConfig);
             }
             catch (error) {

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

@@ -2,6 +2,4 @@ import { Application } from "express";
 import { AccessiOptions } from "./AccessiModule";
 export declare function initializeAccessiModule(app: Application, options: AccessiOptions): Promise<void>;
 export { AccessiModule } from "./AccessiModule";
-export { StatoRegistrazione } from "./models/StatoRegistrazione";
-export { ILoginResult } from "./Services/AuthService/IAuthService";
-export { IRoleWithMenus } from "./Services/PermissionService/IPermissionService";
+export * from "./Dtos";

package/dist/accessi-module/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -9,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StatoRegistrazione = exports.AccessiModule = void 0;
+exports.AccessiModule = void 0;
 exports.initializeAccessiModule = initializeAccessiModule;
 const core_1 = require("@nestjs/core");
 const platform_express_1 = require("@nestjs/platform-express");
@@ -30,23 +44,27 @@ function initializeAccessiModule(app, options) {
             });
             (0, SwaggerConfig_1.setupSwagger)(nestApp);
             yield nestApp.init();
-            console.log('Verifica API NestJS registrate:');
+            /*
+                console.log('Verifica API NestJS registrate:');
             const server = nestApp.getHttpAdapter().getInstance();
             const router = server.router;
-            const availableRoutes = router.stack
+    
+    
+            const availableRoutes: [] = router.stack
                 .map(layer => {
-                var _a, _b;
-                if (layer.route) {
-                    return {
-                        route: {
-                            path: (_a = layer.route) === null || _a === void 0 ? void 0 : _a.path,
-                            method: (_b = layer.route) === null || _b === void 0 ? void 0 : _b.stack[0].method,
-                        },
-                    };
-                }
-            })
+                    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);
@@ -56,5 +74,4 @@ function initializeAccessiModule(app, options) {
 }
 var AccessiModule_2 = require("./AccessiModule");
 Object.defineProperty(exports, "AccessiModule", { enumerable: true, get: function () { return AccessiModule_2.AccessiModule; } });
-var StatoRegistrazione_1 = require("./models/StatoRegistrazione");
-Object.defineProperty(exports, "StatoRegistrazione", { enumerable: true, get: function () { return StatoRegistrazione_1.StatoRegistrazione; } });
+__exportStar(require("./Dtos"), exports);

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupSwagger = setupSwagger;
 const swagger_1 = require("@nestjs/swagger");
+const swaggerUrl = "swagger/accessi";
 function setupSwagger(app) {
     const config = new swagger_1.DocumentBuilder()
         .setTitle("Accessi API")
@@ -10,6 +11,6 @@ function setupSwagger(app) {
         .addBearerAuth() // Per abilitare l'autenticazione JWT
         .build();
     const document = swagger_1.SwaggerModule.createDocument(app, config);
-    swagger_1.SwaggerModule.setup("swagger", app, document);
-    console.log("✅ Swagger disponibile su: http://localhost:3000/swagger");
+    swagger_1.SwaggerModule.setup(swaggerUrl, app, document);
+    console.log("✅ Swagger disponibile su: http://localhost:3000/" + swaggerUrl);
 }

package/dist/index.d.ts

@@ -5,6 +5,6 @@ import { Orm } from "./Orm";
 import { DateUtilities, RestUtilities, DatabaseUtilities, StatusCode } from "./Utilities";
 import { autobind } from "./autobind";
 import { DocumentGenerator } from "./ContractGenerator";
-export { AccessiModule, StatoRegistrazione, ILoginResult, IRoleWithMenus } from "./accessi-module";
+export * from "./accessi-module";
 export * from "es-node-firebird";
 export { autobind, ExecutionTimeLogger, Logger, LogLevels, Orm, DateUtilities, RestUtilities, DatabaseUtilities, DatabaseUpdater, StatusCode, DocumentGenerator };