Skip to content
Snippets Groups Projects
Commit 80b977ff authored by Felipe Montoya's avatar Felipe Montoya
Browse files

Make the studio login over the lms optional using a feature flag

parent 5d3c9b36
No related merge requests found
......@@ -298,6 +298,10 @@ HEARTBEAT_CHECKS = ENV_TOKENS.get('HEARTBEAT_CHECKS', HEARTBEAT_CHECKS)
HEARTBEAT_EXTENDED_CHECKS = ENV_TOKENS.get('HEARTBEAT_EXTENDED_CHECKS', HEARTBEAT_EXTENDED_CHECKS)
HEARTBEAT_CELERY_TIMEOUT = ENV_TOKENS.get('HEARTBEAT_CELERY_TIMEOUT', HEARTBEAT_CELERY_TIMEOUT)
# Login using the LMS as the identity provider
if FEATURES.get('DISABLE_STUDIO_SSO_OVER_LMS', False):
LOGIN_URL = EDX_ROOT_URL + '/signin'
# Specific setting for the File Upload Service to store media in a bucket.
FILE_UPLOAD_STORAGE_BUCKET_NAME = ENV_TOKENS.get('FILE_UPLOAD_STORAGE_BUCKET_NAME', FILE_UPLOAD_STORAGE_BUCKET_NAME)
FILE_UPLOAD_STORAGE_PREFIX = ENV_TOKENS.get('FILE_UPLOAD_STORAGE_PREFIX', FILE_UPLOAD_STORAGE_PREFIX)
......
......@@ -230,8 +230,15 @@
% else:
<%
login_url = settings.LMS_ROOT_URL + '/login'
register_url = settings.LMS_ROOT_URL + '/register'
if settings.FEATURES.get('DISABLE_STUDIO_SSO_OVER_LMS', False):
login_url = settings.LOGIN_URL
else:
login_url = '{lms_root_url}/login?next={next_url}'.format(
lms_root_url=settings.LMS_ROOT_URL,
next_url=current_url,
)
%>
<nav class="nav-not-signedin nav-pitch" aria-label="${_('Account')}">
<h2 class="sr-only">${_("Account Navigation")}</h2>
......@@ -245,7 +252,7 @@
</li>
% endif
<li class="nav-item nav-not-signedin-signin">
<a class="action action-signin" href="${login_url}?next=${current_url}">${_("Sign In")}</a>
<a class="action action-signin" href="${login_url}">${_("Sign In")}</a>
</li>
</ol>
</nav>
......
......@@ -40,7 +40,13 @@
<span class="icon fa fa-caret-down ui-toggle-dd" aria-hidden="true"></span>
</h3>
<%
logout_url = settings.LMS_ROOT_URL + '/logout'
if settings.FEATURES.get('DISABLE_STUDIO_SSO_OVER_LMS', False):
logout_url = reverse('logout')
else:
logout_url = '{lms_root_url}/logout?next={next_url}'.format(
lms_root_url=settings.LMS_ROOT_URL,
next_url=current_site_url,
)
%>
<div class="wrapper wrapper-nav-sub">
<div class="nav-sub">
......@@ -54,7 +60,7 @@
</li>
% endif
<li class="nav-item nav-account-signout">
<a class="action action-signout" href="${logout_url}?next=${current_site_url}">${_("Sign Out")}</a>
<a class="action action-signout" href="${logout_url}">${_("Sign Out")}</a>
</li>
</ul>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment