Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use strings instead of binary strings in reset_url generation #1611

Merged
merged 1 commit into from
May 31, 2019
Merged

Use strings instead of binary strings in reset_url generation #1611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions onadata/libs/serializers/password_reset_serializer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ def get_password_reset_email(user, reset_url,
result = urlparse(reset_url)
site_name = domain = result.hostname
encoded_username = urlsafe_base64_encode(
b(user.username.encode('utf-8')))
b(user.username.encode('utf-8'))).decode('utf-8')
c = {
'email': user.email,
'domain': domain,
'path': result.path,
'site_name': site_name,
'uid': urlsafe_base64_encode(force_bytes(user.pk)),
'uid': urlsafe_base64_encode(force_bytes(user.pk)).decode('utf-8'),
'username': user.username,
'encoded_username': encoded_username,
'token': token_generator.make_token(user),
Expand Down
6 changes: 6 additions & 0 deletions onadata/libs/tests/serializers/test_password_reset_serializer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from onadata.libs.serializers.password_reset_serializer import \
get_password_reset_email
from django.utils.http import urlsafe_base64_encode
from django.utils.encoding import force_bytes


class TestPasswordResetSerializer(TestBase):
Expand All @@ -15,3 +16,8 @@ def test_get_password_reset_email(self):
bytes(self.user.username.encode('utf-8'))).decode('utf-8'),
email,
"Username is included in reset email.")
self.assertIn(
'uid={}'.format(urlsafe_base64_encode(
force_bytes(self.user.pk)).decode('utf-8')),
email,
"Uid is included in email.")