From e868be57b8a4b367d30d499257e76fd588b98a03 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 5 Apr 2015 15:52:25 -0700 Subject: [PATCH 1/6] GUAC-1126: Remove "Home" and "Disconnect" buttons from Guacamole menu. Add user menu to Guacamole menu. --- .../main/webapp/app/client/styles/menu.css | 57 +------------------ .../webapp/app/client/templates/client.html | 5 +- 2 files changed, 4 insertions(+), 58 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/styles/menu.css b/guacamole/src/main/webapp/app/client/styles/menu.css index a3af83c82..c35949f01 100644 --- a/guacamole/src/main/webapp/app/client/styles/menu.css +++ b/guacamole/src/main/webapp/app/client/styles/menu.css @@ -69,7 +69,7 @@ } -.menu-header { +.menu-content .header { -ms-flex: 0 0 auto; -moz-box-flex: 0; @@ -77,61 +77,8 @@ -webkit-flex: 0 0 auto; flex: 0 0 auto; - /* IE10 */ - display: -ms-flexbox; - -ms-flex-align: center; - -ms-flex-direction: row; - - /* Ancient Mozilla */ - display: -moz-box; - -moz-box-align: center; - -moz-box-orient: horizontal; + margin-bottom: 0; - /* Ancient WebKit */ - display: -webkit-box; - -webkit-box-align: center; - -webkit-box-orient: horizontal; - - /* Old WebKit */ - display: -webkit-flex; - -webkit-align-items: center; - -webkit-flex-direction: row; - - /* W3C */ - display: flex; - align-items: center; - flex-direction: row; - - padding: 0.75em 0.5em; - - border-bottom: 1px solid rgba(0, 0, 0, 0.125); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.125); - background: rgba(0, 0, 0, 0.04); - -} - -.menu-header > * { - -ms-flex: 0 0 auto; - -moz-box-flex: 0; - -webkit-box-flex: 0; - -webkit-flex: 0 0 auto; - flex: 0 0 auto; -} - -.menu-header > h2 { - - -ms-flex: 1 1 auto; - -moz-box-flex: 1; - -webkit-box-flex: 1; - -webkit-flex: 1 1 auto; - flex: 1 1 auto; - - border: none; - padding: 0; - box-shadow: none; - background: none; - margin: 0; - } .menu-body { diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html index 9d8e2cb9b..7f99adf47 100644 --- a/guacamole/src/main/webapp/app/client/templates/client.html +++ b/guacamole/src/main/webapp/app/client/templates/client.html @@ -57,10 +57,9 @@
-
+

{{client.name}}

- {{'CLIENT.ACTION_NAVIGATE_HOME' | translate}} - {{'CLIENT.ACTION_DISCONNECT' | translate}} +
From cff71345d1308c957cff966022bb672630dfe2b2 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 6 Apr 2015 12:10:26 -0700 Subject: [PATCH 2/6] GUAC-1126: Query root group and permissions directly within user menu. --- .../webapp/app/client/templates/client.html | 2 +- .../main/webapp/app/home/templates/home.html | 2 +- .../manage/templates/manageConnection.html | 2 +- .../templates/manageConnectionGroup.html | 2 +- .../manage/templates/manageConnections.html | 2 +- .../app/manage/templates/manageSessions.html | 2 +- .../app/manage/templates/manageUser.html | 2 +- .../app/manage/templates/manageUsers.html | 2 +- .../app/navigation/directives/guacUserMenu.js | 74 +++++++++++-------- .../webapp/app/navigation/navigationModule.js | 2 +- 10 files changed, 52 insertions(+), 40 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html index 7f99adf47..16d2b23ed 100644 --- a/guacamole/src/main/webapp/app/client/templates/client.html +++ b/guacamole/src/main/webapp/app/client/templates/client.html @@ -59,7 +59,7 @@

{{client.name}}

- +
diff --git a/guacamole/src/main/webapp/app/home/templates/home.html b/guacamole/src/main/webapp/app/home/templates/home.html index 4bbfa6f05..be41ada77 100644 --- a/guacamole/src/main/webapp/app/home/templates/home.html +++ b/guacamole/src/main/webapp/app/home/templates/home.html @@ -27,7 +27,7 @@

{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html index 7cdfabe8e..6f0505959 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html @@ -25,7 +25,7 @@ THE SOFTWARE.

{{'MANAGE_CONNECTION.SECTION_HEADER_EDIT_CONNECTION' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html index 7986c735d..f1fb395df 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html @@ -25,7 +25,7 @@ THE SOFTWARE.

{{'MANAGE_CONNECTION_GROUP.SECTION_HEADER_EDIT_CONNECTION_GROUP' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnections.html b/guacamole/src/main/webapp/app/manage/templates/manageConnections.html index e314e299a..84773c8e7 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageConnections.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageConnections.html @@ -24,7 +24,7 @@ THE SOFTWARE.

{{'MANAGE_CONNECTION.SECTION_HEADER_CONNECTIONS' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageSessions.html b/guacamole/src/main/webapp/app/manage/templates/manageSessions.html index 5b50f5f64..2b39290e1 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageSessions.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageSessions.html @@ -24,7 +24,7 @@ THE SOFTWARE.

{{'MANAGE_SESSION.SECTION_HEADER_SESSIONS' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html index 65c34eb06..188656253 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html @@ -25,7 +25,7 @@ THE SOFTWARE.

{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUsers.html b/guacamole/src/main/webapp/app/manage/templates/manageUsers.html index e61cc3564..e1231a262 100644 --- a/guacamole/src/main/webapp/app/manage/templates/manageUsers.html +++ b/guacamole/src/main/webapp/app/manage/templates/manageUsers.html @@ -24,7 +24,7 @@ THE SOFTWARE.

{{'MANAGE_USER.SECTION_HEADER_USERS' | translate}}

- +
diff --git a/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js b/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js index f48d30344..847c0d097 100644 --- a/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js +++ b/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js @@ -30,22 +30,6 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() restrict: 'E', replace: true, scope: { - - /** - * The permissions associated with the user for whom this menu is - * being displayed. - * - * @type PermissionSet - */ - permissions : '=', - - /** - * The root of the connection group tree. - * - * @type ConnectionGroup - */ - rootGroup : '=' - }, templateUrl: 'app/navigation/templates/guacUserMenu.html', @@ -56,12 +40,14 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() var PermissionSet = $injector.get('PermissionSet'); // Get required services - var $document = $injector.get('$document'); - var $location = $injector.get('$location'); - var authenticationService = $injector.get('authenticationService'); - var guacNotification = $injector.get('guacNotification'); - var userService = $injector.get('userService'); - var userPageService = $injector.get('userPageService'); + var $document = $injector.get('$document'); + var $location = $injector.get('$location'); + var authenticationService = $injector.get('authenticationService'); + var connectionGroupService = $injector.get("connectionGroupService"); + var guacNotification = $injector.get('guacNotification'); + var permissionService = $injector.get("permissionService"); + var userService = $injector.get('userService'); + var userPageService = $injector.get('userPageService'); /** * An action to be provided along with the object sent to @@ -89,6 +75,22 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() */ var document = $document[0]; + /** + * The root connection group, or null if the connection group hierarchy has + * not yet been loaded. + * + * @type ConnectionGroup + */ + var rootConnectionGroup = null; + + /** + * All permissions associated with the current user, or null if the user's + * permissions have not yet been loaded. + * + * @type PermissionSet + */ + var permissions = null; + /** * Whether the current user has sufficient permissions to change * his/her own password. If permissions have not yet been loaded, @@ -149,33 +151,43 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() */ var updateMenuItems = function updateMenuItems() { - // Menu items are unknown until permissions and rootGroup are both available - if (!$scope.permissions || !$scope.rootGroup) { + // Menu items are unknown until permissions and rootConnectionGroup are both available + if (!permissions || !rootConnectionGroup) { $scope.canChangePassword = null; $scope.pages = []; return; } // Retrieve the main pages from the user page service - $scope.pages = userPageService.getMainPages($scope.rootGroup, $scope.permissions); + $scope.pages = userPageService.getMainPages(rootConnectionGroup, permissions); // Check whether the current user can change their own password $scope.canChangePassword = PermissionSet.hasUserPermission( - $scope.permissions, PermissionSet.ObjectPermissionType.UPDATE, + permissions, PermissionSet.ObjectPermissionType.UPDATE, authenticationService.getCurrentUserID() ); }; - // Update available menu options when permissions are changed - $scope.$watch('permissions', function permissionsChanged() { + // Retrieve root group and all descendants + connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER) + .success(function rootConnectionGroupRetrieved(retrievedRootConnectionGroup) { + + rootConnectionGroup = retrievedRootConnectionGroup; + + // Navigate to home page, if not already there + var homePage = userPageService.getHomePage(rootConnectionGroup); + $location.url(homePage.url); + updateMenuItems(); }); - // Update available menu options when root group is changed - $scope.$watch('rootGroup', function rootGroupChanged() { + // Retrieve current permissions + permissionService.getPermissions(authenticationService.getCurrentUserID()) + .success(function permissionsRetrieved(retrievedPermissions) { + permissions = retrievedPermissions; updateMenuItems(); }); - + /** * Toggles visibility of the user menu. */ diff --git a/guacamole/src/main/webapp/app/navigation/navigationModule.js b/guacamole/src/main/webapp/app/navigation/navigationModule.js index 089255940..06039e118 100644 --- a/guacamole/src/main/webapp/app/navigation/navigationModule.js +++ b/guacamole/src/main/webapp/app/navigation/navigationModule.js @@ -23,4 +23,4 @@ /** * Module for generating and implementing user navigation options. */ -angular.module('navigation', ['notification']); +angular.module('navigation', ['notification', 'rest']); From 9c7e98c97ea1a9c4c6e1693ec98c75bfa957e522 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 6 Apr 2015 14:32:55 -0700 Subject: [PATCH 3/6] GUAC-1126: Query root group and permissions directly within user page service. Return promises instead of pages. --- .../app/home/controllers/homeController.js | 29 ++----- .../app/navigation/directives/guacUserMenu.js | 79 ++++------------- .../navigation/services/userPageService.js | 86 +++++++++++++++++-- 3 files changed, 100 insertions(+), 94 deletions(-) diff --git a/guacamole/src/main/webapp/app/home/controllers/homeController.js b/guacamole/src/main/webapp/app/home/controllers/homeController.js index 82782be95..95ef1e525 100644 --- a/guacamole/src/main/webapp/app/home/controllers/homeController.js +++ b/guacamole/src/main/webapp/app/home/controllers/homeController.js @@ -30,10 +30,8 @@ angular.module('home').controller('homeController', ['$scope', '$injector', var ConnectionGroup = $injector.get("ConnectionGroup"); // Get required services - var $location = $injector.get("$location"); var authenticationService = $injector.get("authenticationService"); var connectionGroupService = $injector.get("connectionGroupService"); - var permissionService = $injector.get("permissionService"); var userPageService = $injector.get("userPageService"); /** @@ -44,14 +42,6 @@ angular.module('home').controller('homeController', ['$scope', '$injector', */ $scope.rootConnectionGroup = null; - /** - * All permissions associated with the current user, or null if the user's - * permissions have not yet been loaded. - * - * @type PermissionSet - */ - $scope.permissions = null; - /** * Returns whether critical data has completed being loaded. * @@ -61,27 +51,20 @@ angular.module('home').controller('homeController', ['$scope', '$injector', */ $scope.isLoaded = function isLoaded() { - return $scope.rootConnectionGroup !== null - && $scope.permissions !== null; + return $scope.rootConnectionGroup !== null; }; // Retrieve root group and all descendants connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER) .success(function rootGroupRetrieved(rootConnectionGroup) { - $scope.rootConnectionGroup = rootConnectionGroup; + }); - // Navigate to home page, if not already there - var homePage = userPageService.getHomePage(rootConnectionGroup); + // Navigate to home page, if not already there + userPageService.getHomePage() + .then(function homePageRetrieved(homePage) { $location.url(homePage.url); - }); - - // Retrieve current permissions - permissionService.getPermissions(authenticationService.getCurrentUserID()) - .success(function permissionsRetrieved(permissions) { - $scope.permissions = permissions; - }); - + }]); diff --git a/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js b/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js index 847c0d097..c9c09f7d2 100644 --- a/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js +++ b/guacamole/src/main/webapp/app/navigation/directives/guacUserMenu.js @@ -36,18 +36,16 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() controller: ['$scope', '$injector', '$element', function guacUserMenuController($scope, $injector, $element) { // Get required types - var ConnectionGroup = $injector.get('ConnectionGroup'); - var PermissionSet = $injector.get('PermissionSet'); + var PermissionSet = $injector.get('PermissionSet'); // Get required services - var $document = $injector.get('$document'); - var $location = $injector.get('$location'); - var authenticationService = $injector.get('authenticationService'); - var connectionGroupService = $injector.get("connectionGroupService"); - var guacNotification = $injector.get('guacNotification'); - var permissionService = $injector.get("permissionService"); - var userService = $injector.get('userService'); - var userPageService = $injector.get('userPageService'); + var $document = $injector.get('$document'); + var $location = $injector.get('$location'); + var authenticationService = $injector.get('authenticationService'); + var guacNotification = $injector.get('guacNotification'); + var permissionService = $injector.get("permissionService"); + var userService = $injector.get('userService'); + var userPageService = $injector.get('userPageService'); /** * An action to be provided along with the object sent to @@ -75,22 +73,6 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() */ var document = $document[0]; - /** - * The root connection group, or null if the connection group hierarchy has - * not yet been loaded. - * - * @type ConnectionGroup - */ - var rootConnectionGroup = null; - - /** - * All permissions associated with the current user, or null if the user's - * permissions have not yet been loaded. - * - * @type PermissionSet - */ - var permissions = null; - /** * Whether the current user has sufficient permissions to change * his/her own password. If permissions have not yet been loaded, @@ -143,49 +125,22 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() */ $scope.pages = null; - /** - * Updates the visible menu items based on the permissions and root - * group on the scope, if available. If either the permissions or - * the root group are not yet available, this function has no - * effect. - */ - var updateMenuItems = function updateMenuItems() { - - // Menu items are unknown until permissions and rootConnectionGroup are both available - if (!permissions || !rootConnectionGroup) { - $scope.canChangePassword = null; - $scope.pages = []; - return; - } - - // Retrieve the main pages from the user page service - $scope.pages = userPageService.getMainPages(rootConnectionGroup, permissions); - + // Retrieve current permissions + permissionService.getPermissions(authenticationService.getCurrentUserID()) + .success(function permissionsRetrieved(permissions) { + // Check whether the current user can change their own password $scope.canChangePassword = PermissionSet.hasUserPermission( permissions, PermissionSet.ObjectPermissionType.UPDATE, authenticationService.getCurrentUserID() ); - }; - // Retrieve root group and all descendants - connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER) - .success(function rootConnectionGroupRetrieved(retrievedRootConnectionGroup) { - - rootConnectionGroup = retrievedRootConnectionGroup; - - // Navigate to home page, if not already there - var homePage = userPageService.getHomePage(rootConnectionGroup); - $location.url(homePage.url); - - updateMenuItems(); }); - - // Retrieve current permissions - permissionService.getPermissions(authenticationService.getCurrentUserID()) - .success(function permissionsRetrieved(retrievedPermissions) { - permissions = retrievedPermissions; - updateMenuItems(); + + // Retrieve the main pages from the user page service + userPageService.getMainPages() + .then(function retrievedMainPages(pages) { + $scope.pages = pages; }); /** diff --git a/guacamole/src/main/webapp/app/navigation/services/userPageService.js b/guacamole/src/main/webapp/app/navigation/services/userPageService.js index 8a6d37b4f..90e6710a4 100644 --- a/guacamole/src/main/webapp/app/navigation/services/userPageService.js +++ b/guacamole/src/main/webapp/app/navigation/services/userPageService.js @@ -31,7 +31,10 @@ angular.module('navigation').factory('userPageService', ['$injector', var PermissionSet = $injector.get('PermissionSet'); // Get required services - var authenticationService = $injector.get('authenticationService'); + var $q = $injector.get('$q'); + var authenticationService = $injector.get('authenticationService'); + var connectionGroupService = $injector.get("connectionGroupService"); + var permissionService = $injector.get("permissionService"); var service = {}; @@ -52,7 +55,7 @@ angular.module('navigation').factory('userPageService', ['$injector', this.name = name; this.url = url; }; - + /** * Returns an appropriate home page for the current user. * @@ -62,7 +65,7 @@ angular.module('navigation').factory('userPageService', ['$injector', * @returns {Page} * The user's home page. */ - service.getHomePage = function getHomePage(rootGroup) { + var generateHomePage = function generateHomePage(rootGroup) { // Get children var connections = rootGroup.childConnections || []; @@ -96,7 +99,7 @@ angular.module('navigation').factory('userPageService', ['$injector', } - // Default home page + // Resolve promise with default home page return new Page( 'USER_MENU.ACTION_NAVIGATE_HOME', '/' @@ -104,6 +107,27 @@ angular.module('navigation').factory('userPageService', ['$injector', }; + /** + * Returns a promise which resolves with an appropriate home page for the + * current user. + * + * @returns {Promise.} + * A promise which resolves with the user's default home page. + */ + service.getHomePage = function getHomePage() { + + var deferred = $q.defer(); + + // Resolve promise using home page derived from root connection group + connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER) + .success(function rootConnectionGroupRetrieved(rootGroup) { + deferred.resolve(generateHomePage(rootGroup)); + }); + + return deferred.promise; + + }; + /** * Returns all the main pages that the current user can visit. This can * include the home page, manage pages, etc. In the case that there are no @@ -115,10 +139,10 @@ angular.module('navigation').factory('userPageService', ['$injector', * @param {PermissionSet} permissions * The permissions for the current user. * - * @returns {Array} - * An array of objects like this + * @returns {Page[]} + * An array of all main pages that the current user can visit. */ - service.getMainPages = function getMainPages(rootGroup, permissions) { + var generateMainPages = function generateMainPages(rootGroup, permissions) { var pages = []; @@ -172,7 +196,7 @@ angular.module('navigation').factory('userPageService', ['$injector', PermissionSet.hasSystemPermission(permissions, PermissionSet.SystemPermissionType.ADMINISTER); // Add home page - pages.push(service.getHomePage(rootGroup)); + pages.push(generateHomePage(rootGroup)); // If user can manage users, add link to user management page if (canManageUsers) { @@ -200,7 +224,51 @@ angular.module('navigation').factory('userPageService', ['$injector', return pages; }; - + + /** + * Returns a promise which resolves to an array of all main pages that the + * current user can visit. This can include the home page, manage pages, + * etc. In the case that there are no applicable pages of this sort, it may + * return a client page. + * + * @returns {Promise.} + * A promise which resolves to an array of all main pages that the + * current user can visit. + */ + service.getMainPages = function getMainPages() { + + var deferred = $q.defer(); + + var rootGroup = null; + var permissions = null; + + /** + * Resolves the main pages retrieval promise, if possible. If + * insufficient data is available, this function does nothing. + */ + var resolveMainPages = function resolveMainPages() { + if (rootGroup && permissions) + deferred.resolve(generateMainPages(rootGroup, permissions)); + }; + + // Retrieve root group, resolving main pages if possible + connectionGroupService.getConnectionGroupTree(ConnectionGroup.ROOT_IDENTIFIER) + .success(function rootConnectionGroupRetrieved(retrievedRootGroup) { + rootGroup = retrievedRootGroup; + resolveMainPages(); + }); + + // Retrieve current permissions, resolving main pages if possible + permissionService.getPermissions(authenticationService.getCurrentUserID()) + .success(function permissionsRetrieved(retrievedPermissions) { + permissions = retrievedPermissions; + resolveMainPages(); + }); + + return deferred.promise; + + }; + return service; }]); \ No newline at end of file From ca8379d938b56693e8b7244386c0b878746c02c5 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 6 Apr 2015 14:33:33 -0700 Subject: [PATCH 4/6] GUAC-1126: Query home page directly when logging in. Do not rely on redirect from '/'. --- .../main/webapp/app/login/controllers/loginController.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guacamole/src/main/webapp/app/login/controllers/loginController.js b/guacamole/src/main/webapp/app/login/controllers/loginController.js index 9f8078733..565abc6c7 100644 --- a/guacamole/src/main/webapp/app/login/controllers/loginController.js +++ b/guacamole/src/main/webapp/app/login/controllers/loginController.js @@ -26,6 +26,7 @@ angular.module('login').controller('loginController', ['$scope', '$injector', // Required services var $location = $injector.get("$location"); var authenticationService = $injector.get("authenticationService"); + var userPageService = $injector.get('userPageService'); /** * Whether an error occurred during login. @@ -52,7 +53,10 @@ angular.module('login').controller('loginController', ['$scope', '$injector', // Redirect to main view upon success .success(function success(data, status, headers, config) { - $location.path('/'); + userPageService.getHomePage() + .then(function homePageRetrieved(homePage) { + $location.url(homePage.url); + }); }) // Reset and focus password upon failure From 8ead3a9d812925e3a49c6be189b5a1ca3ff147b1 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 6 Apr 2015 17:02:04 -0700 Subject: [PATCH 5/6] GUAC-1126: Re-route user within route config. --- .../app/home/controllers/homeController.js | 7 --- .../app/index/config/indexRouteConfig.js | 57 +++++++++++++++++-- .../src/main/webapp/app/index/indexModule.js | 1 + 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/guacamole/src/main/webapp/app/home/controllers/homeController.js b/guacamole/src/main/webapp/app/home/controllers/homeController.js index 95ef1e525..89f88e25a 100644 --- a/guacamole/src/main/webapp/app/home/controllers/homeController.js +++ b/guacamole/src/main/webapp/app/home/controllers/homeController.js @@ -32,7 +32,6 @@ angular.module('home').controller('homeController', ['$scope', '$injector', // Get required services var authenticationService = $injector.get("authenticationService"); var connectionGroupService = $injector.get("connectionGroupService"); - var userPageService = $injector.get("userPageService"); /** * The root connection group, or null if the connection group hierarchy has @@ -61,10 +60,4 @@ angular.module('home').controller('homeController', ['$scope', '$injector', $scope.rootConnectionGroup = rootConnectionGroup; }); - // Navigate to home page, if not already there - userPageService.getHomePage() - .then(function homePageRetrieved(homePage) { - $location.url(homePage.url); - }); - }]); diff --git a/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js b/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js index 456997774..837f4e632 100644 --- a/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js +++ b/guacamole/src/main/webapp/app/index/config/indexRouteConfig.js @@ -62,6 +62,57 @@ angular.module('index').config(['$routeProvider', '$locationProvider', }]; + /** + * Redirects the user to their home page. This necessarily requires + * attempting to re-authenticate with the Guacamole server, as the user's + * credentials may have changed, and thus their most-appropriate home page + * may have changed as well. + * + * @param {Service} $injector + * The Angular $injector service. + * + * @returns {Promise} + * A promise which resolves successfully only after an attempt to + * re-authenticate and determine the user's proper home page has been + * made. + */ + var routeToUserHomePage = ['$injector', function routeToUserHomePage($injector) { + + // Required services + var $location = $injector.get('$location'); + var $q = $injector.get('$q'); + var userPageService = $injector.get('userPageService'); + + // Promise for redirection attempt + var redirect = $q.defer(); + + // Re-authenticate including any parameters in URL + $injector.invoke(updateCurrentToken) + .then(function tokenUpdateComplete() { + + // Redirect to home page + userPageService.getHomePage() + .then(function homePageRetrieved(homePage) { + $location.url(homePage.url); + }) + + // If retrieval of home page fails, assume '/' + ['catch'](function homePageFailed() { + $location.url('/'); + }) + + // Resolve promise in either case + ['finally'](function retrievalAttemptComplete() { + redirect.resolve(); + }); + + }); + + // Return promise that will resolve regardless of success/failure + return redirect.promise; + + }]; + // Configure each possible route $routeProvider @@ -71,7 +122,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', bodyClassName : 'home', templateUrl : 'app/home/templates/home.html', controller : 'homeController', - resolve : { updateCurrentToken: updateCurrentToken } + resolve : { routeToUserHomePage: routeToUserHomePage } }) // Connection management screen @@ -147,9 +198,7 @@ angular.module('index').config(['$routeProvider', '$locationProvider', // Redirect to home screen if page not found .otherwise({ - redirectTo : '/' + resolve : { routeToUserHomePage: routeToUserHomePage } }); }]); - - diff --git a/guacamole/src/main/webapp/app/index/indexModule.js b/guacamole/src/main/webapp/app/index/indexModule.js index 9f513b0d7..a1d927330 100644 --- a/guacamole/src/main/webapp/app/index/indexModule.js +++ b/guacamole/src/main/webapp/app/index/indexModule.js @@ -29,6 +29,7 @@ angular.module('index', [ 'home', 'login', 'manage', + 'navigation', 'ngRoute', 'ngTouch', 'notification', From 9cf41001ed876d24dd8e70bbfe987fc0f971eaa7 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 6 Apr 2015 17:08:52 -0700 Subject: [PATCH 6/6] GUAC-1126: Depend on 'navigation' module within login. --- guacamole/src/main/webapp/app/login/loginModule.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacamole/src/main/webapp/app/login/loginModule.js b/guacamole/src/main/webapp/app/login/loginModule.js index 7f7577a80..54e531233 100644 --- a/guacamole/src/main/webapp/app/login/loginModule.js +++ b/guacamole/src/main/webapp/app/login/loginModule.js @@ -23,4 +23,4 @@ /** * The module for the login functionality. */ -angular.module('login', ['element']); +angular.module('login', ['element', 'navigation']);