From 8b2acc99b60da318ac6744690f74fe9b7cb525de Mon Sep 17 00:00:00 2001
From: James Muehlner <james.muehlner@guac-dev.org>
Date: Tue, 24 Sep 2013 21:47:03 -0700
Subject: [PATCH] Ticket #362. Got connection create working.

---
 .../guacamole/net/auth/mysql/ConnectionDirectory.java          | 3 +++
 .../guacamole/net/auth/mysql/ConnectionGroupDirectory.java     | 3 +++
 .../net/basic/rest/connection/ConnectionRESTService.java       | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
index 232cdd169..be313877e 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionDirectory.java
@@ -180,6 +180,9 @@ public class ConnectionDirectory implements Directory<String, Connection>{
         // Create connection
         MySQLConnection connection = connectionService.createConnection(
                 name, object.getConfiguration().getProtocol(), user_id, parentID);
+        
+        // Set the connection ID
+        object.setIdentifier(connection.getIdentifier());
 
         // Add connection parameters
         createConfigurationValues(connection.getConnectionID(),
diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
index fdcb862aa..0dd2899c3 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/ConnectionGroupDirectory.java
@@ -168,6 +168,9 @@ public class ConnectionGroupDirectory implements Directory<String, ConnectionGro
         // Create connection group
         MySQLConnectionGroup connectionGroup = connectionGroupService
                 .createConnectionGroup(name, user_id, parentID, mySQLType);
+        
+        // Set the connection group ID
+        object.setIdentifier(connectionGroup.getIdentifier());
 
         // Finally, give the current user full access to the newly created
         // connection group.
diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
index 692bff933..5cd3afb38 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java
@@ -21,6 +21,7 @@ package org.glyptodon.guacamole.net.basic.rest.connection;
 import com.google.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
+import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -49,6 +50,7 @@ import org.slf4j.LoggerFactory;
  */
 @Path("/api/connection")
 @Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
 public class ConnectionRESTService {
 
     /**