Merge branch 'dev'

package.json

@@ -23,7 +23,6 @@
     "@angular/platform-browser-dynamic": "5.2.0",
     "@angular/router": "5.2.0",
     "animate.css": "^3.5.2",
-    "base64-js": "^1.2.1",
     "body-parser": "^1.18.2",
     "bootstrap": "^4.0.0-beta.3",
     "clipboard": "^1.7.1",

src/app/elements/iframe/iframe.component.ts

@@ -3,7 +3,6 @@ import {DomSanitizer} from '@angular/platform-browser';
 import {NavList} from '../../ControlPage/control/control.component';
 import {User} from '../../globals';
 import {HttpService, LogService} from '../../app.service';
-import * as Base64 from 'base64-js/base64js.min';
 
 @Component({
   selector: 'app-element-iframe',
@@ -25,8 +24,7 @@ export class ElementIframeComponent implements OnInit {
     // /guacamole/api/tokens will redirect to http://guacamole/api/tokens
     this._http.get_guacamole_token(User.name, this.host.id, this.userid).subscribe(
       data => {
-        const title = this.host.hostname + '[' + this.host.ip + ']';
-        const base = Base64.encode(title + '\0' + 'c' + '\0' + 'jumpserver');
+        const base = window.btoa(this.host.hostname + '\0' + 'c' + '\0' + 'jumpserver');
         // /guacamole/client will redirect to http://guacamole/#/client
         this.target = document.location.origin +
           '/guacamole/client/' + base + '?token=' + data['authToken'];