From b283adc73a8296ce53296ea1992c5e88af4ceb46 Mon Sep 17 00:00:00 2001
From: Nick Couchman <vnick@apache.org>
Date: Tue, 22 May 2018 22:15:58 -0400
Subject: [PATCH] GUACAMOLE-38: REST service should return proper JSON.

---
 .../guacamole/auth/quickconnect/rest/QuickConnectREST.java | 7 +++++--
 .../src/main/resources/services/quickConnectService.js     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

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 cee759141..275e1a423 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 QuickConnectREST(QuickConnectDirectory directory) {
      */
     @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)));
  
     }
 
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 b5f947515..0da298087 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;
         });
 
     };