Merge branch 'master' into nightly

CHANGELOG.md

@@ -18,6 +18,8 @@ Every user-facing change should have an entry in this changelog. Please respect
 
 ## Unreleased
 
+- [Fix] Fix studio logout issue. (by @Alec4r) [PR #680](https://github.com/overhangio/tutor/pull/680)
+
 ## v13.3.0 (2022-06-03)
 
 - [Security] Apply logout redirect url security fix. (by @regisb)

docs/install.rst

@@ -167,3 +167,9 @@ Finally, uninstall Tutor itself::
 
     # If you downloaded the tutor binary
     sudo rm /usr/local/bin/tutor
+
+    # Optionally, you may want to remove Tutor plugins installed.
+    # You can get a list of the installed plugins:
+    pip freeze | grep tutor
+    # You can then remove them using the following command:
+    pip uninstall <plugin-name>

tutor/templates/apps/openedx/settings/lms/development.py

@@ -22,7 +22,7 @@ CSRF_COOKIE_SECURE = False
 SESSION_COOKIE_SAMESITE = "Lax"
 
 # CMS authentication
-IDA_LOGOUT_URI_LIST.append("http://{{ CMS_HOST }}:8001/complete/logout")
+IDA_LOGOUT_URI_LIST.append("http://{{ CMS_HOST }}:8001/logout/")
 
 FEATURES['ENABLE_COURSEWARE_MICROFRONTEND'] = False
 

tutor/templates/apps/openedx/settings/lms/production.py

@@ -24,7 +24,7 @@ SESSION_COOKIE_SAMESITE = "Lax"
 {% endif %}
 
 # CMS authentication
-IDA_LOGOUT_URI_LIST.append("{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ CMS_HOST }}/complete/logout")
+IDA_LOGOUT_URI_LIST.append("{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ CMS_HOST }}/logout/")
 
 # Required to display all courses on start page
 SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING = True

tutor/templates/apps/openedx/settings/partials/common_cms.py

@@ -13,7 +13,6 @@ SESSION_COOKIE_NAME = "studio_session_id"
 MAX_ASSET_UPLOAD_FILE_SIZE_IN_MB = 100
 
 FRONTEND_LOGIN_URL = LMS_ROOT_URL + '/login'
-FRONTEND_LOGOUT_URL = LMS_ROOT_URL + '/logout'
 FRONTEND_REGISTER_URL = LMS_ROOT_URL + '/register'
 
 # Create folders if necessary