Commit 19751705 authored by zheng liu's avatar zheng liu

Merged in dev (pull request #47)

feat: application/x-www-form-urlencoded
parents e3f0d172 25d25f02
...@@ -167,7 +167,7 @@ export class AppService implements OnInit { ...@@ -167,7 +167,7 @@ export class AppService implements OnInit {
} }
// jQuery('angular2').show(); // jQuery('angular2').show();
} else { } else {
this.browser(); // this.browser();
this._http.get('/api/users/v1/profile/') this._http.get('/api/users/v1/profile/')
.map(res => res.json()) .map(res => res.json())
.subscribe( .subscribe(
......
...@@ -23,6 +23,7 @@ export class ElementIframeComponent implements OnInit { ...@@ -23,6 +23,7 @@ export class ElementIframeComponent implements OnInit {
ngOnInit() { ngOnInit() {
// /guacamole/api/tokens will redirect to http://guacamole/api/tokens // /guacamole/api/tokens will redirect to http://guacamole/api/tokens
this._http.headers.append('Content-Type', 'application/x-www-form-urlencoded');
this._http.get('/guacamole/api/tokens?username=' + User.name + '&password=zheng&asset_id=' + this._http.get('/guacamole/api/tokens?username=' + User.name + '&password=zheng&asset_id=' +
this.host.id + '&system_user_id=' + this.userid this.host.id + '&system_user_id=' + this.userid
).map(res => res.json()) ).map(res => res.json())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment