npm - emilsoftware-utilities - Versions diffs - 1.3.27 → 1.3.29 - Mend

emilsoftware-utilities 1.3.27 → 1.3.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/accessi-module/AccessiController.js +7 -3
package/dist/accessi-module/AccessiModel.js +1 -1
package/dist/accessi-module/models/DTO/LoginResponse.d.ts +5 -0
package/package.json +1 -1

package/dist/accessi-module/AccessiController.js CHANGED Viewed

@@ -193,7 +193,7 @@ var AccessiController = function () {
          */
         AccessiController_1.prototype.login = function (req, res) {
             return __awaiter(this, void 0, void 0, function () {
-                var request, userData, jwtOptions, token, error_1;
+                var request, userData, jwtOptions, error_1;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -205,8 +205,12 @@ var AccessiController = function () {
                             if (!userData)
                                 return [2 /*return*/, Utilities_1.RestUtilities.sendErrorMessage(res, "Credenziali errate", AccessiController.name)];
                             jwtOptions = this.accessiModel.getOptions().jwtOptions;
-                            token = jsonwebtoken_1.default.sign({ userData: userData }, jwtOptions.secret, { expiresIn: jwtOptions.expiresIn });
-                            return [2 /*return*/, Utilities_1.RestUtilities.sendBaseResponse(res, token)];
+                            userData.token = {
+                                expiresIn: jwtOptions.expiresIn,
+                                value: jsonwebtoken_1.default.sign({ userData: userData }, jwtOptions.secret, { expiresIn: jwtOptions.expiresIn }),
+                                type: "Bearer"
+                            };
+                            return [2 /*return*/, Utilities_1.RestUtilities.sendBaseResponse(res, userData)];
                         case 2:
                             error_1 = _a.sent();
                             return [2 /*return*/, Utilities_1.RestUtilities.sendErrorMessage(res, error_1, AccessiController.name)];

package/dist/accessi-module/AccessiModel.js CHANGED Viewed

@@ -153,7 +153,7 @@ var AccessiModel = function () {
                             if (this.accessiOptions.mockDemoUser && request.username.toLowerCase() === "demo" && request.password.toLowerCase() === "demo")
                                 return [2 /*return*/, this.getDemoUser()];
                             password = Utilities_1.CryptUtilities.encrypt(request.password, this.accessiOptions.encryptionKey);
-                            userQuery = "\n        SELECT\n            U.CODUTE       as codice_utente,\n            U.USRNAME      as username,\n            U.FLGGDPR      as flag_gdpr,\n            U.DATGDPR      as data_gdpr,\n            U.DATINS       as data_inserimento,\n            U.DATSCAPWD    as data_scadenza_password,\n            U.DATLASTLOGIN as data_last_login,\n            U.STAREG       as stato_registrazione,\n            U.KEYREG       as key_registrazione,\n            C.COGNOME      as cognome,\n            C.NOME         as nome,\n            C.AVATAR       as avatar,\n            C.FLG2FATT     as flag_due_fattori,\n            C.CAUMOV       as cau_mov,\n            C.CODLINGUA    as codice_lingua,\n            C.CELLULARE    as cellulare,\n            C.FLGSUPER     as flag_super,\n            C.FLGMOP       as flag_mop,\n            C.FLGPIANA     as flag_piana,\n            C.FLGADDETTI   as flag_addetti,\n            C.FLGOSPITI    as flag_ospiti,\n            C.FLGPIANARFID as flag_piana_rfid,\n            C.FLGCONTA     as flag_conta,\n            C.FLGTINTEMI   as flag_tintemi,\n            C.FLGCUBI      as flag_cubi,\n            C.FLGCICLPASS  as flag_cicl_pass,\n            C.PAGDEF       as pag_def,\n            F.PROG         as prog,\n            F.NUMREP       as num_rep,\n            F.IDXPERS      as idx_pers,\n            F.CODCLISUPER  as codice_cliente_super,\n            F.CODAGE       as codice_age\n            F.CODCLICOL    as codice_cliente_col, \n            F.CODCLIENTI   as codice_clienti,\n            F.TIPFIL       as tipo_fil\n\n        FROM UTENTI U, UTENTI_CONFIG C, FILTRI F\n        WHERE LOWER(U.USRNAME) = ?\n        AND C.CODUTE=U.CODUTE AND F.CODUTE=U.CODUTE \n        ";
+                            userQuery = "\n        SELECT\n            U.CODUTE       as codice_utente,\n            U.USRNAME      as username,\n            U.FLGGDPR      as flag_gdpr,\n            U.DATGDPR      as data_gdpr,\n            U.DATINS       as data_inserimento,\n            U.DATSCAPWD    as data_scadenza_password,\n            U.DATLASTLOGIN as data_last_login,\n            U.STAREG       as stato_registrazione,\n            U.KEYREG       as key_registrazione,\n            C.COGNOME      as cognome,\n            C.NOME         as nome,\n            C.AVATAR       as avatar,\n            C.FLG2FATT     as flag_due_fattori,\n            C.CAUMOV       as cau_mov,\n            C.CODLINGUA    as codice_lingua,\n            C.CELLULARE    as cellulare,\n            C.FLGSUPER     as flag_super,\n            C.FLGMOP       as flag_mop,\n            C.FLGPIANA     as flag_piana,\n            C.FLGADDETTI   as flag_addetti,\n            C.FLGOSPITI    as flag_ospiti,\n            C.FLGPIANARFID as flag_piana_rfid,\n            C.FLGCONTA     as flag_conta,\n            C.FLGTINTEMI   as flag_tintemi,\n            C.FLGCUBI      as flag_cubi,\n            C.FLGCICLPASS  as flag_cicl_pass,\n            C.PAGDEF       as pag_def,\n            F.PROG         as prog,\n            F.NUMREP       as num_rep,\n            F.IDXPERS      as idx_pers,\n            F.CODCLISUPER  as codice_cliente_super,\n            F.CODAGE       as codice_age,\n            F.CODCLICOL    as codice_cliente_col, \n            F.CODCLIENTI   as codice_clienti,\n            F.TIPFIL       as tipo_fil\n\n        FROM UTENTI U, UTENTI_CONFIG C, FILTRI F\n        WHERE LOWER(U.USRNAME) = ?\n        AND C.CODUTE=U.CODUTE AND F.CODUTE=U.CODUTE \n        ";
                             userParams = [request.username];
                             return [4 /*yield*/, Orm_1.Orm.query(this.accessiOptions.databaseOptions, userQuery, userParams)];
                         case 1:

package/dist/accessi-module/models/DTO/LoginResponse.d.ts CHANGED Viewed

@@ -1,6 +1,11 @@
 import { MenuAbilitazioniResult } from "../QueryResults/MenuAbilitazioniResult";
 import { UserQueryResult } from "../QueryResults/UserQueryResult";
 export interface LoginResponse {
+    token?: {
+        expiresIn: string;
+        value: string;
+        type: string;
+    };
     user: UserQueryResult;
     abilitazioni: MenuAbilitazioniResult[];
 }

package/package.json CHANGED Viewed

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