From a38fc0f640346da160f12660ccef3358693c6677 Mon Sep 17 00:00:00 2001 From: Orange Date: Tue, 26 Jan 2021 16:52:08 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9Guacamole=20token?= =?UTF-8?q?=E7=9A=84=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/elements/guacamole/guacamole.component.ts | 8 ++++---- src/app/services/http.ts | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/elements/guacamole/guacamole.component.ts b/src/app/elements/guacamole/guacamole.component.ts index 1a314c0b..b45b18f2 100644 --- a/src/app/elements/guacamole/guacamole.component.ts +++ b/src/app/elements/guacamole/guacamole.component.ts @@ -44,12 +44,12 @@ export class ElementGuacamoleComponent implements OnInit { this._http.getGuacamoleToken(this.token, this.token).subscribe( data => { // /guacamole/client will redirect to http://guacamole/#/client - DataStore.guacamoleToken = data['authToken']; + localStorage.setItem('guacamoleToken', data['authToken']); DataStore.guacamoleTokenTime = nowTime; action = this._http.guacamoleTokenAddAsset(this.token).subscribe( data2 => { const base = data2['result']; - this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamoleToken; + this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + localStorage.getItem('guacamoleToken'); setTimeout(() => this.setIdleTimeout(), 500); }, error => { @@ -70,7 +70,7 @@ export class ElementGuacamoleComponent implements OnInit { action.subscribe( data => { const base = data.result; - this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + DataStore.guacamoleToken; + this.target = document.location.origin + '/guacamole/#/client/' + base + '?token=' + localStorage.getItem('guacamoleToken'); setTimeout(() => this.setIdleTimeout(), 500); }, error => { @@ -90,7 +90,7 @@ export class ElementGuacamoleComponent implements OnInit { this._http.getGuacamoleToken(User.id, '').subscribe( data => { // /guacamole/client will redirect to http://guacamole/#/client - DataStore.guacamoleToken = data['authToken']; + localStorage.setItem('guacamoleToken', data['authToken']); DataStore.guacamoleTokenTime = nowTime; this.registerHost(); }, diff --git a/src/app/services/http.ts b/src/app/services/http.ts index e1e0fc12..c6e7e20c 100644 --- a/src/app/services/http.ts +++ b/src/app/services/http.ts @@ -187,7 +187,7 @@ export class HttpService { .set('user_id', userId) .set('asset_id', assetId) .set('system_user_id', systemUserId) - .set('token', DataStore.guacamoleToken); + .set('token', localStorage.getItem('guacamoleToken')); let body = new HttpParams(); if (systemUserUsername && systemUserPassword) { systemUserUsername = btoa(systemUserUsername); @@ -216,7 +216,7 @@ export class HttpService { .set('user_id', userId) .set('remote_app_id', remoteAppId) .set('system_user_id', sysUserId) - .set('token', DataStore.guacamoleToken); + .set('token', localStorage.getItem('guacamoleToken')); let body = new HttpParams(); if (systemUserUsername && systemUserPassword) { systemUserUsername = btoa(systemUserUsername); @@ -243,7 +243,7 @@ export class HttpService { guacamoleTokenAddAsset(assetToken: string) { let params = new HttpParams() .set('asset_token', assetToken) - .set('token', DataStore.guacamoleToken); + .set('token', localStorage.getItem('guacamoleToken')); const resolution = this.settingSrv.setting.rdpResolution || 'Auto'; if (resolution !== 'Auto') { const width = resolution.split('x')[0];