GUACAMOLE-38: REST service should return proper JSON. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/b283adc7 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/b283adc7 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/b283adc7
Branch: refs/heads/staging/1.0.0 Commit: b283adc73a8296ce53296ea1992c5e88af4ceb46 Parents: 7302013 Author: Nick Couchman <vn...@apache.org> Authored: Tue May 22 22:15:58 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Jun 1 13:40:53 2018 -0400 ---------------------------------------------------------------------- .../guacamole/auth/quickconnect/rest/QuickConnectREST.java | 7 +++++-- .../src/main/resources/services/quickConnectService.js | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b283adc7/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java index cee7591..275e1a4 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java +++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java @@ -19,6 +19,8 @@ package org.apache.guacamole.auth.quickconnect.rest; +import java.util.Collections; +import java.util.Map; import javax.ws.rs.FormParam; import javax.ws.rs.Path; import javax.ws.rs.POST; @@ -68,10 +70,11 @@ public class QuickConnectREST { */ @POST @Path("create") - public String create(@FormParam("uri") String uri) + public Map<String, String> create(@FormParam("uri") String uri) throws GuacamoleException { - return directory.create(QCParser.getConfiguration(uri)); + return Collections.singletonMap("identifier", + directory.create(QCParser.getConfiguration(uri))); } http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/b283adc7/extensions/guacamole-auth-quickconnect/src/main/resources/services/quickConnectService.js ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/services/quickConnectService.js b/extensions/guacamole-auth-quickconnect/src/main/resources/services/quickConnectService.js index b5f9475..0da2980 100644 --- a/extensions/guacamole-auth-quickconnect/src/main/resources/services/quickConnectService.js +++ b/extensions/guacamole-auth-quickconnect/src/main/resources/services/quickConnectService.js @@ -60,7 +60,7 @@ angular.module('guacQuickConnect').factory('quickConnectService', ['$injector', cacheService.users.removeAll(); // Pass on the connection identifier - return connectionId; + return connectionId.identifier; }); };
