Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

back/methods/osticket/sendToSupport.js

@@ -33,14 +33,14 @@ module.exports = Self => {
             await Self.app.models.EmailUser.findById(ctx.req.accessToken.userId, {fields: ['email']});
 
         let html = `<strong>Motivo</strong>:<br/>${reason}<br/>`;
+        html += `<strong>Usuario</strong>:<br/>${ctx.req.accessToken.userId} ${emailUser.email}<br/>`;
 
         for (const data in additionalData)
             html += `<strong>${data}</strong>:<br/>${tryParse(additionalData[data])}<br/>`;
 
         const subjectReason = JSON.parse(additionalData?.httpRequest)?.data?.error;
         smtp.send({
-            to: config.app.reportEmail,
-            replyTo: emailUser.email,
+            to: `${config.app.reportEmail}, ${emailUser.email}`,
             subject:
                 '[Support-Salix] ' +
                 additionalData?.frontPath + ' ' +

front/core/services/token.js

@@ -60,7 +60,7 @@ export default class Token {
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);
-        this.renewPeriod = storage.getItem('vnTokenRenewPeriod');
+        this.ttl = storage.getItem('vnTokenTtl');
     }
 
     setStorage(storage, token, created, ttl) {