From 294d02a59558f1709b4e7bb701d220994fec65ac Mon Sep 17 00:00:00 2001 From: Joseph Schorr Date: Mon, 30 Sep 2013 17:32:03 -0400 Subject: [PATCH] Fix public browsing --- endpoints/api.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/endpoints/api.py b/endpoints/api.py index 7c1cadc1c..64e34be90 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -27,8 +27,10 @@ def welcome(): @app.route('/api/user/') -@login_required def get_logged_in_user(): + if current_user.is_anonymous(): + return jsonify({'anonymous': True}) + user = current_user.db_user return jsonify({ 'verified': user.verified, @@ -40,6 +42,7 @@ def get_logged_in_user(): @app.route('/api/users/', methods=['GET']) +@login_required def get_matching_users(prefix): users = model.get_matching_users(prefix) @@ -55,7 +58,6 @@ def create_repo_api(): @app.route('/api/repository/find/', methods=['GET']) -@login_required def match_repos_api(prefix): def repo_view(repo): return { @@ -64,7 +66,7 @@ def match_repos_api(prefix): 'description': repo.description } - username = current_user.db_user.username + username = current_user.db_user.username if current_user.is_authenticated() else None matching = model.get_matching_repositories(prefix, username) response = { 'repositories': [repo_view(repo) for repo in matching] @@ -74,7 +76,6 @@ def match_repos_api(prefix): @app.route('/api/repository/', methods=['GET']) -@login_required def list_repos_api(): def repo_view(repo_obj): return { @@ -83,7 +84,7 @@ def list_repos_api(): 'description': repo_obj.description, } - username = current_user.db_user.username + username = current_user.db_user.username if current_user.is_authenticated() else None repos = [repo_view(repo) for repo in model.get_visible_repositories(username)] response = { @@ -137,7 +138,6 @@ def image_view(image): @app.route('/api/repository/', methods=['GET']) -@login_required @parse_repository_name def get_repo_api(namespace, repository): logger.debug('Get repo: %s/%s' % (namespace, repository)) @@ -183,7 +183,6 @@ def role_view(repo_perm_obj): @app.route('/api/repository//tag//images', methods=['GET']) -@login_required @parse_repository_name def list_tag_images(namespace, repository, tag): permission = ReadRepositoryPermission(namespace, repository)