+
-
+
{{ "Automatic login next" | translate }}
-
diff --git a/src/app/elements/connect/connect-dialog/connect-dialog.component.scss b/src/app/elements/connect/connect-dialog/connect-dialog.component.scss
index 9bba186a..91b50769 100644
--- a/src/app/elements/connect/connect-dialog/connect-dialog.component.scss
+++ b/src/app/elements/connect/connect-dialog/connect-dialog.component.scss
@@ -6,7 +6,7 @@
}
.mat-form-field-infix {
- border-top-width: 0!important;
+ border-top-width: 0 !important;
}
.auto-connect {
@@ -29,6 +29,7 @@
//padding: 0 20px !important;
min-width: 20px !important;
}
+
.mat-tab-link:focus {
background-color: white;
}
@@ -64,3 +65,7 @@
.mat-button-toggle-checked {
}
+button.mat-raised-button {
+ margin-left: 0;
+}
+
diff --git a/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html b/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html
index 867e45d4..33386063 100644
--- a/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html
+++ b/src/app/elements/connect/connect-dialog/connect-method/connect-method.component.html
@@ -2,7 +2,7 @@
-
+
+
+
+ {{ "No available connect method" | translate }}
+
+
+
+
+
+
+ {{item.label}}
+
+
+
+
@@ -33,17 +44,6 @@
Web
{{ 'Client' | translate }}
-
-
-
-
-
- {{item.label}}
-
-
-
diff --git a/src/app/elements/setting/setting.component.ts b/src/app/elements/setting/setting.component.ts
index 6b2618f3..c6885f44 100644
--- a/src/app/elements/setting/setting.component.ts
+++ b/src/app/elements/setting/setting.component.ts
@@ -4,6 +4,7 @@ import {SettingService} from '@app/services';
import {GlobalSetting, Setting} from '@app/model';
import {I18nService} from '@app/services/i18n';
import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {resolutionsChoices} from '@app/globals';
@Component({
@@ -12,12 +13,12 @@ import {MAT_DIALOG_DATA} from '@angular/material/dialog';
styleUrls: ['./setting.component.css']
})
export class ElementSettingComponent implements OnInit {
- resolutionsChoices = ['Auto', '1024x768', '1366x768', '1600x900', '1920x1080'];
public boolChoices: any[];
public keyboardLayoutOptions: any[];
setting: Setting;
globalSetting: GlobalSetting;
type = 'general';
+ resolutionsChoices = resolutionsChoices;
constructor(public dialogRef: MatDialogRef
,
private _i18n: I18nService,
@@ -28,13 +29,13 @@ export class ElementSettingComponent implements OnInit {
{name: _i18n.instant('No'), value: '0'}
];
this.keyboardLayoutOptions = [
- { value: 'en-us-qwerty', label: _i18n.instant('US English keyboard layout') },
- { value: 'en-gb-qwerty', label: _i18n.instant('UK English keyboard layout') },
- { value: 'ja-jp-qwerty', label: _i18n.instant('Japanese keyboard layout') },
- { value: 'fr-fr-azerty', label: _i18n.instant('French keyboard layout') },
- { value: 'fr-ch-qwertz', label: _i18n.instant('Swiss French keyboard layout') },
- { value: 'fr-be-azerty', label: _i18n.instant('Belgian French keyboard layout') },
- { value: 'tr-tr-qwerty', label: _i18n.instant('Turkey keyboard layout') }
+ {value: 'en-us-qwerty', label: _i18n.instant('US English keyboard layout')},
+ {value: 'en-gb-qwerty', label: _i18n.instant('UK English keyboard layout')},
+ {value: 'ja-jp-qwerty', label: _i18n.instant('Japanese keyboard layout')},
+ {value: 'fr-fr-azerty', label: _i18n.instant('French keyboard layout')},
+ {value: 'fr-ch-qwertz', label: _i18n.instant('Swiss French keyboard layout')},
+ {value: 'fr-be-azerty', label: _i18n.instant('Belgian French keyboard layout')},
+ {value: 'tr-tr-qwerty', label: _i18n.instant('Turkey keyboard layout')}
];
}
diff --git a/src/app/globals.ts b/src/app/globals.ts
index e1145665..da519b15 100644
--- a/src/app/globals.ts
+++ b/src/app/globals.ts
@@ -1,8 +1,7 @@
'use strict';
import {EventEmitter} from 'events/events';
import {BehaviorSubject} from 'rxjs';
-import {ConnectEvt, User as _User} from './model';
-import {DataStore as _DataStore, Browser as _Browser, Video as _Video, Monitor as _Monitor} from './model';
+import {Browser as _Browser, ConnectEvt, DataStore as _DataStore, Monitor as _Monitor, User as _User, Video as _Video} from './model';
export let TermWS = null;
export const emitter = new (EventEmitter);
@@ -34,3 +33,4 @@ export const ROOT_ORG_ID = '00000000-0000-0000-0000-000000000000';
export const connectEvt = new BehaviorSubject(new ConnectEvt(null, null));
+export const resolutionsChoices = ['Auto', '1024x768', '1366x768', '1600x900', '1920x1080'];
diff --git a/src/app/model.ts b/src/app/model.ts
index 2f46a688..80a10c88 100644
--- a/src/app/model.ts
+++ b/src/app/model.ts
@@ -20,7 +20,7 @@ export class User {
date_joined: string;
last_login: string;
date_expired: string;
- groups: Array ;
+ groups: Array;
logined: boolean;
}
@@ -158,7 +158,9 @@ export class View {
getConnectOption(field: string) {
const connectOptions = this.connectOptions || [];
- if (connectOptions.length === 0) { return ''; }
+ if (connectOptions.length === 0) {
+ return '';
+ }
const filteredField = connectOptions.find(i => i.field === field);
return filteredField ? filteredField.value.toString() : '';
}
@@ -344,7 +346,7 @@ export class AuthInfo {
}
export class ConnectOption {
- type: 'checkbox' | 'radio';
+ type: 'checkbox' | 'radio' | 'select';
field: string;
hidden: Function;
label: string;
@@ -398,7 +400,7 @@ export class ConnectionToken {
from_ticket_info: FromTicketInfo;
}
-export class Protocol {
+export class Protocol {
name: string;
port: number;
public: boolean;
@@ -450,6 +452,7 @@ export interface Organization {
is_root?: boolean;
is_default?: boolean;
}
+
export class InitTreeConfig {
refresh: boolean;
apiName?: string;
diff --git a/src/app/elements/connect/acl-dialog/acl-dialog.component.html b/src/app/services/connect-token/acl-dialog/acl-dialog.component.html
similarity index 100%
rename from src/app/elements/connect/acl-dialog/acl-dialog.component.html
rename to src/app/services/connect-token/acl-dialog/acl-dialog.component.html
diff --git a/src/app/elements/connect/acl-dialog/acl-dialog.component.scss b/src/app/services/connect-token/acl-dialog/acl-dialog.component.scss
similarity index 100%
rename from src/app/elements/connect/acl-dialog/acl-dialog.component.scss
rename to src/app/services/connect-token/acl-dialog/acl-dialog.component.scss
diff --git a/src/app/elements/connect/acl-dialog/acl-dialog.component.ts b/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts
similarity index 97%
rename from src/app/elements/connect/acl-dialog/acl-dialog.component.ts
rename to src/app/services/connect-token/acl-dialog/acl-dialog.component.ts
index ad586074..17f99e2a 100644
--- a/src/app/elements/connect/acl-dialog/acl-dialog.component.ts
+++ b/src/app/services/connect-token/acl-dialog/acl-dialog.component.ts
@@ -1,7 +1,8 @@
import {Component, Inject, OnInit} from '@angular/core';
import {Asset, ConnectData, ConnectionToken} from '@app/model';
import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material';
-import {HttpService, I18nService} from '@app/services';
+import {I18nService} from '@app/services/i18n';
+import {HttpService} from '@app/services/http';
import {ToastrService} from 'ngx-toastr';
import {HttpErrorResponse} from '@angular/common/http';
diff --git a/src/app/services/connect-token.ts b/src/app/services/connect-token/index.ts
similarity index 94%
rename from src/app/services/connect-token.ts
rename to src/app/services/connect-token/index.ts
index 7d2dfcd7..2e3a6743 100644
--- a/src/app/services/connect-token.ts
+++ b/src/app/services/connect-token/index.ts
@@ -1,8 +1,8 @@
import {Injectable} from '@angular/core';
import {Asset, ConnectData, ConnectionToken} from '@app/model';
-import {ElementACLDialogComponent} from '@app/elements/connect/acl-dialog/acl-dialog.component';
import {HttpService} from '@app/services/http';
import {MatDialog} from '@angular/material';
+import {ElementACLDialogComponent} from './acl-dialog/acl-dialog.component';
@Injectable()
export class ConnectTokenService {
diff --git a/src/app/elements/dialog/alert.html b/src/app/services/dialog/alert.html
similarity index 100%
rename from src/app/elements/dialog/alert.html
rename to src/app/services/dialog/alert.html
diff --git a/src/app/elements/dialog/alert.scss b/src/app/services/dialog/alert.scss
similarity index 100%
rename from src/app/elements/dialog/alert.scss
rename to src/app/services/dialog/alert.scss
diff --git a/src/app/elements/dialog/dialog.service.ts b/src/app/services/dialog/dialog.service.ts
similarity index 86%
rename from src/app/elements/dialog/dialog.service.ts
rename to src/app/services/dialog/dialog.service.ts
index 1c0ff9bc..8cdd30d5 100644
--- a/src/app/elements/dialog/dialog.service.ts
+++ b/src/app/services/dialog/dialog.service.ts
@@ -1,6 +1,7 @@
import {Component, Inject, Injectable} from '@angular/core';
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
-import {I18nService, LogService} from '@app/services';
+import {I18nService} from '../i18n';
+import {LogService} from '../share';
@Component({
@@ -45,9 +46,9 @@ export class DialogService {
loading() {
}
- async alert(msg: string, title: string='') {
+ async alert(msg: string, title: string = '') {
if (!title) {
- title = await this._i18n.t('Tips')
+ title = await this._i18n.t('Tips');
}
this._dialog.open(ElementDialogAlertComponent, {
height: 'auto',
diff --git a/src/app/services/http.ts b/src/app/services/http.ts
index e35a0147..7abdca0a 100644
--- a/src/app/services/http.ts
+++ b/src/app/services/http.ts
@@ -1,14 +1,10 @@
import {Injectable} from '@angular/core';
-import {HttpClient, HttpHeaders, HttpParams, HttpErrorResponse} from '@angular/common/http';
-import {Browser, SYSTEM_ORG_ID} from '@app/globals';
-import {retryWhen, delay, scan, map, catchError} from 'rxjs/operators';
-import {
- Account, TreeNode, User as _User, Session,
- ConnectionToken, Endpoint, ConnectData, Asset
-} from '@app/model';
-import {User} from '@app/globals';
+import {HttpClient, HttpErrorResponse, HttpHeaders, HttpParams} from '@angular/common/http';
+import {Browser, User} from '@app/globals';
+import {catchError, delay, map, retryWhen, scan} from 'rxjs/operators';
+import {Account, Asset, ConnectData, ConnectionToken, Endpoint, Session, TreeNode, User as _User} from '@app/model';
import {getCsrfTokenFromCookie, getQueryParamFromURL} from '@app/utils/common';
-import {Observable, throwError} from 'rxjs';
+import {Observable} from 'rxjs';
import {I18nService} from '@app/services/i18n';
import {CookieService} from 'ngx-cookie-service';
import {encryptPassword} from '@app/utils/crypto';
@@ -18,12 +14,15 @@ export class HttpService {
headers = new HttpHeaders();
constructor(private http: HttpClient,
- private _i18n: I18nService,
- private _cookie: CookieService) {}
+ private _i18n: I18nService,
+ private _cookie: CookieService) {
+ }
setOptionsCSRFToken(options) {
const csrfToken = getCsrfTokenFromCookie();
- if (!options) { options = {}; }
+ if (!options) {
+ options = {};
+ }
let headers = options.headers || new HttpHeaders();
headers = headers.set('X-CSRFToken', csrfToken);
options.headers = headers;
@@ -31,7 +30,9 @@ export class HttpService {
}
setOrgIDToRequestHeader(url, options) {
- if (!options) { options = {}; }
+ if (!options) {
+ options = {};
+ }
const headers = options.headers || new HttpHeaders();
const orgID = this._cookie.get('X-JMS-LUNA-ORG') || this._cookie.get('X-JMS-ORG');
options.headers = headers.set('X-JMS-ORG', orgID);
@@ -207,16 +208,16 @@ export class HttpService {
getCommandsData(sid: string, page: number) {
const params = new HttpParams()
- .set('session_id', sid)
- .set('limit', '30')
- .set('offset', String(30 * page))
- .set('order', 'timestamp');
+ .set('session_id', sid)
+ .set('limit', '30')
+ .set('offset', String(30 * page))
+ .set('order', 'timestamp');
return this.get('/api/v1/terminal/commands/', {params: params});
}
cleanRDPParams(params) {
const cleanedParams = {};
- const {rdpResolution, rdpFullScreen, rdpDrivesRedirect } = params;
+ const {rdpResolution, rdpFullScreen, rdpDrivesRedirect} = params;
if (rdpResolution && rdpResolution.indexOf('x') > -1) {
const [width, height] = rdpResolution.split('x');
@@ -235,9 +236,13 @@ export class HttpService {
createConnectToken(asset: Asset, connectData: ConnectData, createTicket = false) {
const params = createTicket ? '?create_ticket=1' : '';
const url = '/api/v1/authentication/connection-token/' + params;
- const { account, protocol, manualAuthInfo, connectMethod } = connectData;
+ const {account, protocol, manualAuthInfo, connectMethod} = connectData;
const username = account.username.startsWith('@') ? manualAuthInfo.username : account.username;
const secret = encryptPassword(manualAuthInfo.secret);
+ const connectOption = {};
+ for (const option of connectData.connectOptions) {
+ connectOption[option.field] = option.value;
+ }
const data = {
asset: asset.id,
account: account.alias,
@@ -245,6 +250,7 @@ export class HttpService {
input_username: username,
input_secret: secret,
connect_method: connectMethod.value,
+ connect_options: connectOption
};
return this.post(url, data).pipe(
catchError(this.handleConnectMethodExpiredError.bind(this))
@@ -254,7 +260,7 @@ export class HttpService {
exchangeConnectToken(tokenID: string, createTicket = false) {
const params = createTicket ? '?create_ticket=1' : '';
const url = '/api/v1/authentication/connection-token/exchange/' + params;
- const data = { 'id': tokenID};
+ const data = {'id': tokenID};
return this.post(url, data);
}
@@ -288,7 +294,7 @@ export class HttpService {
}
async handleConnectMethodExpiredError(error) {
- if (error.status === 400 ) {
+ if (error.status === 400) {
if (error.error && error.error.error && error.error.error.startsWith('Connect method')) {
const errMsg = await this._i18n.t('The connection method is invalid, please refresh the page');
alert(errMsg);
@@ -297,7 +303,7 @@ export class HttpService {
throw error;
}
- getSmartEndpoint({ assetId, sessionId, token }, protocol ): Promise {
+ getSmartEndpoint({assetId, sessionId, token}, protocol): Promise {
const url = new URL('/api/v1/terminal/endpoints/smart/', window.location.origin);
url.searchParams.append('protocol', protocol);
diff --git a/src/app/services/index.ts b/src/app/services/index.ts
index b091b35a..aad515b2 100644
--- a/src/app/services/index.ts
+++ b/src/app/services/index.ts
@@ -1,34 +1,35 @@
-import {LogService, LocalStorageService, UUIDService} from './share';
+import {LocalStorageService, LogService, UUIDService} from './share';
+import {AppService} from './app';
+import {HttpService} from './http';
+import {NavService} from './nav';
+import {TreeFilterService} from './treeFilter';
+import {SettingService} from './setting';
+import {ViewService} from './view';
+import {OrganizationService} from './organization';
+import {I18nService} from './i18n';
+import {DialogService} from './dialog/dialog.service';
+import {ConnectTokenService} from './connect-token/';
+
export {LogService, LocalStorageService, UUIDService} from './share';
-import {AppService} from './app';
export {AppService} from './app';
-import {HttpService} from './http';
export {HttpService} from './http';
-import {NavService} from './nav';
export {NavService} from './nav';
-import {TreeFilterService} from './treeFilter';
export {TreeFilterService} from './treeFilter';
-import {SettingService} from './setting';
export {SettingService} from './setting';
-import {ViewService} from './view';
export {ViewService} from './view';
-import {OrganizationService} from './organization';
export {OrganizationService} from './organization';
-import {I18nService} from './i18n';
export {I18nService};
-import {DialogService} from '@app/elements/dialog/dialog.service';
export {DialogService};
-import {ConnectTokenService} from '@app/services/connect-token';
export {ConnectTokenService};
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index a854aa4b..994427fd 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -75,6 +75,7 @@
"Select account": "Select account",
"No matching found": "No matching found",
"Connect Method": "Connect Method",
+ "No available connect method": "No available connect method",
"Need to use": "Need to use",
"Download the client": "Please download",
"Yes": "Yes",
diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json
index 5f6e3a0f..33bfdeb7 100644
--- a/src/assets/i18n/ja.json
+++ b/src/assets/i18n/ja.json
@@ -75,8 +75,8 @@
"Select account": "システムユーザーの選択",
"No matching found": "マッチがありません",
"Connect Method": "接続方法",
+ "No available connect method": "接続方法がありません",
"Need to use": "使用する必要がある",
-
"Yes": "はい",
"No": "いいえ",
"Web Terminal": "Web端末",
@@ -116,7 +116,6 @@
"General": "基本構成",
"GUI": "グラフィカル",
"CLI": "コマンドライン",
-
"Asset not found or You have no permission to access it, please refresh asset tree": "アセットが見つからないか、アクセスする権限がありません。アセット ツリーを更新してください",
"Run it by client": "クライアントで実行する",
"Name": "めいしょう",
@@ -126,7 +125,6 @@
"Tips": "ヒント",
"Applet connect method": "アプレット接続方法",
"Client": "お客様",
-
"Keyboard layout": "キーボードレイアウト",
"UK English keyboard layout": "UK English (Qwerty)",
"US English keyboard layout": "US English (Qwerty)",
@@ -149,5 +147,6 @@
"No account available": "アカウントがありません",
"Set reusable": "再利用可能な",
"Re-use for a long time after opening": "開いた後、長い間再利用する",
+ "Charset": "文字セット",
"The connection method is invalid, please refresh the page": "接続方法が無効です。ページを更新してください"
}
diff --git a/src/assets/i18n/zh.json b/src/assets/i18n/zh.json
index 207a2677..9c189cbc 100644
--- a/src/assets/i18n/zh.json
+++ b/src/assets/i18n/zh.json
@@ -75,6 +75,7 @@
"Select account": "选择账号",
"No matching found": "没有匹配项",
"Connect Method": "连接方式",
+ "No available connect method": "没有可用的连接方法",
"Need to use": "需要使用",
"Yes": "是",
"No": "否",
@@ -125,7 +126,7 @@
"General": "基本配置",
"Applet connect method": "远程应用连接方式",
"Client": "客户端",
-
+ "Charset": "字符集",
"Keyboard layout": "键盘布局",
"UK English keyboard layout": "UK English (Qwerty)",
"US English keyboard layout": "US English (Qwerty)",