Feature: Added an account disabled page #3391
Conversation
|
Hi @RafaelJohn9, is this ready for review? Could you please rebase it? Do you mind if I do it? |
|
uhmm yea sure @mathjazz , you can take on the issue 🤝 , sorry for the delay |
|
hey @mathjazz, on second thoughts, lemme complete this 🤝 |
Signed-off-by: RafaelJohn9 <[email protected]>
RafaelJohn9
force-pushed
the
feat_account_disable_page
branch
from
0ebd442 to
d76b3f9
Compare
…to see if the reason its not being activated arrives from its possition in the middlewares\n Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
|
hey @mathjazz , well I've configured everything correctly, issue arises in the |
|
Looking for a way to by pass this 🤝 |
Signed-off-by: RafaelJohn9 <[email protected]>
|
oops, well |
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
Signed-off-by: RafaelJohn9 <[email protected]>
| "default": { | ||
| "BACKEND": "django_bmemcached.memcached.BMemcached", | ||
| "OPTIONS": {}, | ||
| } |
There was a problem hiding this comment.
Nit: Please restore this change. :)
| map( | ||
| int, | ||
| os.environ.get("BADGES_PROMOTION_THRESHOLDS", "1, 2, 5").split(","), | ||
| ) |
There was a problem hiding this comment.
Nit: Please restore this change. :)
| {% block title %}Account Disabled{% endblock %} | ||
| {% block description %} | ||
| Your account has been disabled. If you believe this is a mistake or need further assistance, please contact us at {{ DEFAULT_FROM_EMAIL }}. | ||
| {% endblock %} |
There was a problem hiding this comment.
Please add the new line at the end of the file.
|
|
||
| {% block title %}Account Disabled{% endblock %} | ||
| {% block description %} | ||
| Your account has been disabled. If you believe this is a mistake or need further assistance, please contact us at {{ DEFAULT_FROM_EMAIL }}. |
There was a problem hiding this comment.
Please make the email address a mailto: hyperlink.
| return render( | ||
| request, | ||
| "account_disabled.html", | ||
| {"DEFAULT_FROM_EMAIL": settings.DEFAULT_FROM_EMAIL}, |
There was a problem hiding this comment.
Can we remove this line? I didn't check, but the context_processor should pass settings to all templates:
https://github.com/mozilla/pontoon/blob/08710a279ab2f2c52b7f1a1a1035b6778c5f7f95/pontoon/base/context_processors.py
We'd need to change DEFAULT_FROM_EMAIL to settings.DEFAULT_FROM_EMAIL in account_disabled.html though.
| # For non-authenticated users, check the session manually | ||
| user_id = request.session.get("_auth_user_id") | ||
| if user_id: | ||
| try: | ||
| user = User.objects.get(pk=user_id) | ||
| if not user.is_active: | ||
| return render( | ||
| request, | ||
| "account_disabled.html", | ||
| {"DEFAULT_FROM_EMAIL": settings.DEFAULT_FROM_EMAIL}, | ||
| status=403, | ||
| ) | ||
| except User.DoesNotExist: | ||
| pass # If the user ID is invalid, ignore it |
There was a problem hiding this comment.
What exactly does this code do? If the user is not authenticate, we shouldn't do anything.
There was a problem hiding this comment.
@mathjazz , I was having trouble running the code without this patch, mainly when the user is not active and wishes to login, it does not pass through the AuthMiddleware,
did some digging and found that one of the requirements for a user to be authenticated is that the user must be active
I tried checking if both is_active and is_authenticated is false, however, this sort of thing affects AnonymousUser's meaning they can't browse any pages if you aren't authenticated.
So I updated the patch to have two parts just in case:
- User
is_authenticatedand not active - User is not active but is an existing user in the database
the path highlighted presents the second part of the patch,
this PR addresses issue #3153