refs #6930 feat: use tokenMultimedia intead tokenUser

front/core/services/auth.js

@@ -83,7 +83,7 @@ export default class Auth {
     }
 
     onLoginOk(json, now, remember) {
-        this.vnToken.set(json.data.token, now, json.data.ttl, remember);
+        this.vnToken.set(json.data.token, json.data.multimediaToken.id, now, json.data.ttl, remember);
 
         return this.loadAcls().then(() => {
             let continueHash = this.$state.params.continue;

front/core/services/token.js

@@ -24,21 +24,22 @@ export default class Token {
         } catch (e) {}
     }
 
-    set(token, created, ttl, remember) {
+    set(token, tokenMultimedia, created, ttl, remember) {
         this.unset();
 
         Object.assign(this, {
             token,
+            tokenMultimedia,
             created,
             ttl,
             remember
         });
-        this.vnInterceptor.setToken(token);
+        this.vnInterceptor.setToken(token, tokenMultimedia);
         try {
             if (remember)
-                this.setStorage(localStorage, token, created, ttl);
+                this.setStorage(localStorage, token, tokenMultimedia, created, ttl);
             else
-                this.setStorage(sessionStorage, token, created, ttl);
+                this.setStorage(sessionStorage, token, tokenMultimedia, created, ttl);
         } catch (err) {
             console.error(err);
         }
@@ -46,6 +47,7 @@ export default class Token {
 
     unset() {
         this.token = null;
+        this.tokenMultimedia = null;
         this.created = null;
         this.ttl = null;
         this.remember = null;
@@ -57,13 +59,15 @@ export default class Token {
 
     getStorage(storage) {
         this.token = storage.getItem('vnToken');
+        this.tokenMultimedia = storage.getItem('vnTokenMultimedia');
         if (!this.token) return;
         const created = storage.getItem('vnTokenCreated');
         this.created = created && new Date(created);
         this.ttl = storage.getItem('vnTokenTtl');
     }
 
-    setStorage(storage, token, created, ttl) {
+    setStorage(storage, token, tokenMultimedia, created, ttl) {
+        storage.setItem('vnTokenMultimedia', tokenMultimedia);
         storage.setItem('vnToken', token);
         storage.setItem('vnTokenCreated', created.toJSON());
         storage.setItem('vnTokenTtl', ttl);
@@ -71,6 +75,7 @@ export default class Token {
 
     removeStorage(storage) {
         storage.removeItem('vnToken');
+        storage.removeItem('vnTokenMultimedia');
         storage.removeItem('vnTokenCreated');
         storage.removeItem('vnTokenTtl');
     }

front/salix/components/layout/index.js

@@ -23,8 +23,7 @@ export class Layout extends Component {
         if (!this.$.$root.user) return;
 
         const userId = this.$.$root.user.id;
-        const token = this.vnToken.token;
+        return `/api/Images/user/160x160/${userId}/download?access_token=${this.vnToken.tokenMultimedia}`;
-        return `/api/Images/user/160x160/${userId}/download?access_token=${token}`;
     }
 
     refresh() {

front/salix/components/log/index.html

@@ -31,7 +31,7 @@
                     ng-click="$ctrl.showDescriptor($event, userLog)">
                     <img
                         ng-if="::userLog.user.image"
-                        ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.token}}">
+                        ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
                     </img>
                 </vn-avatar>
                 </div>
@@ -181,7 +181,7 @@
                         val="{{::nickname}}">
                         <img
                             ng-if="::image"
-                            ng-src="/api/Images/user/160x160/{{::id}}/download?access_token={{::$ctrl.vnToken.token}}">
+                            ng-src="/api/Images/user/160x160/{{::id}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
                         </img>
                     </vn-avatar>
                     <div>

front/salix/module.js

@@ -13,7 +13,7 @@ export function run($window, $rootScope, vnAuth, vnApp, vnToken, $state) {
         if (!collection || !size || !id) return;
 
         const basePath = `/api/Images/${collection}/${size}/${id}`;
-        return `${basePath}/download?access_token=${vnToken.token}`;
+        return `${basePath}/download?access_token=${vnToken.tokenMultimedia}`;
     };
 
     $window.validations = {};

modules/client/front/balance/index/index.html

@@ -114,7 +114,7 @@
                     <vn-td center shrink>
                         <a ng-show="balance.hasPdf"
                             target="_blank"
-                            href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.token}}">
+                            href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.tokenMultimedia}}">
                             <vn-icon-button
                                 icon="cloud_download"
                                 title="{{'Download PDF' | translate}}">

modules/invoiceOut/front/descriptor-menu/index.html

@@ -37,7 +37,7 @@
             <vn-menu vn-id="showInvoiceMenu">
                 <vn-list>
                     <a class="vn-item"
-                        href="api/InvoiceOuts/{{$ctrl.id}}/download?access_token={{$ctrl.vnToken.token}}"
+                        href="api/InvoiceOuts/{{$ctrl.id}}/download?access_token={{$ctrl.vnToken.tokenMultimedia}}"
                         target="_blank"
                         name="showInvoicePdf"
                         translate>

modules/invoiceOut/front/index/index.js

@@ -25,7 +25,7 @@ export default class Controller extends Section {
     openPdf() {
         if (this.checked.length <= 1) {
             const [invoiceOutId] = this.checked;
-            const url = `api/InvoiceOuts/${invoiceOutId}/download?access_token=${this.vnToken.token}`;
+            const url = `api/InvoiceOuts/${invoiceOutId}/download?access_token=${this.vnToken.tokenMultimedia}`;
             window.open(url, '_blank');
         } else {
             const invoiceOutIds = this.checked;

modules/route/front/index/index.js

@@ -40,7 +40,7 @@ export default class Controller extends Section {
         const stringRoutesIds = routesIds.join(',');
 
         if (this.checked.length <= 1) {
-            const url = `api/Routes/${stringRoutesIds}/driver-route-pdf?access_token=${this.vnToken.token}`;
+            const url = `api/Routes/${stringRoutesIds}/driver-route-pdf?access_token=${this.vnToken.tokenMultimedia}`;
             window.open(url, '_blank');
         } else {
             const serializedParams = this.$httpParamSerializer({