allow registering using oauth #356
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
leduythuccs
reviewed
Dec 1, 2023
dmoj/settings.py
Outdated
| @@ -742,3 +742,5 @@ | |||
|
|
|||
| ACE_DEFAULT_LIGHT_THEME = DMOJ_THEME_DEFAULT_ACE_THEME['light'] | |||
| ACE_DEFAULT_DARK_THEME = DMOJ_THEME_DEFAULT_ACE_THEME['dark'] | |||
| # Only allow OAuth login | |||
| OAUTH_ONLY = True | |||
judge/views/register.py
Outdated
| @@ -74,6 +76,9 @@ def get_context_data(self, **kwargs): | |||
| kwargs['TIMEZONE_MAP'] = settings.TIMEZONE_MAP | |||
| kwargs['password_validators'] = get_default_password_validators() | |||
| kwargs['tos_url'] = settings.TERMS_OF_SERVICE_URL | |||
| kwargs['oauth_only'] = settings.OAUTH_ONLY | |||
| print(kwargs['oauth_only']) | |||
Comment on lines
238
to
241
| <span class="tos-section"> | ||
| {{ (_('By registering, you agree to our [Terms & Conditions][0].') + '\n\n [0]: ' + tos_url)|markdown('default', strip_paragraphs=True) }} | ||
| </span> | ||
| {% endif %} |
There was a problem hiding this comment.
should always show this regardless of register method
leduythuccs
reviewed
Dec 1, 2023
judge/forms.py
Outdated
Comment on lines
443
to
452
| class CustomAuthenticationForm(AuthenticationForm): | ||
| social_auth = SocialAuthForm() | ||
| def __init__(self, *args, **kwargs): | ||
| super(CustomAuthenticationForm, self).__init__(*args, **kwargs) | ||
| self.fields['username'].widget.attrs.update({'placeholder': _('Username')}) | ||
| self.fields['password'].widget.attrs.update({'placeholder': _('Password')}) | ||
|
|
||
| self.has_google_auth = self.social_auth.has_google_auth | ||
| self.has_facebook_auth = self.social_auth.has_facebook_auth | ||
| self.has_github_auth = self.social_auth.has_github_auth |
There was a problem hiding this comment.
not sure if it works or not but i think to reduce the duplication of this, we can use multiple inheritance.
class CustomAuthenticationForm(AuthenticationForm, SocialAuthForm)
leduythuccs
reviewed
Dec 1, 2023
Comment on lines
262
to
277
| {% if social_auth.has_google_auth %} | ||
| <a href="{{ url('social:begin', "google-oauth2") }}?next={{ next }}" class="social google-icon"> | ||
| <i class="fa fa-google-plus-square"></i> | ||
| </a> | ||
| {% endif %} | ||
| {% if social_auth.has_facebook_auth %} | ||
| <a href="{{ url('social:begin', "facebook") }}?next={{ next }}" class="social facebook-icon"> | ||
| <i class="fa fa-facebook-square"></i> | ||
| </a> | ||
| {% endif %} | ||
| {% if social_auth.has_github_auth %} | ||
| <a href="{{ url('social:begin', "github-secure") }}?next={{ next }}" class="social github-icon"> | ||
| <i class="fa fa-github-square"></i> | ||
| </a> | ||
| {% endif %} | ||
| </div> |
There was a problem hiding this comment.
perhap make this a template, and include it on both registration & login form
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.
Please remove options that are not relevant
Type of change: new feature
What
This PR allow users to register using OAuth apps like: Google, Facebook,...
Why
To prevent spamming
Checklist
Put an
xin the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.By submitting this pull request, I confirm that my contribution is made under the terms of the AGPL-3.0 License.