mitodl · odlbot · Feb 10, 2025 · Feb 6, 2025 · Feb 6, 2025 · Feb 7, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "^20"
           cache: yarn
@@ -194,7 +194,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "^22"
           cache: yarn
@@ -217,7 +217,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "^20"
           cache: yarn
@@ -256,7 +256,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "^20"
           cache: yarn

diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -28,7 +28,7 @@ jobs:
         run: heroku container:login
 
       - name: Release Backend on Heroku
-        uses: akhileshns/heroku-deploy@e86b991436e126ff9d78399b801a6610a64881c9
+        uses: akhileshns/heroku-deploy@c3187cbbeceea824a6f5d9e0e14e2995a611059c
         with:
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
           heroku_app_name: mitopen-production

diff --git a/.github/workflows/publish-pages.yml b/.github/workflows/publish-pages.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
-      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4
         with:
           node-version: "^20"
           cache: yarn

diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -28,7 +28,7 @@ jobs:
         run: heroku container:login
 
       - name: Release Backend on Heroku
-        uses: akhileshns/heroku-deploy@e86b991436e126ff9d78399b801a6610a64881c9
+        uses: akhileshns/heroku-deploy@c3187cbbeceea824a6f5d9e0e14e2995a611059c
         with:
           heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
           heroku_app_name: mitopen-rc

diff --git a/.gitignore b/.gitignore
@@ -135,3 +135,6 @@ storybook-static/
 
 # ignore local ssl certs
 certs/
+
+# ignore db backups
+backups/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -74,7 +74,7 @@ repos:
           - ".*/generated/"
         additional_dependencies: ["gibberish-detector"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.9.1"
+    rev: "v0.9.4"
     hooks:
       - id: ruff-format
       - id: ruff

diff --git a/Dockerfile b/Dockerfile
@@ -18,6 +18,10 @@ RUN mkdir /src
 RUN adduser --disabled-password --gecos "" mitodl
 RUN mkdir /var/media && chown -R mitodl:mitodl /var/media
 
+# copy in trusted certs
+COPY --chmod=644 certs/*.crt /usr/local/share/ca-certificates/
+RUN update-ca-certificates
+
 ## Set some poetry config
 ENV  \
   POETRY_VERSION=1.7.1 \

diff --git a/RELEASE.rst b/RELEASE.rst
@@ -1,6 +1,22 @@
 Release Notes
 =============
 
+Version 0.30.2
+--------------
+
+- Update dependency litellm to v1.60.8 (#2028)
+- Update dependency drf-spectacular to ^0.28.0 (#2027)
+- Update nginx Docker tag to v1.27.4 (#2026)
+- Skip existing embeddings (#2017)
+- Update dependency ruff to v0.9.5 (#2025)
+- Update dependency Django to v4.2.19 (#2024)
+- Update akhileshns/heroku-deploy digest to c3187cb (#1829)
+- [pre-commit.ci] pre-commit autoupdate (#1976)
+- Update dependency eslint-config-prettier to v10 (#1995)
+- Update actions/setup-node digest to 1d0ff46 (#2009)
+- Added SCIM /Bulk API endpoint (#1985)
+- Add initial migration for users app (#2013)
+
 Version 0.30.1 (Released February 10, 2025)
 --------------
 

diff --git a/profiles/scim/__init__.py → backups/.keep b/profiles/scim/__init__.py → backups/.keep
diff --git a/certs/.keep b/certs/.keep
diff --git a/docker-compose.services.yml b/docker-compose.services.yml
@@ -19,6 +19,7 @@ services:
       - POSTGRES_PASSWORD=postgres
     volumes:
       - pgdata:/var/lib/postgresql
+      - ./backups:/mnt/backups
 
   redis:
     profiles:

diff --git a/frontends/package.json b/frontends/package.json
@@ -50,7 +50,7 @@
     "cross-fetch": "^4.0.0",
     "eslint": "8.57.1",
     "eslint-config-mitodl": "^2.1.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^10.0.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jest": "^28.6.0",

diff --git a/main/factories.py b/main/factories.py
@@ -4,7 +4,7 @@
 
 import ulid
 from django.conf import settings
-from factory import LazyFunction, RelatedFactory, SubFactory, Trait
+from factory import Faker, LazyFunction, RelatedFactory, SubFactory, Trait
 from factory.django import DjangoModelFactory
 from factory.fuzzy import FuzzyText
 from social_django.models import UserSocialAuth
@@ -15,8 +15,8 @@ class UserFactory(DjangoModelFactory):
 
     username = LazyFunction(lambda: ulid.new().str)
     email = FuzzyText(suffix="@example.com")
-    first_name = FuzzyText()
-    last_name = FuzzyText()
+    first_name = Faker("first_name")
+    last_name = Faker("last_name")
 
     profile = RelatedFactory("profiles.factories.ProfileFactory", "user")
 

diff --git a/main/settings.py b/main/settings.py
@@ -33,7 +33,7 @@
 from main.settings_pluggy import *  # noqa: F403
 from openapi.settings_spectacular import open_spectacular_settings
 
-VERSION = "0.30.1"
+VERSION = "0.30.2"
 
 log = logging.getLogger()
 
@@ -107,6 +107,7 @@
     "drf_spectacular",
     # Put our apps after this point
     "main",
+    "users",
     "authentication",
     "channels",
     "profiles",
@@ -121,6 +122,7 @@
     "data_fixtures",
     "vector_search",
     "ai_chat",
+    "scim",
 )
 
 if not get_bool("RUN_DATA_MIGRATIONS", default=False):
@@ -140,9 +142,11 @@
             "documentationUri": "",
         },
     ],
-    "USER_ADAPTER": "profiles.scim.adapters.LearnSCIMUser",
-    "USER_MODEL_GETTER": "profiles.scim.adapters.get_user_model_for_scim",
-    "USER_FILTER_PARSER": "profiles.scim.filters.LearnUserFilterQuery",
+    "SERVICE_PROVIDER_CONFIG_MODEL": "scim.config.LearnSCIMServiceProviderConfig",
+    "USER_ADAPTER": "scim.adapters.LearnSCIMUser",
+    "USER_MODEL_GETTER": "scim.adapters.get_user_model_for_scim",
+    "USER_FILTER_PARSER": "scim.filters.LearnUserFilterQuery",
+    "GET_IS_AUTHENTICATED_PREDICATE": "scim.utils.is_authenticated_predicate",
 }
 
 

diff --git a/main/settings_celery.py b/main/settings_celery.py
@@ -131,6 +131,12 @@
         "schedule": crontab(minute=30, hour=18),  # 2:30pm EST
         "kwargs": {"period": "daily", "subscription_type": "channel_subscription_type"},
     },
+    "daily_embed_new_learning_resources": {
+        "task": "vector_search.tasks.embed_new_learning_resources",
+        "schedule": get_int(
+            "EMBED_NEW_RESOURCES_SCHEDULE_SECONDS", 60 * 30
+        ),  # default is every 30 minutes
+    },
     "send-search-subscription-emails-every-1-days": {
         "task": "learning_resources_search.tasks.send_subscription_emails",
         "schedule": crontab(minute=0, hour=19),  # 3:00pm EST

diff --git a/main/urls.py b/main/urls.py
@@ -17,7 +17,7 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.urls import include, path, re_path
+from django.urls import include, re_path
 from django.views.generic.base import RedirectView
 from rest_framework.routers import DefaultRouter
 
@@ -41,7 +41,6 @@
 
 urlpatterns = (
     [  # noqa: RUF005
-        path("scim/v2/", include("django_scim.urls")),
         re_path(r"^o/", include("oauth2_provider.urls", namespace="oauth2_provider")),
         re_path(r"^admin/", admin.site.urls),
         re_path(r"", include("authentication.urls")),
@@ -58,6 +57,7 @@
         re_path(r"", include("articles.urls")),
         re_path(r"", include("testimonials.urls")),
         re_path(r"", include("news_events.urls")),
+        re_path(r"", include("scim.urls")),
         re_path(r"", include(features_router.urls)),
         re_path(r"^app", RedirectView.as_view(url=settings.APP_BASE_URL)),
         # Hijack

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -2,7 +2,7 @@
 #       it's primary purpose is to emulate heroku-buildpack-nginx's
 #       functionality that compiles config/nginx.conf.erb
 # See https://github.com/heroku/heroku-buildpack-nginx/blob/fefac6c569f28182b3459cb8e34b8ccafc403fde/bin/start-nginx
-FROM nginx:1.27.3
+FROM nginx:1.27.4
 
 # Logs are configured to a relatic path under /etc/nginx
 # but the container expects /var/log

diff --git a/poetry.lock b/poetry.lock