diff --git a/CHANGELOG.md b/CHANGELOG.md index 95bef1e..e772074 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥". ## Unreleased +- [Bugfix] Fix oauth authentication in dev mode - [Improvement] Upgrade to the 3.7 docker-compose syntax - [Improvement] The `dev runserver` command can now be run for just any service - 💥[Feature] `dev run/exec` commands now support generic options which are passed to docker-compose. Consequently, defining the `TUTOR_EDX_PLATFORM_PATH` environment variable no longer works. Instead, users are encouraged to explicitely pass the `-v` option or define a command alias diff --git a/tutor/templates/apps/openedx/settings/lms/development.py b/tutor/templates/apps/openedx/settings/lms/development.py index d83a93a..8d720fd 100644 --- a/tutor/templates/apps/openedx/settings/lms/development.py +++ b/tutor/templates/apps/openedx/settings/lms/development.py @@ -4,6 +4,8 @@ from lms.envs.devstack import * {% include "apps/openedx/settings/partials/common_lms.py" %} +OAUTH_OIDC_ISSUER = "{{ JWT_COMMON_ISSUER }}" + # Setup correct webpack configuration file for development WEBPACK_CONFIG_PATH = "webpack.dev.config.js" diff --git a/tutor/templates/apps/openedx/settings/lms/production.py b/tutor/templates/apps/openedx/settings/lms/production.py index 86945f6..53f8632 100644 --- a/tutor/templates/apps/openedx/settings/lms/production.py +++ b/tutor/templates/apps/openedx/settings/lms/production.py @@ -16,7 +16,4 @@ ALLOWED_HOSTS = [ # Required to display all courses on start page SEARCH_SKIP_ENROLLMENT_START_DATE_FILTERING = True -# Allow insecure oauth2 for local interaction with local containers -OAUTH_ENFORCE_SECURE = False - {{ patch("openedx-lms-production-settings") }} diff --git a/tutor/templates/apps/openedx/settings/partials/common_lms.py b/tutor/templates/apps/openedx/settings/partials/common_lms.py index 64078d7..9582187 100644 --- a/tutor/templates/apps/openedx/settings/partials/common_lms.py +++ b/tutor/templates/apps/openedx/settings/partials/common_lms.py @@ -30,6 +30,9 @@ JWT_AUTH["JWT_AUDIENCE"] = "{{ JWT_COMMON_AUDIENCE }}" JWT_AUTH["JWT_SECRET_KEY"] = "{{ JWT_COMMON_SECRET_KEY }}" JWT_AUTH["JWT_PRIVATE_SIGNING_JWK"] = None +# Allow insecure oauth2 for local interaction with local containers +OAUTH_ENFORCE_SECURE = False + # Create folders if necessary for folder in [LOG_DIR, MEDIA_ROOT, STATIC_ROOT_BASE, ORA2_FILEUPLOAD_ROOT]: if not os.path.exists(folder):