arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 15:02:31 +00:00
Code Issues Projects Releases Wiki Activity

Prevent unapproved users logging in through embeds

Browse Source 
Test suite doing its job...!
This commit is contained in:
FreneticScribbler
2020-01-11 19:25:50 +00:00
parent 4d722fd5cb
commit ea12bfa607
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
RIGS/forms.py
View File

@@ -34,8 +34,15 @@ class ProfileRegistrationFormUniqueEmail(RegistrationFormUniqueEmail):
return self.cleaned_data['initials'] return self.cleaned_data['initials']
class CheckApprovedForm(AuthenticationForm):
def confirm_login_allowed(self, user):
if not user.is_approved and not user.is_superuser:
raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!")
return AuthenticationForm.confirm_login_allowed(self, user)
# Embedded Login form - remove the autofocus # Embedded Login form - remove the autofocus
class EmbeddedAuthenticationForm(AuthenticationForm): class EmbeddedAuthenticationForm(CheckApprovedForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['username'].widget.attrs.pop('autofocus', None) self.fields['username'].widget.attrs.pop('autofocus', None)
@@ -55,13 +62,6 @@ class ProfileChangeForm(UserChangeForm):
model = models.Profile model = models.Profile
class CheckApprovedForm(AuthenticationForm):
def confirm_login_allowed(self, user):
if not user.is_approved and not user.is_superuser:
raise forms.ValidationError("Your account hasn't been approved by an administrator yet. Please check back in a few minutes!")
return AuthenticationForm.confirm_login_allowed(self, user)
# Events Shit # Events Shit
class EventForm(forms.ModelForm): class EventForm(forms.ModelForm):
datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS) datetime_input_formats = formats.get_format_lazy("DATETIME_INPUT_FORMATS") + list(settings.DATETIME_INPUT_FORMATS)