Make email addresses optional in external auth if email feature is turned off

Before this change, external auth such as Keystone would fail if a user without an email address tried to login, even if the email feature was disabled.
This commit is contained in:
Joseph Schorr 2016-09-08 12:24:47 -04:00
parent 934cdecbd6
commit d7f56350a4
18 changed files with 206 additions and 93 deletions

View file

@ -10,7 +10,7 @@
})
}]);
function OrgViewCtrl($scope, $routeParams, $timeout, ApiService, UIService, AvatarService) {
function OrgViewCtrl($scope, $routeParams, $timeout, ApiService, UIService, AvatarService, Config, Features) {
var orgname = $routeParams.orgname;
$scope.namespace = orgname;
@ -22,6 +22,9 @@
$scope.changeEmailInfo = null;
$scope.context = {};
$scope.Config = Config;
$scope.Features = Features;
$scope.orgScope = {
'changingOrganization': false,
'organizationEmail': ''