Skip to content

Commit d856987

Browse files
committed
Apply Pre-Commit Changes
Signed-off-by: Shubhanshu Saxena <[email protected]>
1 parent 4b61ae1 commit d856987

31 files changed

+1000
-618
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,4 @@ $RECYCLE.BIN/
346346
# End of https://www.gitignore.io/api/vue,node,vuejs,linux,macos,python,django,windows
347347
script.py
348348
crypt.py
349-
service_account.json
349+
service_account.json

Auth/admin.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
from django.contrib import admin
22
from .models import VerifiedAccount
3+
34
# Register your models here.
45
# admin.site.register(VerifiedAccount)
56

7+
68
@admin.register(VerifiedAccount)
79
class VerifiedAccountAdmin(admin.ModelAdmin):
8-
list_display=('__str__','provider','is_verified')
9-
search_fields=('uid',)
10-
list_filter=('provider','is_verified')
11-
raw_id_fields=('user',)
10+
list_display = ("__str__", "provider", "is_verified")
11+
search_fields = ("uid",)
12+
list_filter = ("provider", "is_verified")
13+
raw_id_fields = ("user",)

Auth/apps.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33

44
class AuthConfig(AppConfig):
5-
name = 'Auth'
5+
name = "Auth"

Auth/migrations/0001_initial.py

+32-8
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,41 @@ class Migration(migrations.Migration):
1515

1616
operations = [
1717
migrations.CreateModel(
18-
name='VerifiedAccount',
18+
name="VerifiedAccount",
1919
fields=[
20-
('uid', models.CharField(editable=False, max_length=64, primary_key=True, serialize=False)),
21-
('provider', models.CharField(choices=[('facebook.com', 'Facebook'), ('google.com', 'Google'), ('github.com', 'Github'), ('email', 'Email')], max_length=15)),
22-
('provider_uid', models.CharField(max_length=64)),
23-
('is_verified', models.BooleanField(default=True)),
24-
('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='verified_account', related_query_name='account', to=settings.AUTH_USER_MODEL)),
20+
(
21+
"uid",
22+
models.CharField(
23+
editable=False, max_length=64, primary_key=True, serialize=False
24+
),
25+
),
26+
(
27+
"provider",
28+
models.CharField(
29+
choices=[
30+
("facebook.com", "Facebook"),
31+
("google.com", "Google"),
32+
("github.com", "Github"),
33+
("email", "Email"),
34+
],
35+
max_length=15,
36+
),
37+
),
38+
("provider_uid", models.CharField(max_length=64)),
39+
("is_verified", models.BooleanField(default=True)),
40+
(
41+
"user",
42+
models.OneToOneField(
43+
on_delete=django.db.models.deletion.CASCADE,
44+
related_name="verified_account",
45+
related_query_name="account",
46+
to=settings.AUTH_USER_MODEL,
47+
),
48+
),
2549
],
2650
),
2751
migrations.AlterUniqueTogether(
28-
name='verifiedaccount',
29-
unique_together={('provider', 'provider_uid')},
52+
name="verifiedaccount",
53+
unique_together={("provider", "provider_uid")},
3054
),
3155
]

Auth/migrations/0002_auto_20190331_0158.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('Auth', '0001_initial'),
9+
("Auth", "0001_initial"),
1010
]
1111

1212
operations = [
1313
migrations.AlterField(
14-
model_name='verifiedaccount',
15-
name='provider',
16-
field=models.CharField(choices=[('facebook.com', 'Facebook'), ('google.com', 'Google'), ('github.com', 'Github'), ('password', 'Email')], max_length=15),
14+
model_name="verifiedaccount",
15+
name="provider",
16+
field=models.CharField(
17+
choices=[
18+
("facebook.com", "Facebook"),
19+
("google.com", "Google"),
20+
("github.com", "Github"),
21+
("password", "Email"),
22+
],
23+
max_length=15,
24+
),
1725
),
1826
]

Auth/migrations/0003_auto_20190331_0210.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('Auth', '0002_auto_20190331_0158'),
9+
("Auth", "0002_auto_20190331_0158"),
1010
]
1111

1212
operations = [
1313
migrations.AlterField(
14-
model_name='verifiedaccount',
15-
name='provider_uid',
14+
model_name="verifiedaccount",
15+
name="provider_uid",
1616
field=models.CharField(blank=True, max_length=64, null=True),
1717
),
1818
]

Auth/models.py

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,41 @@
11
from django.db import models
22
from django.contrib.auth.models import User
33
from .utils import FirebaseAPI
4+
45
# Create your models here.
56

7+
68
class VerifiedAccount(models.Model):
7-
AUTH_FACEBOOK_PROVIDER = 'facebook.com'
8-
AUTH_GOOGLE_PROVIDER = 'google.com'
9-
AUTH_GITHUB_PROVIDER = 'github.com'
10-
AUTH_EMAIL_PROVIDER = 'password'
9+
AUTH_FACEBOOK_PROVIDER = "facebook.com"
10+
AUTH_GOOGLE_PROVIDER = "google.com"
11+
AUTH_GITHUB_PROVIDER = "github.com"
12+
AUTH_EMAIL_PROVIDER = "password"
1113

1214
AUTH_PROVIDERS_CHOICE = (
13-
(AUTH_FACEBOOK_PROVIDER, 'Facebook'),
14-
(AUTH_GOOGLE_PROVIDER, 'Google'),
15-
(AUTH_GITHUB_PROVIDER, 'Github'),
16-
(AUTH_EMAIL_PROVIDER, 'Email'),
15+
(AUTH_FACEBOOK_PROVIDER, "Facebook"),
16+
(AUTH_GOOGLE_PROVIDER, "Google"),
17+
(AUTH_GITHUB_PROVIDER, "Github"),
18+
(AUTH_EMAIL_PROVIDER, "Email"),
1719
)
1820

1921
uid = models.CharField(max_length=64, primary_key=True, editable=False)
2022
user = models.OneToOneField(
21-
User, on_delete=models.CASCADE,
22-
related_name='verified_account', related_query_name='account')
23+
User,
24+
on_delete=models.CASCADE,
25+
related_name="verified_account",
26+
related_query_name="account",
27+
)
2328
provider = models.CharField(choices=AUTH_PROVIDERS_CHOICE, max_length=15)
2429
provider_uid = models.CharField(max_length=64, null=True, blank=True)
2530
is_verified = models.BooleanField(default=True)
2631

2732
class Meta:
28-
unique_together = ('provider', 'provider_uid')
29-
app_label='Auth'
33+
unique_together = ("provider", "provider_uid")
34+
app_label = "Auth"
3035

3136
def __str__(self):
32-
return f'{self.user} from {self.provider}'
33-
37+
return f"{self.user} from {self.provider}"
38+
3439
def get_verified_status(self):
3540
if self.is_verified:
3641
return True

Auth/serializers.py

+47-43
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
from rest_framework import serializers
22
from .utils import FirebaseAPI
33
from .models import *
4-
from website.models import Profile,ValidReferral
4+
from website.models import Profile, ValidReferral
55
from django.conf import settings
66
from rest_framework.exceptions import ParseError
77
import requests
8+
9+
810
class LoginSerializer(serializers.Serializer):
911
id_token = serializers.CharField(max_length=2400)
1012
provider_token = serializers.CharField(max_length=2400, required=False)
@@ -13,73 +15,76 @@ def validate_access_token(self, access_token):
1315
return FirebaseAPI.verify_id_token(access_token)
1416

1517
def validate(self, attrs):
16-
id_token = attrs.get('id_token', None)
17-
provider_token = attrs.get('provider_token', None)
18+
id_token = attrs.get("id_token", None)
19+
provider_token = attrs.get("provider_token", None)
1820

1921
user = None
2022

2123
if id_token:
2224
jwt = self.validate_access_token(id_token)
23-
uid = jwt['uid']
24-
provider=FirebaseAPI.get_provider(jwt)
25-
25+
uid = jwt["uid"]
26+
provider = FirebaseAPI.get_provider(jwt)
27+
2628
try:
2729
account = VerifiedAccount.objects.get(pk=uid)
2830
except VerifiedAccount.DoesNotExist:
29-
raise serializers.ValidationError('No such account exists')
30-
31+
raise serializers.ValidationError("No such account exists")
32+
3133
user = account.user
32-
# add the verification status to the validated data
33-
attrs['is_verified']=account.get_verified_status()
34-
profile=user.profile
34+
# add the verification status to the validated data
35+
attrs["is_verified"] = account.get_verified_status()
36+
profile = user.profile
3537
# because we also need the frontend to know if the profile is complete
3638
# this line automatically applies referral code if needed
37-
attrs['is_profile_complete']=profile.get_or_set_profile_status()
39+
attrs["is_profile_complete"] = profile.get_or_set_profile_status()
3840
if provider_token:
3941
account.provider_token = provider_token
4042
account.save()
4143
else:
42-
raise ParseError('Provide access_token or username to continue.')
44+
raise ParseError("Provide access_token or username to continue.")
4345
# Did we get back an active user?
4446
if user:
4547
if not user.is_active:
46-
raise serializers.ValidationError('User account is disabled.')
48+
raise serializers.ValidationError("User account is disabled.")
4749
else:
4850
raise serializers.ValidationError(
49-
'Unable to log in with provided credentials.')
51+
"Unable to log in with provided credentials."
52+
)
5053

51-
attrs['user'] = user
54+
attrs["user"] = user
5255
return attrs
5356

5457

5558
class RegisterSerializer(serializers.Serializer):
56-
59+
5760
id_token = serializers.CharField(max_length=2400, required=True)
5861
# provider_token = serializers.CharField(max_length=2400, required=False)
5962
first_name = serializers.CharField(max_length=40, allow_blank=False)
6063
last_name = serializers.CharField(max_length=100, allow_blank=True, required=False)
61-
applied_referral_code = serializers.CharField(max_length=500,required=False, allow_blank=True)
64+
applied_referral_code = serializers.CharField(
65+
max_length=500, required=False, allow_blank=True
66+
)
6267
# g_recaptcha_response = serializers.CharField(max_length=500, required=True)
6368

6469
def validate_id_token(self, access_token):
6570
return FirebaseAPI.verify_id_token(access_token)
6671

67-
def validate_first_name(self,name):
68-
if name==None or name=='':
72+
def validate_first_name(self, name):
73+
if name == None or name == "":
6974
raise serializers.ValidationError("First Name cannot be blank")
7075
return name
7176

72-
def validate_applied_referral_code(self,code):
73-
if code is None or code=="":
77+
def validate_applied_referral_code(self, code):
78+
if code is None or code == "":
7479
return None
7580
try:
76-
referred_by=Profile.objects.get(referral_code=code)
81+
referred_by = Profile.objects.get(referral_code=code)
7782
if not referred_by.get_or_set_profile_status():
7883
raise serializers.ValidationError("Invalid Referral Code")
7984
except:
8085
raise serializers.ValidationError("Invalid Referral Code")
8186
return referred_by
82-
87+
8388
# def validate_g_recaptcha_response(self, token):
8489
# data= {
8590
# 'secret':settings.GOOGLE_RECAPTCHA_SECRET_KEY,
@@ -91,57 +96,56 @@ def validate_applied_referral_code(self,code):
9196
# return
9297
# raise serializers.ValidationError("Captcha could not be verified. Please try again.")
9398

94-
def get_user(self, data,jwt):
99+
def get_user(self, data, jwt):
95100
user = User()
96-
uid = jwt['uid']
97-
email = jwt.get('email', '')
101+
uid = jwt["uid"]
102+
email = jwt.get("email", "")
98103
user.username = uid
99104
user.email = email
100-
user.first_name = data.get('first_name')
101-
user.last_name = data.get('last_name',"")
102-
user.gender = data.get('gender')
105+
user.first_name = data.get("first_name")
106+
user.last_name = data.get("last_name", "")
107+
user.gender = data.get("gender")
103108
return user
104109

105-
106110
def save(self):
107111
data = self.validated_data
108-
jwt = data.get('id_token')
112+
jwt = data.get("id_token")
109113
# print(jwt)
110-
uid = jwt['uid']
114+
uid = jwt["uid"]
111115
provider = FirebaseAPI.get_provider(jwt)
112116
# provider_uid = None
113117
# if provider !=VerifiedAccount.AUTH_EMAIL_PROVIDER:
114118
# provider_uid = FirebaseAPI.get_provider_uid(jwt, provider)
115-
user = self.get_user(data,jwt)
119+
user = self.get_user(data, jwt)
116120
try:
117121
user.validate_unique()
118122
except Exception as e:
119123
raise serializers.ValidationError(detail="User already exists")
120124
user.save()
121125
account, _ = VerifiedAccount.objects.get_or_create(
122-
uid=uid, user=user, provider=provider)
126+
uid=uid, user=user, provider=provider
127+
)
123128

124129
if provider == VerifiedAccount.AUTH_EMAIL_PROVIDER:
125-
account.is_verified=False
130+
account.is_verified = False
126131
account.save()
127-
128-
referred_by = data.get('applied_referral_code', None)
129132

130-
profile,_ = Profile.objects.get_or_create(user=user,referred_by=referred_by)
133+
referred_by = data.get("applied_referral_code", None)
134+
135+
profile, _ = Profile.objects.get_or_create(user=user, referred_by=referred_by)
131136
profile.name = user.first_name + " " + user.last_name
132137
profile.save()
133138
return user
134139

135140

136141
class RegisterResponseSerializer(serializers.Serializer):
137142
user_id = serializers.IntegerField()
138-
token = serializers.CharField(max_length = 500)
143+
token = serializers.CharField(max_length=500)
139144
verification_status = serializers.BooleanField()
140145

141146

142-
143147
class LoginResponseSerializer(serializers.Serializer):
144-
user_id= serializers.IntegerField()
148+
user_id = serializers.IntegerField()
145149
token = serializers.CharField(max_length=500)
146150
verification_status = serializers.BooleanField()
147-
is_profile_complete = serializers.BooleanField()
151+
is_profile_complete = serializers.BooleanField()

Auth/urls.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from django.urls import path
22
from .views import *
3+
34
urlpatterns = [
4-
path('login/',LoginView.as_view()),
5-
path('register/',RegisterView.as_view()),
5+
path("login/", LoginView.as_view()),
6+
path("register/", RegisterView.as_view()),
67
]

0 commit comments

Comments
 (0)