emilsoftware-utilities 1.3.98 → 1.3.99

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

@@ -1,22 +1,22 @@
 import { AccessiOptions } from "../../AccessiModule";
-import { UserQueryResult } from "../../models/QueryResults/UserQueryResult";
 import { StatoRegistrazione } from "../../Dtos/StatoRegistrazione";
 import { EmailService } from "../EmailService/EmailService";
 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<User | null>;
+    getUserByEmail(email: string): Promise<User | null>;
     getUserFilters(codiceUtente: string): Promise<FiltriUtente[]>;
     register(registrationData: User): Promise<void>;
     setRegistrazioneConfermata(userKey: string): Promise<void>;
-    updateUser(user: User): 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

@@ -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 = ?, stareg=? 
                 WHERE CODUTE = ?`;
-                const paramsUtenti = [user.username, user.flagGdpr, 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.paginaDefault, 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/index.d.ts

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

package/dist/index.js

@@ -14,7 +14,7 @@ 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 });
-exports.DocumentGenerator = exports.StatusCode = exports.DatabaseUpdater = exports.DatabaseUtilities = exports.RestUtilities = exports.DateUtilities = exports.Orm = exports.LogLevels = exports.Logger = exports.ExecutionTimeLogger = exports.autobind = exports.RoleWithMenus = void 0;
+exports.DocumentGenerator = exports.StatusCode = exports.DatabaseUpdater = exports.DatabaseUtilities = exports.RestUtilities = exports.DateUtilities = exports.Orm = exports.LogLevels = exports.Logger = exports.ExecutionTimeLogger = exports.autobind = void 0;
 const DatabaseUpdater_1 = require("./DatabaseUpdater");
 Object.defineProperty(exports, "DatabaseUpdater", { enumerable: true, get: function () { return DatabaseUpdater_1.DatabaseUpdater; } });
 const ExecutionTimeLogger_1 = require("./ExecutionTimeLogger");
@@ -33,7 +33,5 @@ const autobind_1 = require("./autobind");
 Object.defineProperty(exports, "autobind", { enumerable: true, get: function () { return autobind_1.autobind; } });
 const ContractGenerator_1 = require("./ContractGenerator");
 Object.defineProperty(exports, "DocumentGenerator", { enumerable: true, get: function () { return ContractGenerator_1.DocumentGenerator; } });
-var RoleWithMenus_1 = require("./accessi-module/Dtos/RoleWithMenus");
-Object.defineProperty(exports, "RoleWithMenus", { enumerable: true, get: function () { return RoleWithMenus_1.RoleWithMenus; } });
 __exportStar(require("./accessi-module"), exports);
 __exportStar(require("es-node-firebird"), exports);

package/package.json

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

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

@@ -1,6 +0,0 @@
-import { MenuItem } from './MenuItem';
-export declare class RoleWithMenus {
-    codiceRuolo?: string;
-    descrizioneRuolo: string;
-    menu: MenuItem[];
-}

package/dist/accessi-module/models/QueryResults/MenuAbilitazioniResult.d.ts

@@ -1,11 +0,0 @@
-import { TipoAbilitazione } from "../../Dtos/TipoAbilitazione";
-export interface MenuAbilitazioniResult {
-    codiceMnu: string;
-    tipoAbilitazione: TipoAbilitazione;
-    descrizioneMnu: string;
-    descrizioneGrp: string;
-    codiceGrp: string;
-    icon?: string;
-    codiceTipo: string;
-    pagina: string;
-}

package/dist/accessi-module/models/QueryResults/MenuAbilitazioniResult.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/accessi-module/models/QueryResults/UserQueryResult.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });