Changeset 1d92bf2 in OpenWorkouts-current for ow/views/user.py
- Timestamp:
- Dec 16, 2018, 1:07:04 AM (5 years ago)
- Branches:
- current, feature/docs, master
- Children:
- 6560b8f
- Parents:
- 929097a
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
ow/views/user.py
r929097a r1d92bf2 25 25 """ 26 26 if request.authenticated_userid: 27 user = request.root.get_user(request.authenticated_userid) 28 return HTTPFound(location=request.resource_url(user)) 27 user = request.root.get_user_by_uid(request.authenticated_userid) 28 if user: 29 return HTTPFound(location=request.resource_url(user)) 30 else: 31 # an authenticated user session, for an user that does not exist 32 # anymore, logout! 33 return HTTPFound(location=request.resource_url(context, 'logout')) 29 34 return HTTPFound(location=request.resource_url(context, 'login')) 30 35 … … 36 41 def login(context, request): 37 42 message = '' 38 username= ''43 email = '' 39 44 password = '' 40 45 return_to = request.params.get('return_to') … … 42 47 43 48 if 'submit' in request.POST: 44 username = request.POST.get('username', None)45 if username in request.root.all_usernames():46 user = request.root[username]49 email = request.POST.get('email', None) 50 user = context.get_user_by_email(email) 51 if user: 47 52 password = request.POST.get('password', None) 48 53 if password is not None and user.check_password(password): 49 headers = remember(request, username) 54 headers = remember(request, str(user.uid)) 55 redirect_url = return_to or request.resource_url(user) 50 56 return HTTPFound(location=redirect_url, headers=headers) 51 57 else: 52 message = u'Bad password'58 message = _('Wrong password') 53 59 else: 54 message = u'Bad username'60 message = _('Wrong email address') 55 61 56 62 return { 57 63 'message': message, 58 ' username': username,64 'email': email, 59 65 'password': password, 60 66 'redirect_url': redirect_url … … 73 79 renderer='ow:templates/signup.pt') 74 80 def signup(context, request): 75 state = State(emails=context.lowercase_emails (),76 names=context.lowercase_ usernames())81 state = State(emails=context.lowercase_emails, 82 names=context.lowercase_nicknames) 77 83 form = Form(request, schema=SignUpSchema(), state=state) 78 84 79 85 if 'submit' in request.POST and form.validate(): 80 username = request.POST['username'] 81 user = form.bind(User(), exclude=['username', 'password_confirm']) 82 context[username] = user 86 user = form.bind(User(), exclude=['password_confirm']) 87 context.add_user(user) 83 88 # Send to login 84 89 return HTTPFound(location=request.resource_url(context))
Note: See TracChangeset
for help on using the changeset viewer.