Skip to content

Add a USER_URL_PREFIX configuration option #95

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

Open
sangaline wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add a USER_URL_PREFIX configuration option #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
649a6a5
Add USER_URL_PREFIX which defaults to /user
sangaline Oct 2, 2015
1ba5fbc
Add USER_URL_PREFIX to the documentation.
sangaline Oct 2, 2015
c36d88d
Remove redirect url determinations that aren't need.
sangaline Apr 12, 2016
f547bba
Fix the logic around auto-logging without email confirmation after re…
sangaline Apr 12, 2016
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
25 changes: 13 additions & 12 deletions docs/source/includes/config_urls.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
::

# URLs # Default
USER_CHANGE_PASSWORD_URL = '/user/change-password'
USER_CHANGE_USERNAME_URL = '/user/change-username'
USER_CONFIRM_EMAIL_URL = '/user/confirm-email/<token>'
USER_EMAIL_ACTION_URL = '/user/email/<id>/<action>' # v0.5.1 and up
USER_FORGOT_PASSWORD_URL = '/user/forgot-password'
USER_INVITE_URL = '/user/invite' # v0.6.2 and up
USER_LOGIN_URL = '/user/login'
USER_LOGOUT_URL = '/user/logout'
USER_MANAGE_EMAILS_URL = '/user/manage-emails'
USER_REGISTER_URL = '/user/register'
USER_RESEND_CONFIRM_EMAIL_URL = '/user/resend-confirm-email' # v0.5.0 and up
USER_RESET_PASSWORD_URL = '/user/reset-password/<token>'
USER_URL_PREFIX = '/user'
USER_CHANGE_PASSWORD_URL = USER_URL_PREFIX + '/change-password'
USER_CHANGE_USERNAME_URL = USER_URL_PREFIX + '/change-username'
USER_CONFIRM_EMAIL_URL = USER_URL_PREFIX + '/confirm-email/<token>'
USER_EMAIL_ACTION_URL = USER_URL_PREFIX + '/email/<id>/<action>' # v0.5.1 and up
USER_FORGOT_PASSWORD_URL = USER_URL_PREFIX + '/forgot-password'
USER_INVITE_URL = USER_URL_PREFIX + '/invite' # v0.6.2 and up
USER_LOGIN_URL = USER_URL_PREFIX + '/login'
USER_LOGOUT_URL = USER_URL_PREFIX + '/logout'
USER_MANAGE_EMAILS_URL = USER_URL_PREFIX + '/manage-emails'
USER_REGISTER_URL = USER_URL_PREFIX + '/register'
USER_RESEND_CONFIRM_EMAIL_URL = USER_URL_PREFIX + '/resend-confirm-email' # v0.5.0 and up
USER_RESET_PASSWORD_URL = USER_URL_PREFIX + '/reset-password/<token>'
27 changes: 14 additions & 13 deletions flask_user/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,20 @@ def set_default_settings(user_manager, app_config):
um.show_username_email_does_not_exist = sd('USER_SHOW_USERNAME_EMAIL_DOES_NOT_EXIST', um.enable_register)

# Set default URLs
um.change_password_url = sd('USER_CHANGE_PASSWORD_URL', '/user/change-password')
um.change_username_url = sd('USER_CHANGE_USERNAME_URL', '/user/change-username')
um.confirm_email_url = sd('USER_CONFIRM_EMAIL_URL', '/user/confirm-email/<token>')
um.email_action_url = sd('USER_EMAIL_ACTION_URL', '/user/email/<id>/<action>')
um.forgot_password_url = sd('USER_FORGOT_PASSWORD_URL', '/user/forgot-password')
um.login_url = sd('USER_LOGIN_URL', '/user/sign-in')
um.logout_url = sd('USER_LOGOUT_URL', '/user/sign-out')
um.manage_emails_url = sd('USER_MANAGE_EMAILS_URL', '/user/manage-emails')
um.register_url = sd('USER_REGISTER_URL', '/user/register')
um.resend_confirm_email_url = sd('USER_RESEND_CONFIRM_EMAIL_URL', '/user/resend-confirm-email')
um.reset_password_url = sd('USER_RESET_PASSWORD_URL', '/user/reset-password/<token>')
um.user_profile_url = sd('USER_PROFILE_URL', '/user/profile')
um.invite_url = sd('USER_INVITE_URL', '/user/invite')
um.url_prefix = sd('USER_URL_PREFIX', '/user')
um.change_password_url = sd('USER_CHANGE_PASSWORD_URL', um.url_prefix + '/change-password')
um.change_username_url = sd('USER_CHANGE_USERNAME_URL', um.url_prefix + '/change-username')
um.confirm_email_url = sd('USER_CONFIRM_EMAIL_URL', um.url_prefix + '/confirm-email/<token>')
um.email_action_url = sd('USER_EMAIL_ACTION_URL', um.url_prefix + '/email/<id>/<action>')
um.forgot_password_url = sd('USER_FORGOT_PASSWORD_URL', um.url_prefix + '/forgot-password')
um.login_url = sd('USER_LOGIN_URL', um.url_prefix + '/sign-in')
um.logout_url = sd('USER_LOGOUT_URL', um.url_prefix + '/sign-out')
um.manage_emails_url = sd('USER_MANAGE_EMAILS_URL', um.url_prefix + '/manage-emails')
um.register_url = sd('USER_REGISTER_URL', um.url_prefix + '/register')
um.resend_confirm_email_url = sd('USER_RESEND_CONFIRM_EMAIL_URL', um.url_prefix + '/resend-confirm-email')
um.reset_password_url = sd('USER_RESET_PASSWORD_URL', um.url_prefix + '/reset-password/<token>')
um.user_profile_url = sd('USER_PROFILE_URL', um.url_prefix + '/profile')
um.invite_url = sd('USER_INVITE_URL', um.url_prefix + '/invite')

# Set default ENDPOINTs
home_endpoint = ''
Expand Down
8 changes: 3 additions & 5 deletions flask_user/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,13 +440,11 @@ def register():
user=user,
user_invite=user_invite)

# Redirect if USER_ENABLE_CONFIRM_EMAIL is set
if user_manager.enable_confirm_email and require_email_confirmation:
next = request.args.get('next', _endpoint_url(user_manager.after_register_endpoint))
return redirect(next)
# Redirect if USER_ENABLE_CONFIRM_EMAIL is set and they can't login yet
if user_manager.enable_confirm_email and require_email_confirmation and not user_manager.enable_login_without_confirm_email:
return redirect(reg_next)
Copy link
Copy Markdown
Collaborator

@and-semakin and-semakin Nov 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this things have to be in the same pull request with USER_URL_PREFIX. I would prefer to have a separate PR with this changes. Any way thank you! It looks useful too! 👍


# Auto-login after register or redirect to login page
next = request.args.get('next', _endpoint_url(user_manager.after_confirm_endpoint))
if user_manager.auto_login_after_register:
return _do_login_user(user, reg_next) # auto-login
else:
Expand Down