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

feat: added firebase_user.phone_number for mapping email field #33

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+25 −20
Open

feat: added firebase_user.phone_number for mapping email field #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35db653
feat: added firebase_user.phone_number for mapping email field as an …
Arka-cell Jul 15, 2021
4051d25
fix: changed function name, added more alternative to map
Arka-cell Jul 16, 2021
151d83e
fix: added provider email
Arka-cell Jul 17, 2021
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 drf_firebase_auth/authentication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
FirebaseUser,
FirebaseUserProvider
)
from .utils import get_firebase_user_email
from .utils import get_firebase_user_identifier
from . import __title__

log = logging.getLogger(__title__)
Expand Down Expand Up @@ -98,7 +98,7 @@ def _get_or_create_local_user(
"""
Attempts to return or create a local User from Firebase user data
"""
email = get_firebase_user_email(firebase_user)
email = get_firebase_user_identifier(firebase_user)
log.info(f'_get_or_create_local_user - email: {email}')
user = None
try:
Expand Down
19 changes: 12 additions & 7 deletions drf_firebase_auth/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,18 @@
from firebase_admin import auth


def get_firebase_user_email(firebase_user: auth.UserRecord) -> str:
def get_firebase_user_identifier(firebase_user: auth.UserRecord) -> str:
try:
return (
firebase_user.email
if firebase_user.email
else firebase_user.provider_data[0].email
)
if firebase_user.email:
return firebase_user.email
elif firebase_user.provider_data[0].email:
return firebase_user.provider_data[0].email
elif firebase_user.phone_number:
return firebase_user.phone_number
elif firebase_user.provider_data[0].phone_number:
return firebase_user.provider_data[0].phone_number
else:
raise Exception("Identifier not found, this would fail authentication process")
except Exception as e:
raise Exception(e)

Expand Down Expand Up @@ -50,7 +55,7 @@ def map_firebase_email_to_username(
firebase_user: auth.UserRecord
) -> str:
try:
return get_firebase_user_email(firebase_user)
return get_firebase_user_identifier(firebase_user)
except Exception as e:
raise Exception(e)

Expand Down
22 changes: 11 additions & 11 deletions testapp/api/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from firebase_admin import auth as firebase_auth
from drf_firebase_auth.settings import api_settings
from drf_firebase_auth.utils import (
get_firebase_user_email,
get_firebase_user_identifier,
map_firebase_uid_to_username,
map_firebase_email_to_username
)
Expand All @@ -25,7 +25,7 @@
)

class WhoAmITests(APITestCase):

def setUp(self):
self._url = reverse('whoami')
self._test_user_email = '[email protected]'
Expand Down Expand Up @@ -103,7 +103,7 @@ def test_authenticated_request(self):
status.HTTP_403_FORBIDDEN,
f'{api_settings.FIREBASE_CREATE_LOCAL_USER}'
)

with self._MOCK_FIREBASE_CREATE_LOCAL_USER_TRUE:
response = self.client.get(self._url)
self.assertEqual(
Expand Down Expand Up @@ -143,11 +143,11 @@ def test_user_creation_uid_as_username(self):
)
)
firebase_user = self._get_test_user()
firebase_user_email = get_firebase_user_email(firebase_user)
firebase_user_email = get_firebase_user_identifier(firebase_user)

with self._MOCK_FIREBASE_CREATE_LOCAL_USER_FALSE:
before_count = User.objects.count()

response = self.client.get(self._url)
self.assertEqual(
response.status_code,
Expand All @@ -161,11 +161,11 @@ def test_user_creation_uid_as_username(self):

with self.assertRaises(Exception):
_ = User.objects.get(email=firebase_user_email)

with self._MOCK_FIREBASE_CREATE_LOCAL_USER_TRUE:
with self._MOCK_FIREBASE_USERNAME_MAPPING_FUNC_UID:
before_count = User.objects.count()

response = self.client.get(self._url)
self.assertEqual(
response.status_code,
Expand Down Expand Up @@ -193,11 +193,11 @@ def test_user_creation_email_as_username(self):
)
)
firebase_user = self._get_test_user()
firebase_user_email = get_firebase_user_email(firebase_user)
firebase_user_email = get_firebase_user_identifier(firebase_user)

with self._MOCK_FIREBASE_CREATE_LOCAL_USER_FALSE:
before_count = User.objects.count()

response = self.client.get(self._url)
self.assertEqual(
response.status_code,
Expand All @@ -211,11 +211,11 @@ def test_user_creation_email_as_username(self):

with self.assertRaises(Exception):
_ = User.objects.get(email=firebase_user_email)

with self._MOCK_FIREBASE_CREATE_LOCAL_USER_TRUE:
with self._MOCK_FIREBASE_USERNAME_MAPPING_FUNC_EMAIL:
before_count = User.objects.count()

response = self.client.get(self._url)
self.assertEqual(
response.status_code,
Expand Down