Fix some stuff with logins and permissions, add tags to the mode.

This commit is contained in:
yackob03 2013-09-25 16:46:28 -04:00
parent 744c73509b
commit 08446ef59e
10 changed files with 94 additions and 34 deletions

View file

@ -6,7 +6,7 @@ from functools import wraps
from data import model
from app import app
from util import parse_repository_name
from util.names import parse_repository_name
logger = logging.getLogger(__name__)
@ -33,7 +33,7 @@ def list_repos_api():
'role': repo_perm.role.name,
}
repos = [repo_view(repo)
repos = [repo_view(repo)
for repo in model.get_user_repositories(current_user.db_user)]
response = {
'repositories': repos

View file

@ -10,12 +10,11 @@ from data import model
from app import app
from auth.auth import (process_auth, get_authenticated_user,
get_validated_token)
from util import parse_namespace_repository, parse_repository_name
from util.names import parse_namespace_repository, parse_repository_name
from auth.permissions import (ModifyRepositoryPermission,
ReadRepositoryPermission, UserPermission)
logger = logging.getLogger(__name__)

View file

@ -1,7 +1,33 @@
from flask import abort, send_file, redirect, request
import logging
from flask import abort, send_file, redirect, request, url_for
from flask.ext.login import login_user, UserMixin
from data import model
from app import app
from app import app, login_manager
logger = logging.getLogger(__name__)
class _LoginWrappedDBUser(UserMixin):
def __init__(self, db_user):
self.db_user = db_user
def is_active(self):
return self.db_user.verified
def get_id(self):
return unicode(self.db_user.username)
@login_manager.user_loader
def load_user(username):
db_user = model.get_user(username)
if db_user:
return _LoginWrappedDBUser(db_user)
else:
return None
@app.route('/', methods=['GET'])
@ -27,4 +53,4 @@ def signin():
@app.route('/signin', methods=['GET'])
def render_signin_page():
return send_file('templates/signin.html')
return send_file('templates/signin.html')