[Update] remote app可以填写密码 (#97)

src/app/app.service.ts

@@ -106,11 +106,12 @@ export class HttpService {
       .set('asset_id', asset_id)
       .set('system_user_id', system_user_id)
       .set('token', DataStore.guacamole_token);
+    let body = new HttpParams();
     if (system_user_username) {
-      params = params.set('username', system_user_username);
+      body = body.set('username', system_user_username);
     }
     if (system_user_password) {
-      params = params.set('password', system_user_password);
+      body = body.set('password', system_user_password);
     }
     const solution = localStorage.getItem('rdpSolution') || 'Auto';
     if (solution !== 'Auto') {
@@ -119,8 +120,9 @@ export class HttpService {
       params = params.set('width', width).set('height', height);
     }
 
-    return this.http.get<GuacObjAddResp>(
+    return this.http.post<GuacObjAddResp>(
       '/guacamole/api/session/ext/jumpserver/asset/add',
+      body.toString(),
       {
         headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'),
         params: params
@@ -128,11 +130,18 @@ export class HttpService {
     );
   }
 
-  guacamole_add_remote_app(user_id: string, remote_app_id: string) {
+  guacamole_add_remote_app(user_id: string, remote_app_id: string, system_user_username?: string, system_user_password?: string) {
     let params = new HttpParams()
       .set('user_id', user_id)
       .set('remote_app_id', remote_app_id)
       .set('token', DataStore.guacamole_token);
+    let body = new HttpParams();
+    if (system_user_username) {
+      body = body.set('username', system_user_username);
+    }
+    if (system_user_password) {
+      body = body.set('password', system_user_password);
+    }
     const solution = localStorage.getItem('rdpSolution') || 'Auto';
     if (solution !== 'Auto') {
       const width = solution.split('x')[0];
@@ -140,8 +149,9 @@ export class HttpService {
       params = params.set('width', width).set('height', height);
     }
 
-    return this.http.get<GuacObjAddResp>(
+    return this.http.post<GuacObjAddResp>(
       '/guacamole/api/session/ext/jumpserver/remote-app/add',
+      body.toString(),
       {
         headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'),
         params: params

src/app/elements/asset-tree/asset-tree.component.ts

@@ -5,6 +5,7 @@ import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from '@angular/material';
 import {FormControl, Validators} from '@angular/forms';
 import {BehaviorSubject} from 'rxjs/BehaviorSubject';
 import {ActivatedRoute} from '@angular/router';
+import * as jQuery from 'jquery/dist/jquery.min';
 
 declare var $: any;
 
@@ -60,16 +61,16 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
               public _logger: LogService,
               private activatedRoute: ActivatedRoute,
               private _http: HttpService
-              ) {
+  ) {
     this.searchEvt$ = new BehaviorSubject<string>(this.query);
   }
 
   getGrantedAssetsNodes() {
     this._http.get_my_granted_nodes()
-    .subscribe(response => {
-      this.Data = [...response, ...this.Data];
-      this.draw();
-    });
+      .subscribe(response => {
+        this.Data = [...response, ...this.Data];
+        this.draw();
+      });
   }
 
   refreshGrantedAssetsNodes() {
@@ -87,7 +88,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
           this.Data = [...this.Data, ...response];
           this.draw();
         }
-    });
+      });
   }
 
   ngOnInit() {
@@ -126,16 +127,16 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     });
 
     this.activatedRoute.queryParams.subscribe(params => {
-        const login_to = params['login_to'];
-        if (login_to && !this.hasLoginTo) {
-          this.Data.forEach(t => {
-            if (login_to === t.id && t.isParent === false) {
-              this.hasLoginTo = true;
-              this.Connect(t);
-              return;
-            }
-          });
-        }
+      const login_to = params['login_to'];
+      if (login_to && !this.hasLoginTo) {
+        this.Data.forEach(t => {
+          if (login_to === t.id && t.isParent === false) {
+            this.hasLoginTo = true;
+            this.Connect(t);
+            return;
+          }
+        });
+      }
     });
   }
 
@@ -146,7 +147,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     $rootNodeRef.after(refreshIcon);
     const refreshIconRef = $('#tree-refresh');
     refreshIconRef.bind('click', function () {
-        callback();
+      callback();
     });
   }
 
@@ -165,7 +166,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
   }
 
   onRightClick(event, treeId, treeNode) {
-    if (!treeNode || treeNode.isParent ) {
+    if (!treeNode || treeNode.isParent) {
       return null;
     }
     const host = treeNode.meta.asset;
@@ -175,10 +176,10 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
       protocols.push(host.protocol);
     }
     for (let i = 0; i < protocols.length; i++) {
-       const protocol = protocols[i];
-       if (protocol && protocol.startsWith('ssh')) {
-         findSSHProtocol = true;
-       }
+      const protocol = protocols[i];
+      if (protocol && protocol.startsWith('ssh')) {
+        findSSHProtocol = true;
+      }
     }
     if (!findSSHProtocol) {
       alert('Windows 请使用Ctrl+Shift+Alt呼出侧边栏上传下载');
@@ -193,7 +194,20 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
       this.rightClickSelectNode = treeNode;
     }
   }
-  
+
+  Connect(node) {
+    switch (node.meta.type) {
+      case 'asset':
+        this.connectAsset(node);
+        break;
+      case 'remote_app':
+        this.connectRemoteApp(node);
+        break;
+      default:
+        alert('Unknown type: ' + node.meta.type);
+    }
+  }
+
   connectAsset(node) {
     const system_users = node.meta.system_users;
     const host = node.meta.asset;
@@ -230,30 +244,26 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
   }
 
   connectRemoteApp(node) {
+    const user = node.meta.user;
+    return this.loginRemoteApp(node, user);
+  }
+
+  loginRemoteApp(node, user) {
     const id = NavList.List.length - 1;
+    if (user.login_mode === 'manual' && !user.password && user.protocol === 'rdp') {
+       return this.manualSetUserAuthLogin(node, user, this.loginRemoteApp);
+    }
     if (node) {
       NavList.List[id].nick = node.name;
       NavList.List[id].connected = true;
       NavList.List[id].edit = false;
       NavList.List[id].closed = false;
       NavList.List[id].remoteApp = node.id;
+      NavList.List[id].user = user;
       NavList.List[id].type = 'rdp';
       NavList.List.push(new View());
       NavList.Active = id;
-    }
-    this._logger.debug(NavList);
-  }
-
-  Connect(node) {
-    switch (node.meta.type) {
-      case 'asset':
-        this.connectAsset(node);
-        break;
-      case 'remote_app':
-        this.connectRemoteApp(node);
-        break;
-      default:
-        alert('Unknown type: ' + node.meta.type);
+      jQuery('.tabs').animate({'scrollLeft': 150 * id}, 400);
     }
   }
 
@@ -269,8 +279,8 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
       NavList.List[id].type = 'sftp';
       NavList.List.push(new View());
       NavList.Active = id;
+      jQuery('.tabs').animate({'scrollLeft': 150 * id}, 400);
     }
-    this._logger.debug(NavList);
   }
 
   connectTerminal() {
@@ -278,7 +288,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     this.Connect(host);
   }
 
-  manualSetUserAuthLogin(host, user) {
+  manualSetUserAuthLogin(host, user, callback) {
     user = Object.assign({}, user);
     const dialogRef = this._dialog.open(ManualPasswordDialogComponent, {
       height: '250px',
@@ -287,20 +297,18 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     });
     dialogRef.afterClosed().subscribe(result => {
       if (!result) {
-        return;
+        return callback(host, user);
       }
       user.username = btoa(result.username);
       user.password = btoa(result.password);
-      return this.login(host, user);
+      return callback(host, user);
     });
   }
 
   login(host, user) {
     const id = NavList.List.length - 1;
-    this._logger.debug(NavList);
-    this._logger.debug(host);
     if (user.login_mode === 'manual' && !user.password && user.protocol === 'rdp') {
-       return this.manualSetUserAuthLogin(host, user);
+       return this.manualSetUserAuthLogin(host, user, this.login);
     }
     if (user) {
       NavList.List[id].nick = host.hostname;
@@ -316,8 +324,8 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
       }
       NavList.List.push(new View());
       NavList.Active = id;
+      jQuery('.tabs').animate({'scrollLeft': 150 * id}, 400);
     }
-    this._logger.debug(NavList);
   }
 
   checkPriority(sysUsers) {
@@ -384,7 +392,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
     }
     _keywords = _keywords.toLowerCase();
     let shouldShow = [];
-    const matchedNodes = zTreeObj.getNodesByFilter(function(node) {
+    const matchedNodes = zTreeObj.getNodesByFilter(function (node) {
       if (node.meta.type === 'asset') {
         const host = node.meta.asset;
         return host.hostname.toLowerCase().indexOf(_keywords) !== -1 || host.ip.indexOf(_keywords) !== -1;
@@ -393,18 +401,18 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
       }
     });
     matchedNodes.forEach((node) => {
-        const parents = this.recurseParent(node);
-        const children = this.recurseChildren(node);
-        shouldShow = [...shouldShow, ...parents, ...children, node];
+      const parents = this.recurseParent(node);
+      const children = this.recurseChildren(node);
+      shouldShow = [...shouldShow, ...parents, ...children, node];
     });
     this.hiddenNodes = nodes;
     this.expandNodes = shouldShow;
     zTreeObj.hideNodes(nodes);
     zTreeObj.showNodes(shouldShow);
     shouldShow.forEach((node) => {
-        if (node.isParent) {
-          zTreeObj.expandNode(node, true);
-        }
+      if (node.isParent) {
+        zTreeObj.expandNode(node, true);
+      }
     });
     // zTreeObj.expandAll(true);
   }

src/app/elements/guacamole/guacamole.component.ts

@@ -29,7 +29,7 @@ export class ElementGuacamoleComponent implements OnInit {
   registerHost() {
     let action: any;
     if (this.remoteAppId) {
-      action = this._http.guacamole_add_remote_app(User.id, this.remoteAppId);
+      action = this._http.guacamole_add_remote_app(User.id, this.remoteAppId, this.sysUser.username, this.sysUser.password);
     } else {
       action = this._http.guacamole_add_asset(User.id, this.host.id, this.sysUser.id, this.sysUser.username, this.sysUser.password);
     }