Merge 1.4.0 changes back to master.

guacamole/pom.xml

@@ -26,14 +26,14 @@
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole</artifactId>
     <packaging>war</packaging>
-    <version>1.3.0</version>
+    <version>1.4.0</version>
     <name>guacamole</name>
     <url>http://guacamole.apache.org/</url>
 
     <parent>
         <groupId>org.apache.guacamole</groupId>
         <artifactId>guacamole-client</artifactId>
-        <version>1.3.0</version>
+        <version>1.4.0</version>
         <relativePath>../</relativePath>
     </parent>
 
@@ -237,14 +237,14 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
         </dependency>
 
         <!-- Guacamole JavaScript API -->
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-common-js</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
             <type>zip</type>
             <scope>runtime</scope>
         </dependency>

guacamole/src/main/frontend/src/app/index/controllers/indexController.js

@@ -25,6 +25,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector',
 
     // Required services
     const $document         = $injector.get('$document');
+    const $location         = $injector.get('$location');
     const $route            = $injector.get('$route');
     const $window           = $injector.get('$window');
     const clipboardService  = $injector.get('clipboardService');
@@ -220,13 +221,22 @@ angular.module('index').controller('indexController', ['$scope', '$injector',
     }, true);
 
     /**
-     * Reloads the current route and controller, effectively forcing
-     * reauthentication. If the user is not logged in, this will result in
-     * the login screen appearing.
+     * Navigates the user back to the root of the application (or reloads the
+     * current route and controller if the user is already there), effectively
+     * forcing reauthentication. If the user is not logged in, this will result
+     * in the login screen appearing.
      */
     $scope.reAuthenticate = function reAuthenticate() {
+
         $scope.reAuthenticating = true;
-        $route.reload();
+
+        // Clear out URL state to conveniently bring user back to home screen
+        // upon relogin
+        if ($location.path() !== '/')
+            $location.url('/');
+        else
+            $route.reload();
+
     };
 
     // Display login screen if a whole new set of credentials is needed

guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java

@@ -66,7 +66,8 @@ public class ExtensionModule extends ServletModule {
             "1.0.0",
             "1.1.0",
             "1.2.0",
-            "1.3.0"
+            "1.3.0",
+            "1.4.0"
         ));
 
     /**