diff --git a/rhodecode/controllers/login.py b/rhodecode/controllers/login.py --- a/rhodecode/controllers/login.py +++ b/rhodecode/controllers/login.py @@ -28,10 +28,10 @@ from pylons import request, response, se from pylons.controllers.util import abort, redirect from rhodecode.lib.auth import AuthUser, HasPermissionAnyDecorator from rhodecode.lib.base import BaseController, render -import rhodecode.lib.helpers as h +import rhodecode.lib.helpers as h from pylons.i18n.translation import _ from rhodecode.model.forms import LoginForm, RegisterForm, PasswordResetForm -from rhodecode.model.user_model import UserModel +from rhodecode.model.user import UserModel import formencode import logging @@ -45,17 +45,19 @@ class LoginController(BaseController): def index(self): #redirect if already logged in c.came_from = request.GET.get('came_from', None) - - if c.rhodecode_user.is_authenticated: - return redirect(url('hg_home')) - + + if c.rhodecode_user.is_authenticated \ + and c.rhodecode_user.username != 'default': + + return redirect(url('home')) + if request.POST: #import Login Form validator class login_form = LoginForm() try: c.form_result = login_form.to_python(dict(request.POST)) username = c.form_result['username'] - user = UserModel().get_user_by_name(username) + user = UserModel().get_by_username(username, case_insensitive=True) auth_user = AuthUser() auth_user.username = user.username auth_user.is_authenticated = True @@ -66,14 +68,14 @@ class LoginController(BaseController): session['rhodecode_user'] = auth_user session.save() log.info('user %s is now authenticated', username) - + user.update_lastlogin() - + if c.came_from: return redirect(c.came_from) else: - return redirect(url('hg_home')) - + return redirect(url('home')) + except formencode.Invalid, errors: return htmlfill.render( render('/login.html'), @@ -81,30 +83,30 @@ class LoginController(BaseController): errors=errors.error_dict or {}, prefix_error=False, encoding="UTF-8") - + return render('/login.html') - + @HasPermissionAnyDecorator('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate') def register(self): user_model = UserModel() c.auto_active = False - for perm in user_model.get_default().user_perms: + for perm in user_model.get_by_username('default', cache=False).user_perms: if perm.permission.permission_name == 'hg.register.auto_activate': c.auto_active = True break - + if request.POST: - + register_form = RegisterForm()() try: form_result = register_form.to_python(dict(request.POST)) form_result['active'] = c.auto_active user_model.create_registration(form_result) h.flash(_('You have successfully registered into rhodecode'), - category='success') + category='success') return redirect(url('login_home')) - + except formencode.Invalid, errors: return htmlfill.render( render('/register.html'), @@ -112,21 +114,21 @@ class LoginController(BaseController): errors=errors.error_dict or {}, prefix_error=False, encoding="UTF-8") - + return render('/register.html') def password_reset(self): user_model = UserModel() if request.POST: - + password_reset_form = PasswordResetForm()() try: form_result = password_reset_form.to_python(dict(request.POST)) user_model.reset_password(form_result) h.flash(_('Your new password was sent'), - category='success') + category='success') return redirect(url('login_home')) - + except formencode.Invalid, errors: return htmlfill.render( render('/password_reset.html'), @@ -134,11 +136,11 @@ class LoginController(BaseController): errors=errors.error_dict or {}, prefix_error=False, encoding="UTF-8") - + return render('/password_reset.html') - + def logout(self): session['rhodecode_user'] = AuthUser() session.save() log.info('Logging out and setting user as Empty') - redirect(url('hg_home')) + redirect(url('home'))