Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.venv/
.yarn/
.pytest_cache/
flow-typed/npm/
static/js/flow/
static/js/vendor/
Expand Down
2 changes: 1 addition & 1 deletion courseware/api_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ def test_retry_failed_enroll_grace_period(mocker):

@pytest.mark.parametrize(
"no_courseware_user,no_edx_auth", # noqa: PT006
itertools.product([True, False], [True, False]),
list(itertools.product([True, False], [True, False])),
)
def test_repair_faulty_edx_user(mocker, user, no_courseware_user, no_edx_auth):
"""
Expand Down
9 changes: 4 additions & 5 deletions mitxpro/models_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,10 @@ class Root(models.Model): # noqa: DJ008

# we create our models "on the fly" in our test db
with connection.schema_editor() as editor:
editor.create_model(SecondLevel1)
editor.create_model(SecondLevel2)
editor.create_model(FirstLevel1)
editor.create_model(FirstLevel2)
editor.create_model(Root)
for model in [SecondLevel1, SecondLevel2, FirstLevel1, FirstLevel2, Root]:
table_name = model._meta.db_table
if table_name not in connection.introspection.table_names():
editor.create_model(model)

return SimpleNamespace(
SecondLevel1=SecondLevel1,
Expand Down
4 changes: 4 additions & 0 deletions mitxpro/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,10 @@
SOCIAL_AUTH_EMAIL_VALIDATION_FUNCTION = "mail.verification_api.send_verification_email"
SOCIAL_AUTH_EMAIL_VALIDATION_URL = "/"

# Disable the default active user filter in social-auth-app-django 5.9+.
# The pipeline handles inactive users explicitly via the `activate_user` step.
SOCIAL_AUTH_ACTIVE_USERS_FILTER = {}

SOCIAL_AUTH_PIPELINE = (
# Checks if an admin user attempts to login/register while hijacking another user.
"authentication.pipeline.user.forbid_hijack",
Expand Down
1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencies = [
"boto3==1.43.83",
"celery==5.6.3",
"celery-redbeat==2.3.3",
"cryptography==46.0.5",
"cybersource-rest-client-python==0.0.78",
"dj-database-url==3.1.2",
"django==5.2.17",
Expand Down
Loading