From 28cbd5c25147ddc21370b4dd6c7cfe3f6c344613 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 28 Dec 2016 10:59:33 -0500 Subject: [PATCH] LP#1526185 op-change supplies egNet.handlePermFailure Teach egOpChange to handle permission failure events via the new egNet.handlePermFailure() handler. This commit includes additional repairs to op-change promise handling and minor formatting adjustments. Op-change also now displays the username of the op-changed user in the navbar immediately upon op-change. Signed-off-by: Bill Erickson Signed-off-by: Kathy Lussier --- .../src/templates/staff/share/t_opchange.tt2 | 14 +-- .../js/ui/default/staff/services/navbar.js | 18 ++-- .../js/ui/default/staff/services/op_change.js | 89 ++++++++++++------- 3 files changed, 75 insertions(+), 46 deletions(-) diff --git a/Open-ILS/src/templates/staff/share/t_opchange.tt2 b/Open-ILS/src/templates/staff/share/t_opchange.tt2 index 2ca7fbe787..584c2960b4 100644 --- a/Open-ILS/src/templates/staff/share/t_opchange.tt2 +++ b/Open-ILS/src/templates/staff/share/t_opchange.tt2 @@ -8,30 +8,32 @@

{{title}}

-
+

{{message}}

-
+
[% l('Username:') %]
- +
-
+
[% l('Password:') %]
- +
-
+
[% l('Login Type:') %]
diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js index 1c9f97ccc1..e70d926f12 100644 --- a/Open-ILS/web/js/ui/default/staff/services/navbar.js +++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js @@ -26,10 +26,10 @@ angular.module('egCoreMod') inspect(element); }, - controller:['$scope','$window','$location','$timeout','hotkeys','egCore','$uibModal','ngToast', - 'egOpChange', - function($scope , $window , $location , $timeout , hotkeys , egCore , $uibModal , ngToast, - egOpChange) { + controller:['$scope','$window','$location','$timeout','hotkeys', + 'egCore','$uibModal','ngToast','egOpChange', + function($scope , $window , $location , $timeout , hotkeys , + egCore , $uibModal , ngToast, egOpChange) { function navTo(path) { // Strip the leading "./" if any. @@ -75,11 +75,17 @@ angular.module('egCoreMod') } $scope.changeOperatorUndo = function() { - $scope.op_changed = egOpChange.changeOperatorUndo(); + egOpChange.changeOperatorUndo().then(function() { + $scope.op_changed = false; + $scope.username = egCore.auth.user().usrname(); + }); } $scope.changeOperator = function() { - $scope.op_changed = egOpChange.changeOperator(true); + egOpChange.changeOperator(true).then(function() { + $scope.op_changed = true; + $scope.username = egCore.auth.user().usrname(); + }); } $scope.currentToken = function () { diff --git a/Open-ILS/web/js/ui/default/staff/services/op_change.js b/Open-ILS/web/js/ui/default/staff/services/op_change.js index 3f233a7c38..94d669062a 100644 --- a/Open-ILS/web/js/ui/default/staff/services/op_change.js +++ b/Open-ILS/web/js/ui/default/staff/services/op_change.js @@ -11,66 +11,87 @@ angular.module('egCoreMod') ['$uibModal','$interpolate', '$rootScope', '$q', 'egAuth', 'egStrings', 'egNet', 'ngToast', function($uibModal, $interpolate, $rootScope, $q, egAuth, egStrings, egNet, ngToast) { - var service = {}; + var service = {}; - - service.changeOperator = function(calledFromNavbar, failedRequest) { - var _op_changed = false; - $uibModal.open({ + // Returns a promise resolved upon successful op-change. + // Rejected otherwise. + service.changeOperator = function(showTypes, permEvt) { + return $uibModal.open({ templateUrl: './share/t_opchange', controller: ['$scope', '$uibModalInstance', function($scope, $uibModalInstance) { $scope.args = {username : '', password : '', type : 'temp'}; - $scope.displayTypeField = calledFromNavbar; + $scope.displayTypeField = showTypes; $scope.title = egStrings.OP_CHANGE_TITLE; - if(failedRequest) { - $scope.title = failedRequest.perm_evt.desc + ": " - + failedRequest.perm_evt.ilsperm; + if (permEvt) { + $scope.title = permEvt.desc + ": " + permEvt.ilsperm; $scope.message = egStrings.OP_CHANGE_PERM_MESSAGE; - console.log($scope.message); } $scope.focus = true; $scope.ok = function() { $uibModalInstance.close($scope.args) } $scope.cancel = function () { $uibModalInstance.dismiss() } }] }).result.then(function (args) { - if (!args || !args.username || !args.password) return; + if (!args || !args.username || !args.password) + return $q.reject(); + args.type = args.type || 'temp'; args.workstation = egAuth.workstation(); - egAuth.opChange(args).then( + return egAuth.opChange(args).then( function() { - _op_changed = true; - if(failedRequest) { - console.log(js2JSON(failedRequest)); - egNet.request( - failedRequest.service, - failedRequest.method, - egAuth.token(), - failedRequest.params[1] - ).then(service.changeOperatorUndo()); - } else { - ngToast.create(egStrings.OP_CHANGE_SUCCESS); - } + console.debug('op-change succeeded'); + ngToast.create(egStrings.OP_CHANGE_SUCCESS); }, function() { + console.debug('op-change failed'); ngToast.warning(egStrings.OP_CHANGE_FAILURE); } ); }); - return _op_changed; } + // Returns a promise resolved on successful op-change undo. service.changeOperatorUndo = function() { - egAuth.opChangeUndo(); - var _op_changed = false; - ngToast.create(egStrings.OP_CHANGE_SUCCESS); - return _op_changed; + return egAuth.opChangeUndo().then( + function() { + console.debug('op-change undo succeeded'); + ngToast.create(egStrings.OP_CHANGE_SUCCESS); + }, + function() { + console.debug('op-change undo failed'); + ngToast.warning(egStrings.OP_CHANGE_FAILURE); + } + ); } - //Check for any permission failure broadcasts. then call changeOperator and retry the action - $rootScope.$on('egNetPermFailure', function(args, request_info) { - var op_changed = service.changeOperator(false, request_info); - }) + // Tell egNet to use our permission failure handler, + // since we know how to launch a login override dialog. + // + // 1. Launch the change-operator dialog + // 2. If op-change succeeds, re-do the failed request using the + // op-change'd authtoken. + // 3. Undo the op-change. + // + // Returns a promise resolved along with the re-ran request. + egNet.handlePermFailure = function(request) { + console.debug("perm override required for "+request.method); + + return service.changeOperator(false, request.evt).then(function() { + + return egNet.requestWithParamList( + request.service, + request.method, + // original params, but replace the failed authtoken + // with the op-change'd authtoken + [egAuth.token()].concat(request.params.splice(1)) + + )['finally'](function() { + // always undo the operator change after a perm override. + console.debug("clearing op-change after perm override redo"); + service.changeOperatorUndo(); + }); + }); + } - return service; + return service; }]) -- 2.43.2