vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Prevent organizations from attempting an account recovery.

Browse source
This commit is contained in:
yackob03 2014-01-10 13:30:17 -05:00
parent 1f8a82eefe
commit 223d2ebaf1
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/model.py
View file

@ -350,6 +350,9 @@ def create_reset_password_email_code(email):
except User.DoesNotExist: except User.DoesNotExist:
raise InvalidEmailAddressException('Email address was not found.'); raise InvalidEmailAddressException('Email address was not found.');
if user.organization:
raise InvalidEmailAddressException('Organizations can not have passwords.')
code = EmailConfirmation.create(user=user, pw_reset=True) code = EmailConfirmation.create(user=user, pw_reset=True)
return code return code

2
static/directives/user-setup.html
View file

@ -43,7 +43,7 @@
<button class="btn btn-lg btn-primary btn-block" type="submit">Send Recovery Email</button> <button class="btn btn-lg btn-primary btn-block" type="submit">Send Recovery Email</button>
</form> </form>
<div class="alert alert-danger" ng-show="invalidEmail">Unable to locate account.</div> <div class="alert alert-danger" ng-show="invalidRecovery">{{errorMessage}}</div>
<div class="alert alert-success" ng-show="sent">Account recovery email was sent.</div> <div class="alert alert-success" ng-show="sent">Account recovery email was sent.</div>
</div> </div>

6
static/js/app.js
View file

@ -831,10 +831,12 @@ quayApp.directive('userSetup', function () {
controller: function($scope, $location, $timeout, ApiService, KeyService, UserService) { controller: function($scope, $location, $timeout, ApiService, KeyService, UserService) {
$scope.sendRecovery = function() { $scope.sendRecovery = function() {
ApiService.requestRecoveryEmail($scope.recovery).then(function() { ApiService.requestRecoveryEmail($scope.recovery).then(function() {
$scope.invalidEmail = false; $scope.invalidRecovery = false;
$scope.errorMessage = '';
$scope.sent = true; $scope.sent = true;
}, function(result) { }, function(result) {
$scope.invalidEmail = true; $scope.invalidRecovery = true;
$scope.errorMessage = result.data;
$scope.sent = false; $scope.sent = false;
}); });
}; };