libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #3353 from ssilvert/confirm-flow-delete

Browse source 
KEYCLOAK-2918: Confirm before custom auth flow deletion
This commit is contained in:
Stan Silvert 2016-10-19 07:55:51 -04:00 committed by GitHub
commit 3c8aaaa61f
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
themes/src/main/resources/theme/base/admin/resources/js/controllers/realm.js
View file

@ -1955,7 +1955,7 @@ module.controller('CreateExecutionCtrl', function($scope, realm, parentFlow, for
module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flows, selectedFlow, LastFlowSelected,
module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flows, selectedFlow, LastFlowSelected, Dialog,
AuthenticationFlows, AuthenticationFlowsCopy, AuthenticationFlowExecutions,
AuthenticationExecution, AuthenticationExecutionRaisePriority, AuthenticationExecutionLowerPriority,
$modal, Notifications, CopyDialog, $location) {
@ -2034,6 +2034,12 @@ module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flo
})
};
$scope.deleteFlow = function() {
Dialog.confirmDelete($scope.flow.alias, 'flow', function() {
$scope.removeFlow();
});
};
$scope.removeFlow = function() {
console.log('Remove flow:' + $scope.flow.alias);
if (realm.browserFlow == $scope.flow.alias) {
@ -2053,9 +2059,8 @@ module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flo
} else {
AuthenticationFlows.remove({realm: realm.realm, flow: $scope.flow.id}, function () {
$location.url("/realms/" + realm.realm + '/authentication/flows');
$location.url("/realms/" + realm.realm + '/authentication/flows/' + flows[0].alias);
Notifications.success("Flow removed");
})
}
@ -2100,10 +2105,14 @@ module.controller('AuthenticationFlowsCtrl', function($scope, $route, realm, flo
$scope.removeExecution = function(execution) {
console.log('removeExecution: ' + execution.id);
AuthenticationExecution.remove({realm: realm.realm, execution: execution.id}, function() {
Notifications.success("Execution removed");
setupForm();
})
var exeOrFlow = execution.authenticationFlow ? 'flow' : 'execution';
Dialog.confirmDelete(execution.displayName, exeOrFlow, function() {
AuthenticationExecution.remove({realm: realm.realm, execution: execution.id}, function() {
Notifications.success("The " + exeOrFlow + " was removed.");
setupForm();
});
});
}
$scope.raisePriority = function(execution) {

2
themes/src/main/resources/theme/base/admin/resources/partials/authentication-flows.html
View file

@ -17,7 +17,7 @@
<div class="pull-right" data-ng-show="access.manageRealm">
<button class="btn btn-default" data-ng-click="createFlow()">{{:: 'new' | translate}}</button>
<button class="btn btn-default" data-ng-click="copyFlow()">{{:: 'copy' | translate}}</button>
<button class="btn btn-default" data-ng-hide="flow.builtIn" data-ng-click="removeFlow()">{{:: 'delete' | translate}}</button>
<button class="btn btn-default" data-ng-hide="flow.builtIn" data-ng-click="deleteFlow()">{{:: 'delete' | translate}}</button>
<button class="btn btn-default" data-ng-hide="flow.builtIn" data-ng-click="addExecution()">{{:: 'add-execution' | translate}}</button>
<button class="btn btn-default" data-ng-hide="flow.builtIn || flow.providerId === 'client-flow'" data-ng-click="addFlow()">{{:: 'add-flow' | translate}}</button>
</div>