GUACAMOLE-38: Alter AngularJS side of extensions to use new REST endpoint.

extensions/guacamole-auth-quickconnect/src/main/resources/controllers/quickconnectController.js

@@ -25,14 +25,11 @@ angular.module('guacQuickConnect').controller('quickconnectController', ['$scope
 
     // Required types
     var ClientIdentifier    = $injector.get('ClientIdentifier');
-    var Connection          = $injector.get('Connection');
 
     // Required services
     var $location                = $injector.get('$location');
-    var $routeParams             = $injector.get('$routeParams');
     var guacNotification         = $injector.get('guacNotification');
-    var connectionService        = $injector.get('connectionService');
+    var quickConnectService      = $injector.get('quickConnectService');
-    var schemaService            = $injector.get('schemaService');
 
     /**
      * An action to be provided along with the object sent to showStatus which
@@ -48,135 +45,27 @@ angular.module('guacQuickConnect').controller('quickconnectController', ['$scope
 
     $scope.uri = null;
 
-    $scope.selectedDataSource = 'quickconnect';
-
     /**
      * Saves the connection, creating a new connection or updating the existing
      * connection.
      */
     $scope.quickConnect = function quickConnect() {
 
-        // Construct parameters from URI...
+        quickConnectService.createConnection(encodeURIComponent($scope.uri))
-        /**
+        .success(function createdConnection(connectionId) {
-         * Parse URL into the following components:
+            $location.url('/client/' + ClientIdentifier.toString({
-         * [0] - Full URL
+                dataSource : 'quickconnect',
-         * [3] - Protocol
+                type       : ClientIdentifier.Types.CONNECTION,
-         * [5] - Username
+                id         : connectionId
-         * [7] - Password
+            }));
-         * [8] - Hostname
+        })
-         * [10] - Port
+        .error(function createFailed(error) {
-         * [11] - Path
+            guacNotification.showStatus({
-         * [13] - Document
+                'className'  : 'error',
-         * [15] - Parameters
+                'title'      : 'MANAGE_CONNECTION.DIALOG_HEADER_ERROR',
-         * [17] - JS Route
+                'text'       : error.translatableMessage,
-         */
+                'actions'    : [ ACKNOWLEDGE_ACTION ]
-        var regexURL = /^(((rdp|ssh|telnet|vnc)?):\/)?\/?((.*?)(:(.*?)|)@)?([^:\/\s]+)(:([^\/]*))?((\/\w+\/)*)([-\w.\/]+[^#?\s]*)?(\?([^#]*))?(#(.*))?$/g;
-        var urlArray = regexURL.exec($scope.uri);
-
-        var gettingProtocols = schemaService.getProtocols('quickconnect');
-        gettingProtocols.success(function checkProtocol(supportedProtocols) {
-            if (!(urlArray[3] in supportedProtocols)) {
-                guacNotification.showStatus({
-                    'className' : 'error',
-                    'title'     : 'Unsupported Protocol',
-                    'text'      : 'The ' + urlArray[3] + ' protocol is not supported by Guacamole.',
-                    'actions'   : [ ACKNOWLEDGE_ACTION ]
-               });
-              return;
-            }
-            var port = 0;
-            var urlParams = Array();
-
-            // Default port assignments for various protocols.
-            switch(urlArray[3]) {
-                case 'rdp':
-                    port = 3389;
-                    break;
-                case 'ssh':
-                    port = 22;
-                    break;
-                case 'telnet':
-                    port = 23;
-                    break;
-                case 'vnc':
-                    port = 5900;
-                    break;
-                default:
-                    port = 0;
-            }
-
-            // If the port is explicitly set, overwrite the default
-            if (!isNaN(urlArray[10]))
-                port = parseInt(urlArray[10]);
-
-            // Parse out any additional URI parameters on the connection string into an array.
-            if (!(typeof urlArray[15] === 'undefined'))
-                urlParams = JSON.parse('{"' + decodeURI(urlArray[15]).replace(/"/g, '\\"').replace(/&/g, '","').replace(/=/g,'":"') + '"}');
-
-            var connParams = {};
-
-            // If hostname is undefined, assume localhost
-            if (!(typeof urlArray[8] === 'undefined'))
-                connParams['hostname'] = urlArray[8];
-            else
-                connParams['hostname'] = 'localhost';
-
-            // Username and password
-            if (!(typeof urlArray[5] === 'undefined'))
-                connParams['username'] = urlArray[5];
-            if (!(typeof urlArray[7] === 'undefined'))
-                connParams['password'] = urlArray[7];
-
-            // Additional connection parameters
-            connParams['port'] = port;
-            connParams['read-only'] = 'read-only' in urlParams ? urlParams['read-only'] : '';
-            connParams['swap-red-blue'] = 'swap-red-blue' in urlParams ? urlParams['swap-red-blue'] : '';
-            connParams['cursor'] = 'cursor' in urlParams ? urlParams['cursor'] : '';
-            connParams['color-depth'] = 'color-depth' in urlParams ? parseInt(urlParams['color-depth']) : '';
-            connParams['clipboard-encoding'] = 'clipboard-encoding' in urlParams ? urlParams['clipboard-encoding'] : '';
-            connParams['dest-port'] = 'dest-port' in urlParams ? parseInt(urlParams['dest-port']) : '';
-            connParams['create-recording-path'] = 'create-recording-path' in urlParams ? urlParams['create-recording-path'] : '';
-            connParams['enable-sftp'] = 'enable-sftp' in urlParams ? urlParams['enable-sftp'] : false;
-            connParams['sftp-port'] = 'sftp-port' in urlParams ? parseInt(urlParams['sftp-port']) : 22;
-            connParams['enable-audio'] = 'enable-audio' in urlParams ? urlParams['enable-audio'] : false;
-            connParams['color-scheme'] = 'color-scheme' in urlParams ? urlParams['color-scheme'] : '';
-            connParams['font-size'] = 'font-size' in urlParams ? parseInt(urlParams['font-size']) : '';
-            connParams['create-typescript-path'] = 'create-typescript-path' in urlParams ? urlParams['create-typescript-path'] : '';
-            connParams['private-key'] = 'private-key' in urlParams ? urlParams['private-key'] : '';
-            connParams['passphrase'] = 'passphrase' in urlParams ? urlParams['passphrase'] : '';
-
-            // Set up the name of the connection based on various parts of the URI
-            var connName = urlArray[3] + '://';
-            if (!(typeof connParams['username'] === 'undefined'))
-                connName += connParams['username'] + '@';
-            connName += connParams['hostname'] + ':' + connParams['port'];
-
-            // Create the new connection            
-            $scope.connection = new Connection({
-                name : connName,
-                protocol : urlArray[3],
-                parameters: connParams
             });
-
-            // Save the new connection into the QuickConnect datasource.
-            connectionService.saveConnection($scope.selectedDataSource, $scope.connection)
-            .success(function runConnection(newConnection) {
-                // If the save succeeds, launch the new connection.
-                $location.url('/client/' + ClientIdentifier.toString({
-                            dataSource : $scope.selectedDataSource,
-                            type       : ClientIdentifier.Types.CONNECTION,
-                            id         : newConnection.identifier
-                }));
-            })
-            .error(function saveFailed(error) {
-                guacNotification.showStatus({
-                    'className'  : 'error',
-                    'title'      : 'MANAGE_CONNECTION.DIALOG_HEADER_ERROR',
-                    'text'       : error.translatableMessage,
-                    'actions'    : [ ACKNOWLEDGE_ACTION ]
-                });
-            });
-
         });
 
         return;

extensions/guacamole-auth-quickconnect/src/main/resources/services/quickConnectService.js

@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Service for managing quickConnect extension.
+ */
+angular.module('guacQuickConnect').factory('quickConnectService', ['$injector',
+        function quickConnectService($injector) {
+
+    // Required services
+    var $http                 = $injector.get('$http');
+    var authenticationService = $injector.get('authenticationService');
+    
+    var service = {};
+    
+    /**
+     * Makes a request to the REST API to create a connection, returning a
+     * promise that can be used for processing the results of the call.
+     * 
+     * @param {uri} The URI of the connection to create.
+     *                          
+     * @returns {Promise}
+     *     A promise for the HTTP call which will succeed if and only if the
+     *     save operation is successful.
+     */
+    service.createConnection = function createConnection(uri) {
+        
+        // Build HTTP parameters set
+        var httpParameters = {
+            token : authenticationService.getCurrentToken()
+        };
+
+        return $http({
+            method  : 'POST',
+            url     : 'api/session/ext/quickconnect/create',
+            params  : httpParameters,
+            data    : $.param({uri: uri }),
+            headers : {'Content-Type': 'application/x-www-form-urlencoded'}
+        });
+
+    };
+    
+    return service;
+}]);