diff --git a/progit/lib/__init__.py b/progit/lib/__init__.py index 720fffa..559ad4a 100644 --- a/progit/lib/__init__.py +++ b/progit/lib/__init__.py @@ -141,9 +141,9 @@ def search_user(session, username=None, email=None, token=None, pattern=None): def add_issue_comment(session, issue, comment, user, ticketfolder): ''' Add a comment to an issue. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: - user_obj = get_user_by_email(session, user) + user_obj = search_user(session, email=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -168,9 +168,9 @@ def add_issue_comment(session, issue, comment, user, ticketfolder): def add_issue_tag(session, issue, tag, user, ticketfolder): ''' Add a tag to an issue. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: - user_obj = get_user_by_email(session, user) + user_obj = search_user(session, email=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -212,9 +212,9 @@ def add_issue_assignee(session, issue, assignee, user, ticketfolder): progit.notify.notify_assigned_issue(issue, None, user) return 'Assignee reset' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: - user_obj = get_user_by_email(session, user) + user_obj = search_user(session, email=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -222,9 +222,9 @@ def add_issue_assignee(session, issue, assignee, user, ticketfolder): ) # Validate the assignee - user_obj = get_user(session, assignee) + user_obj = search_user(session, user=assignee) if not user_obj: - user_obj = get_user_by_email(session, assignee) + user_obj = search_user(session, email=assignee) if not user_obj: raise progit.exceptions.ProgitException( @@ -245,9 +245,9 @@ def add_issue_assignee(session, issue, assignee, user, ticketfolder): def add_issue_dependency(session, issue, issue_blocked, user, ticketfolder): ''' Add a dependency between two issues. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: - user_obj = get_user_by_email(session, user) + user_obj = search_user(session, email=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -345,9 +345,9 @@ def edit_issue_tags(session, project, old_tag, new_tag): def add_user_to_project(session, project, user): ''' Add a specified user to a specified project. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: - user_obj = get_user_by_email(session, user) + user_obj = search_user(session, email=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -368,9 +368,9 @@ def add_user_to_project(session, project, user): def add_pull_request_comment(session, request, commit, filename, row, comment, user): ''' Add a comment to a pull-request. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: - user_obj = get_user_by_email(session, user) + user_obj = search_user(session, email=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -416,7 +416,7 @@ def new_project(session, user, name, gitfolder, docfolder, ticketfolder, 'The project repo "%s" already exists' % name ) - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -454,7 +454,7 @@ def new_project(session, user, name, gitfolder, docfolder, ticketfolder, def new_issue(session, repo, title, content, user, ticketfolder): ''' Create a new issue for the specified repo. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -483,7 +483,7 @@ def new_issue(session, repo, title, content, user, ticketfolder): def new_pull_request(session, repo_from, branch_from, repo_to, branch_to, title, user): ''' Create a new pull request on the specified repo. ''' - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -569,7 +569,7 @@ def fork_project(session, user, repo, gitfolder, raise progit.exceptions.RepoExistsException( 'Repo "%s/%s" already exists' % (user, repo.name)) - user_obj = get_user(session, user) + user_obj = search_user(session, username=user) if not user_obj: raise progit.exceptions.ProgitException( @@ -892,7 +892,7 @@ def generate_gitolite_acls(session, configfile): def set_up_user(session, username, fullname, user_email): ''' Set up a new user into the database or update its information. ''' - user = get_user(session, username) + user = search_user(session, username=username) if not user: user = model.User( user=username, @@ -917,7 +917,7 @@ def set_up_user(session, username, fullname, user_email): def update_user_ssh(session, user, ssh_key): ''' Set up a new user into the database or update its information. ''' if isinstance(user, basestring): - user = get_user(session, user) + user = search_user(session, username=user) message = 'Nothing to update' diff --git a/progit/ui/app.py b/progit/ui/app.py index 5b4e4df..fb65575 100644 --- a/progit/ui/app.py +++ b/progit/ui/app.py @@ -293,7 +293,8 @@ def new_project(): def user_settings(): """ Update the user settings. """ - user = progit.lib.get_user(SESSION, flask.g.fas_user.username) + user = progit.lib.search_user( + SESSION, username=flask.g.fas_user.username) form = progit.forms.UserSettingsForm() if form.validate_on_submit(): diff --git a/progit/ui/login.py b/progit/ui/login.py index 3870ca1..33d148f 100644 --- a/progit/ui/login.py +++ b/progit/ui/login.py @@ -32,12 +32,12 @@ def new_user(): if form.validate_on_submit(): username = form.user.data - if progit.lib.get_user(SESSION, username): + if progit.lib.search_user(SESSION, username=username): flask.flash('Username already taken.', 'error') return flask.redirect(flask.request.url) email = form.email_address.data - if progit.lib.get_user_by_email(SESSION, email): + if progit.lib.search_user(SESSION, email=email): flask.flash('Email address already taken.', 'error') return flask.redirect(flask.request.url) @@ -98,7 +98,7 @@ def do_login(): form.password.data, APP.config.get('PASSWORD_SEED', None)) password = hashlib.sha512(password).hexdigest() - user_obj = progit.lib.get_user(SESSION, username) + user_obj = progit.lib.search_user(SESSION, username=username) if not user_obj or user_obj.password != password: flask.flash('Username or password invalid.', 'error') return flask.redirect(flask.url_for('auth_login')) @@ -139,7 +139,7 @@ def do_login(): def confirm_user(token): """ Confirm a user account. """ - user_obj = progit.lib.get_user_by_token(SESSION, token) + user_obj = progit.lib.search_user(SESSION, token=token) if not user_obj: flask.flash('No user associated with this token.', 'error') else: @@ -168,7 +168,7 @@ def lost_password(): if form.validate_on_submit(): username = form.username.data - user_obj = progit.lib.get_user(SESSION, username) + user_obj = progit.lib.search_user(SESSION, username=username) if not user_obj: flask.flash('Username invalid.', 'error') return flask.redirect(flask.url_for('auth_login')) @@ -210,7 +210,7 @@ def reset_password(token): """ form = forms.ResetPasswordForm() - user_obj = progit.lib.get_user_by_token(SESSION, token) + user_obj = progit.lib.search_user(SESSION, token=token) if not user_obj: flask.flash('No user associated with this token.', 'error') return flask.redirect(flask.url_for('auth_login')) @@ -299,7 +299,7 @@ def admin_group(group): # Add new user to the group if asked form = forms.LostPasswordForm() if form.validate_on_submit(): - user = progit.lib.get_user(SESSION, form.username.data) + user = progit.lib.search_user(SESSION, username=form.username.data) if not user: flask.flash('No user `%s` found' % form.username.data, 'error') return flask.redirect(flask.url_for('.admin_group', group=group)) @@ -350,7 +350,7 @@ def admin_group_user_delete(user, group): flask.flash('No group `%s` found' % groupname, 'error') return flask.redirect(flask.url_for('.admin_groups')) - user = progit.lib.get_user(SESSION, user) + user = progit.lib.search_user(SESSION, username=user) if not user: flask.flash('No user `%s` found' % user, 'error') return flask.redirect(flask.url_for('.admin_groups'))