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

Return 403 if the user logged in is now an org and handle it on the client

Browse source
This commit is contained in:
Joseph Schorr 2013-11-11 19:03:18 -05:00
parent 743e95c50e
commit 07b9128ab6
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
endpoints/api.py
View file

@ -40,6 +40,10 @@ def api_login_required(f):
def decorated_view(*args, **kwargs): def decorated_view(*args, **kwargs):
if not current_user.is_authenticated(): if not current_user.is_authenticated():
abort(401) abort(401)
if current_user.db_user().organization:
abort(403)
return f(*args, **kwargs) return f(*args, **kwargs)
return decorated_view return decorated_view
@ -78,7 +82,7 @@ def get_logged_in_user():
'can_create_repo': admin_org.can() or CreateRepositoryPermission(o.username).can() 'can_create_repo': admin_org.can() or CreateRepositoryPermission(o.username).can()
} }
if current_user.is_anonymous(): if current_user.is_anonymous() or current_user.db_user().organization:
return jsonify({'anonymous': True}) return jsonify({'anonymous': True})
user = current_user.db_user() user = current_user.db_user()
@ -223,9 +227,7 @@ def conduct_signin(username, password):
@api_login_required @api_login_required
def logout(): def logout():
logout_user() logout_user()
identity_changed.send(app, identity=AnonymousIdentity()) identity_changed.send(app, identity=AnonymousIdentity())
return make_response('Success', 200) return make_response('Success', 200)

9
static/js/app.js
View file

@ -867,7 +867,14 @@ quayApp.directive('ngBlur', function() {
}; };
}); });
quayApp.run(['$location', '$rootScope', function($location, $rootScope) { quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', function($location, $rootScope, Restangular, UserService) {
Restangular.setResponseInterceptor(function(data, operation, what, url, response, deferred) {
if (response.status == 403) {
UserService.load();
}
return data;
});
$rootScope.$on('$routeChangeSuccess', function (event, current, previous) { $rootScope.$on('$routeChangeSuccess', function (event, current, previous) {
if (current.$$route.title) { if (current.$$route.title) {
$rootScope.title = current.$$route.title; $rootScope.title = current.$$route.title;