emilsoftware-utilities 1.3.126 → 1.3.128

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

@@ -29,6 +29,7 @@ export interface ExtensionFieldsOptions {
 }
 export interface AccessiOptions {
     databaseOptions: Options;
+    confirmationEmailUrl: string;
     confirmationEmailReturnUrl: string;
     encryptionKey: string;
     mockDemoUser: boolean;

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

@@ -41,13 +41,7 @@ let EmailController = EmailController_1 = class EmailController {
     sendPasswordResetEmail(request, sendResetPasswordData, res) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                let protocol = request["protocol"];
-                let host = request.headers["host"];
-                if (!protocol || !host) {
-                    throw new Error("Impossibile procedere: protocollo e host non impostati negli header della richiesta.");
-                }
-                let confirmationEmailPrefix = `${protocol}://${host}`;
-                yield this.emailService.sendPasswordResetEmail(sendResetPasswordData.email, confirmationEmailPrefix);
+                yield this.emailService.sendPasswordResetEmail(sendResetPasswordData.email);
                 return Utilities_1.RestUtilities.sendOKMessage(res, "L'email di reset è stata inoltrata al destinatario.");
             }
             catch (error) {

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

@@ -8,6 +8,7 @@ export declare class UserController {
     private readonly userService;
     private readonly emailService;
     private readonly options;
+    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>>>;

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

@@ -33,11 +33,13 @@ const GetUsersResponse_1 = require("../Dtos/GetUsersResponse");
 const Dtos_1 = require("../Dtos");
 const RegisterResponse_1 = require("../Dtos/RegisterResponse");
 const RegisterRequest_1 = require("../Dtos/RegisterRequest");
+const Logger_1 = require("../../Logger");
 let UserController = UserController_1 = class UserController {
     constructor(userService, emailService, options) {
         this.userService = userService;
         this.emailService = emailService;
         this.options = options;
+        this.logger = new Logger_1.Logger(UserController_1.name);
     }
     serveResetPasswordPage(res, token) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,7 +53,8 @@ let UserController = UserController_1 = class UserController {
                 return Utilities_1.RestUtilities.sendBaseResponse(res, users);
             }
             catch (error) {
-                return Utilities_1.RestUtilities.sendInvalidCredentials(res);
+                this.logger.error('Errore durante il recupero degli utenti', error);
+                return Utilities_1.RestUtilities.sendErrorMessage(res, error, UserController_1.name);
             }
         });
     }
@@ -71,14 +74,8 @@ let UserController = UserController_1 = class UserController {
     register(request, registrationData, res) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const protocol = request['protocol'];
-                const host = request.headers['host'];
-                if (!protocol || !host) {
-                    throw new Error("Impossibile procedere: protocollo e host non impostati negli header della richiesta.");
-                }
                 const codiceUtente = yield this.userService.register(registrationData);
-                const confirmationEmailPrefix = `${protocol}://${host}`;
-                yield this.emailService.sendPasswordResetEmail(registrationData.email, confirmationEmailPrefix);
+                yield this.emailService.sendPasswordResetEmail(registrationData.email);
                 return Utilities_1.RestUtilities.sendBaseResponse(res, codiceUtente);
             }
             catch (error) {

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

@@ -1,5 +1,11 @@
 import { BaseResponse } from './BaseResponse';
 import { UserDto } from './UserDto';
+import { UserGrantsDto } from './UserGrantsDto';
+export declare class GetUsersResult {
+    utente?: UserDto;
+    userGrants?: UserGrantsDto;
+    extensionFields?: any;
+}
 export declare class GetUsersResponse extends BaseResponse {
-    Result: UserDto[];
+    Result: GetUsersResult[];
 }

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

@@ -9,18 +9,38 @@ 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.GetUsersResponse = void 0;
+exports.GetUsersResponse = exports.GetUsersResult = void 0;
 const swagger_1 = require("@nestjs/swagger");
 const class_validator_1 = require("class-validator");
 const class_transformer_1 = require("class-transformer");
 const BaseResponse_1 = require("./BaseResponse");
 const UserDto_1 = require("./UserDto");
+const UserGrantsDto_1 = require("./UserGrantsDto");
+class GetUsersResult {
+}
+exports.GetUsersResult = GetUsersResult;
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: 'Dati utente', type: UserDto_1.UserDto }),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => UserDto_1.UserDto),
+    __metadata("design:type", UserDto_1.UserDto)
+], GetUsersResult.prototype, "utente", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: 'Abilitazioni e ruoli utente', type: UserGrantsDto_1.UserGrantsDto }),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => UserGrantsDto_1.UserGrantsDto),
+    __metadata("design:type", UserGrantsDto_1.UserGrantsDto)
+], GetUsersResult.prototype, "userGrants", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({ description: 'Extension Fields', type: Object }),
+    __metadata("design:type", Object)
+], GetUsersResult.prototype, "extensionFields", void 0);
 class GetUsersResponse extends BaseResponse_1.BaseResponse {
 }
 exports.GetUsersResponse = GetUsersResponse;
 __decorate([
-    (0, swagger_1.ApiProperty)({ type: [UserDto_1.UserDto] }),
+    (0, swagger_1.ApiProperty)({ type: [GetUsersResult] }),
     (0, class_validator_1.ValidateNested)({ each: true }),
-    (0, class_transformer_1.Type)(() => UserDto_1.UserDto),
+    (0, class_transformer_1.Type)(() => GetUsersResult),
     __metadata("design:type", Array)
 ], GetUsersResponse.prototype, "Result", void 0);

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

@@ -4,5 +4,5 @@ export declare class EmailService {
     constructor(accessiOptions: AccessiOptions);
     sendAccountUpdateEmail(email: string, message: string): Promise<void>;
     private transporter;
-    sendPasswordResetEmail(email: string, baseUrl: string): Promise<void>;
+    sendPasswordResetEmail(email: string): Promise<void>;
 }

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

@@ -38,7 +38,7 @@ let EmailService = class EmailService {
     sendAccountUpdateEmail(email, message) {
         throw new Error('Method not implemented.');
     }
-    sendPasswordResetEmail(email, baseUrl) {
+    sendPasswordResetEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const resetToken = (0, uuid_1.v4)(); // Generiamo un nuovo token unico
@@ -48,7 +48,8 @@ let EmailService = class EmailService {
                     throw new Error("Email non trovata.");
                 }
                 const returnUrlQueryParams = "?returnUrl=" + this.accessiOptions.confirmationEmailReturnUrl;
-                const resetUrl = `${baseUrl}/api/accessi/email/reset-password-page/${resetToken}${returnUrlQueryParams}`;
+                const { confirmationEmailUrl } = this.accessiOptions;
+                const resetUrl = `${confirmationEmailUrl}/api/accessi/email/reset-password-page/${resetToken}${returnUrlQueryParams}`;
                 const mailOptions = {
                     from: this.accessiOptions.emailOptions.from,
                     to: email,

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

@@ -1,7 +1,7 @@
 import { AccessiOptions } from "../../AccessiModule";
 import { EmailService } from "../EmailService/EmailService";
 import { FiltriUtente } from "../../Dtos/FiltriUtente";
-import { GetUsersResponse } from "../../Dtos/GetUsersResponse";
+import { GetUsersResult } from "../../Dtos/GetUsersResponse";
 import { PermissionService } from "../PermissionService/PermissionService";
 import { UserDto } from "../../Dtos";
 import { RegisterRequest } from "../../Dtos/RegisterRequest";
@@ -10,7 +10,7 @@ export declare class UserService {
     private readonly emailService;
     private readonly permissionService;
     constructor(accessiOptions: AccessiOptions, emailService: EmailService, permissionService: PermissionService);
-    getUsers(): Promise<GetUsersResponse[]>;
+    getUsers(): Promise<GetUsersResult[]>;
     getCodiceUtenteByEmail(email: string): Promise<{
         codiceUtente: number;
     }>;

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

@@ -60,8 +60,24 @@ let UserService = class UserService {
             FROM UTENTI U INNER JOIN UTENTI_CONFIG G ON U.CODUTE = G.CODUTE  
             WHERE STAREG <> ?
             ORDER BY U.CODUTE`;
-                const result = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [StatoRegistrazione_1.StatoRegistrazione.DELETE]);
-                return result.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
+                let users = yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, query, [StatoRegistrazione_1.StatoRegistrazione.DELETE]);
+                users = users.map(Utilities_1.RestUtilities.convertKeysToCamelCase);
+                let usersResponse = [];
+                for (const user of users) {
+                    const userGrants = yield this.permissionService.getUserRolesAndGrants(user.codiceUtente);
+                    let extensionFields = {};
+                    for (const ext of this.accessiOptions.extensionFieldsOptions) {
+                        const values = (yield Orm_1.Orm.query(ext.databaseOptions, `SELECT ${ext.tableFields.join(",")} FROM ${ext.tableName} WHERE ${ext.tableJoinFieldName} = ?`, [user.codiceUtente])).map(Utilities_1.RestUtilities.convertKeysToCamelCase);
+                        extensionFields[ext.objectKey] = values;
+                    }
+                    let userResult = {
+                        utente: user,
+                        userGrants: userGrants,
+                        extensionFields: extensionFields
+                    };
+                    usersResponse.push(userResult);
+                }
+                return usersResponse;
             }
             catch (error) {
                 throw error;

package/package.json

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