emilsoftware-utilities 1.4.0-dev.8 → 1.4.0-dev.9

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

@@ -34,6 +34,7 @@ export interface AccessiOptions {
     confirmationEmailPrefix?: string;
     encryptionKey: string;
     mockDemoUser: boolean;
+    passwordExpiration?: boolean;
     jwtOptions: JwtOptions;
     emailOptions: EmailOptions;
     extensionFieldsOptions?: ExtensionFieldsOptions[];

package/dist/accessi-module/AccessiModule.js

@@ -23,7 +23,7 @@ let AccessiModule = AccessiModule_1 = class AccessiModule {
             module: AccessiModule_1,
             providers: [
                 {
-                    provide: 'ACCESSI_OPTIONS',
+                    provide: "ACCESSI_OPTIONS",
                     useValue: options,
                 },
                 AuthService_1.AuthService,
@@ -31,7 +31,13 @@ let AccessiModule = AccessiModule_1 = class AccessiModule {
                 EmailService_1.EmailService,
                 PermissionService_1.PermissionService,
             ],
-            exports: ['ACCESSI_OPTIONS', AuthService_1.AuthService, UserService_1.UserService, EmailService_1.EmailService, PermissionService_1.PermissionService],
+            exports: [
+                "ACCESSI_OPTIONS",
+                AuthService_1.AuthService,
+                UserService_1.UserService,
+                EmailService_1.EmailService,
+                PermissionService_1.PermissionService,
+            ],
         };
     }
 };
@@ -39,7 +45,12 @@ exports.AccessiModule = AccessiModule;
 exports.AccessiModule = AccessiModule = AccessiModule_1 = __decorate([
     (0, common_1.Global)(),
     (0, common_1.Module)({
-        controllers: [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/Services/AuthService/AuthService.js

@@ -36,9 +36,11 @@ let AuthService = class AuthService {
     }
     login(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.accessiOptions.mockDemoUser && request.email.toLowerCase() === "demo")
+            if (this.accessiOptions.mockDemoUser &&
+                request.email.toLowerCase() === "demo")
                 return this.getDemoUser();
-            if (this.accessiOptions.mockDemoUser && request.email.toLowerCase() === "admin")
+            if (this.accessiOptions.mockDemoUser &&
+                request.email.toLowerCase() === "admin")
                 return this.getAdminUser();
             const passwordCifrata = Utilities_1.CryptUtilities.encrypt(request.password, this.accessiOptions.encryptionKey);
             const utente = yield this.userService.getUserByEmail(request.email.toLowerCase());
@@ -61,10 +63,13 @@ 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_EXPIRED");
+            if (this.accessiOptions.passwordExpiration &&
+                this.accessiOptions.passwordExpiration == true) {
+                const today = new Date();
+                const targetDate = new Date(utente.dataScadenzaPassword);
+                if (today >= targetDate) {
+                    throw new Error("PASSWORD_EXPIRED");
+                }
             }
             // Recupera i grants
             const userGrants = yield this.permissionService.getUserRolesAndGrants(utente.codiceUtente);
@@ -73,9 +78,12 @@ let AuthService = class AuthService {
             const updateLastAccessDateQuery = "UPDATE UTENTI SET DATLASTLOGIN = CURRENT_TIMESTAMP WHERE CODUTE = ?";
             yield Orm_1.Orm.query(this.accessiOptions.databaseOptions, updateLastAccessDateQuery, [utente.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} = ?`, [utente.codiceUtente])).map(Utilities_1.RestUtilities.convertKeysToCamelCase);
-                extensionFields[ext.objectKey] = values;
+            if (this.accessiOptions.extensionFieldsOptions &&
+                this.accessiOptions.extensionFieldsOptions.length > 0) {
+                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} = ?`, [utente.codiceUtente])).map(Utilities_1.RestUtilities.convertKeysToCamelCase);
+                    extensionFields[ext.objectKey] = values;
+                }
             }
             return { utente, filtri, userGrants, extensionFields };
         });

package/package.json

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