necouchman commented on a change in pull request #578:
URL: https://github.com/apache/guacamole-client/pull/578#discussion_r530614189
##########
File path:
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/tunnel/AbstractGuacamoleTunnelService.java
##########
@@ -201,87 +201,52 @@ protected abstract void release(RemoteAuthenticatedUser
user,
ModeledConnectionGroup connectionGroup);
/**
- * Returns a guacamole configuration containing the protocol and parameters
- * from the given connection. If the ID of an active connection is
- * provided, that connection will be joined instead of starting a new
- * primary connection. If tokens are used in the connection parameter
- * values, credentials from the given user will be substituted
- * appropriately.
- *
- * @param user
- * The user whose credentials should be used if necessary.
+ * Returns a GuacamoleConfiguration which connects to the given connection.
+ * If the connection ID of an active is provided, that active connection
Review comment:
> If the connection ID of an active *connection* is provided
Although, the term "active connection" is used several times in rapid
succession, so maybe:
> If the ID of an active connection is provided
would make it a little more succinct.
##########
File path:
guacamole-common/src/main/java/org/apache/guacamole/protocol/GuacamoleConfiguration.java
##########
@@ -103,15 +102,34 @@ public void setConnectionID(String connectionID) {
/**
* Returns the name of the protocol to be used.
- * @return The name of the protocol to be used.
+ *
+ * @return
+ * The name of the protocol to be used.
*/
public String getProtocol() {
return protocol;
}
/**
- * Sets the name of the protocol to be used.
- * @param protocol The name of the protocol to be used.
+ * Sets the name of the protocol to be used. If no connection is being
+ * joined (a new connection is being established), this value must be set.
+ *
+ * <p>If a connection is being joined, <strong>this value should still be
+ * set</strong> to ensure that protocol-specific responses like the
+ * "required" and "argv" instructions can be understood in their proper
Review comment:
Extra space slipped in here...
##########
File path: guacamole/src/main/webapp/app/rest/services/tunnelService.js
##########
@@ -79,6 +79,36 @@ angular.module('rest').factory('tunnelService', ['$injector',
};
+ /**
+ * Makes a request to the REST API to retrieve the underlying protocol of
+ * the connection associated with a particular tunnel, returning a promise
+ * that provides a @link{Protocol} object if successful.
+ *
+ * @param {String} tunnel
+ * The UUID of the tunnel associated with the Guacamole connection
+ * whose underlying protocol is being retrieved.
+ *
+ * @returns {Promise.<Protocol>}
+ * A promise which will resolve with a @link{Protocol} object upon
+ * success.
+ */
+ service.getProtocol = function getProtocol(tunnel) {
+
+ // Build HTTP parameters set
+ var httpParameters = {
+ token : authenticationService.getCurrentToken()
+ };
+
+ // Retrieve all associated sharing profiles
Review comment:
Copy pasta? Don't think this one is retrieving sharing profiles...
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
