Merge pull request #1611 Use strings instead of binary strings in res…

…et_url generation
onaio · May 31, 2019 · 4916771 · 4916771
2 parents 7ec8535 + 5d0ff6f
commit 4916771
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/onadata/libs/serializers/password_reset_serializer.py b/onadata/libs/serializers/password_reset_serializer.py
@@ -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),

diff --git a/onadata/libs/tests/serializers/test_password_reset_serializer.py b/onadata/libs/tests/serializers/test_password_reset_serializer.py
@@ -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):
@@ -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.")