verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

7299_testToMaster #2411

Merged
alexm merged 342 commits from 7299_testToMaster into master 2024-05-07 05:30:42 +00:00
Conversation 0 Commits 342 Files Changed 216 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5cb52cb64 - Show all commits

3
front/core/services/auth.js
View File

@ -86,8 +86,7 @@ export default class Auth {
return this.$http.get('VnUsers/ShareToken', { return this.$http.get('VnUsers/ShareToken', {
headers: {Authorization: json.data.token} headers: {Authorization: json.data.token}
}).then(({data}) => { }).then(({data}) => {
// Usar data.multimediaToken.id cuando el resto de sistemas lo tengan completado this.vnToken.set(json.data.token, data.multimediaToken.id, now, json.data.ttl, remember);
this.vnToken.set(json.data.token, json.data.token, now, json.data.ttl, remember);
this.loadAcls().then(() => { this.loadAcls().then(() => {
let continueHash = this.$state.params.continue; let continueHash = this.$state.params.continue;
if (continueHash) if (continueHash)

3
front/core/services/token.js
View File

@ -59,8 +59,7 @@ export default class Token {
getStorage(storage) { getStorage(storage) {
this.token = storage.getItem('vnToken'); this.token = storage.getItem('vnToken');
// Cambio realizado temporalmente this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
this.tokenMultimedia = this.token; // storage.getItem('vnTokenMultimedia');
if (!this.token) return; if (!this.token) return;
const created = storage.getItem('vnTokenCreated'); const created = storage.getItem('vnTokenCreated');
this.created = created && new Date(created); this.created = created && new Date(created);