Release 0.111.3

.secrets.baseline

@@ -166,7 +166,7 @@
         "filename": "frontend/public/src/lib/auth.js",
         "hashed_secret": "e3c328a97de7239b3f60eecda765a69535205744",
         "is_verified": false,
-        "line_number": 23
+        "line_number": 25
       }
     ],
     "frontend/public/src/lib/test_constants.js": [
@@ -240,5 +240,5 @@
       }
     ]
   },
-  "generated_at": "2024-11-05T12:32:12Z"
+  "generated_at": "2025-01-22T20:35:24Z"
 }

RELEASE.rst

@@ -1,6 +1,13 @@
 Release Notes
 =============
 
+Version 0.111.3
+---------------
+
+- fix(deps): update dependency moment to v2.30.1 (#2477)
+- chore(deps): update redis docker tag to v6.2.17 (#2507)
+- Add support for round-tripping the user through Unified Ecommerce on login (#2515)
+
 Version 0.111.2 (Released January 24, 2025)
 ---------------
 

app.json

@@ -612,6 +612,10 @@
       "description": "Token to access the status API.",
       "required": false
     },
+    "UNIFIED_ECOMMERCE_URL": {
+      "description": "The base URL for Unified Ecommerce.",
+      "required": false
+    },
     "USE_X_FORWARDED_HOST": {
       "description": "Set HOST header to original domain accessed by user",
       "required": false

docker-compose.yml

@@ -32,7 +32,7 @@ services:
       - db-data:/var/lib/postgresql/data
 
   redis:
-    image: redis:6.2.16
+    image: redis:6.2.17
     ports:
       - "6379"
 

frontend/public/package.json

@@ -64,7 +64,7 @@
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.9.2",
     "mocha": "9.2.2",
-    "moment": "2.29.4",
+    "moment": "2.30.1",
     "moment-locales-webpack-plugin": "^1.2.0",
     "moment-timezone": "^0.5.43",
     "named-urls": "1.4.0",

frontend/public/src/flow/declarations.js

@@ -21,7 +21,8 @@ declare type Settings = {
   digital_credentials: boolean,
   digital_credentials_supported_runs: Array<string>,
   posthog_api_token: ?string,
-  posthog_api_host: ?string
+  posthog_api_host: ?string,
+  unified_ecommerce_url: ?string,
 }
 declare var SETTINGS: Settings
 

frontend/public/src/lib/auth.js

@@ -1,8 +1,10 @@
 // @flow
+/* global SETTINGS: false */
 import qs from "query-string"
 import { isEmpty, includes, has } from "ramda"
 
 import { routes } from "../lib/urls"
+import { checkFeatureFlag } from "../lib/util"
 
 import type { RouterHistory } from "react-router"
 import type { AuthResponse, AuthStates } from "../flow/authTypes"
@@ -77,14 +79,31 @@ export const handleAuthResponse = (
 ) => {
   /* eslint-disable camelcase */
   const { state, redirect_url, partial_token, errors, field_errors } = response
+  // This is pre-login so we won't be able to flag this out for individual users.
+  // The use of "anonymousUser" is historical - see usage in PR #2064 for instance
+  const sendThruEcommerce = checkFeatureFlag(
+    "enable_unified_ecommerce",
+    "anonymousUser"
+  )
 
   // If a specific handler function was passed in for this response state, invoke it
   if (has(state, handlers)) {
     handlers[state](response)
   }
 
   if (state === STATE_SUCCESS) {
-    window.location = redirect_url || routes.dashboard
+    const end_location = redirect_url || routes.dashboard
+    if (SETTINGS.unified_ecommerce_url && sendThruEcommerce) {
+      const ecommerce = new URL(`${SETTINGS.unified_ecommerce_url}`)
+
+      ecommerce.pathname = "establish_session/"
+      ecommerce.searchParams.set("next", end_location)
+      ecommerce.searchParams.set("system", "mitxonline")
+
+      window.location = ecommerce.href
+    } else {
+      window.location = end_location
+    }
   } else if (state === STATE_LOGIN_PASSWORD) {
     history.push(routes.login.password)
   } else if (state === STATE_REGISTER_DETAILS) {

frontend/public/src/lib/auth_test.js

@@ -11,6 +11,8 @@ import {
 import { routes } from "../lib/urls"
 import { makeRegisterAuthResponse } from "../factories/auth"
 
+const util = require("../lib/util")
+
 describe("auth lib function", () => {
   it("generateLoginRedirectUrl should generate a url to redirect to after login", () => {
     window.location = "/protected/route?var=abc"
@@ -47,5 +49,30 @@ describe("auth lib function", () => {
         sinon.assert.calledWith(handler, response)
       })
     })
+    ;[true, false].forEach(flagState => {
+      it(`redirects through Unified Ecommerce properly if the feature flag is ${
+        flagState ? "enabled" : "disabled"
+      }`, () => {
+        const response = makeRegisterAuthResponse({
+          state:        "success",
+          redirect_url: "/"
+        })
+        const handlers = {}
+        global.SETTINGS = {
+          unified_ecommerce_url: "http://ecommerce"
+        }
+
+        sandbox.stub(util, "checkFeatureFlag").returns(flagState)
+
+        assert.equal(
+          util.checkFeatureFlag("enable_unified_ecommerce", "anonymousUser"),
+          flagState
+        )
+
+        handleAuthResponse(history, response, handlers)
+
+        assert.equal(window.location.hostname, flagState ? "ecommerce" : "fake")
+      })
+    })
   })
 })

frontend/public/src/lib/util_test.js

@@ -180,7 +180,8 @@ describe("utility functions", () => {
   })
 
   it("formatPrettyDate should return a formatted moment date", () => {
-    const momentDate = moment("2019-01-01T00:00:00.000000Z")
+    moment.locale("en")
+    const momentDate = moment("2019-01-01T00:00:00.000000")
     assert.equal(formatPrettyDate(momentDate), "January 1, 2019")
   })
 

main/settings.py

@@ -29,7 +29,7 @@
 from main.celery_utils import OffsettingSchedule
 from main.sentry import init_sentry
 
-VERSION = "0.111.2"
+VERSION = "0.111.3"
 
 log = logging.getLogger()
 
@@ -1199,3 +1199,11 @@
     default="",
     description="Hubspot Portal ID",
 )
+
+# Unified Ecommerce integration
+
+UNIFIED_ECOMMERCE_URL = get_string(
+    name="UNIFIED_ECOMMERCE_URL",
+    default="http://ue.odl.local:9080/",
+    description="The base URL for Unified Ecommerce.",
+)

main/utils.py

@@ -52,6 +52,7 @@ def get_js_settings(request: HttpRequest):  # noqa: ARG001
         "features": {},
         "posthog_api_token": settings.POSTHOG_PROJECT_API_KEY,
         "posthog_api_host": settings.POSTHOG_API_HOST,
+        "unified_ecommerce_url": settings.UNIFIED_ECOMMERCE_URL,
     }
 
 

main/utils_test.py

@@ -51,6 +51,7 @@ def test_get_js_settings(settings, rf):
         "features": {},
         "posthog_api_token": settings.POSTHOG_PROJECT_API_KEY,
         "posthog_api_host": settings.POSTHOG_API_HOST,
+        "unified_ecommerce_url": settings.UNIFIED_ECOMMERCE_URL,
     }
 
 

yarn.lock

@@ -16138,7 +16138,7 @@ __metadata:
     lodash: 4.17.21
     mini-css-extract-plugin: 2.9.2
     mocha: 9.2.2
-    moment: 2.29.4
+    moment: 2.30.1
     moment-locales-webpack-plugin: ^1.2.0
     moment-timezone: ^0.5.43
     named-urls: 1.4.0
@@ -16332,14 +16332,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:2.29.4":
-  version: 2.29.4
-  resolution: "moment@npm:2.29.4"
-  checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e
-  languageName: node
-  linkType: hard
-
-"moment@npm:^2.15.2, moment@npm:^2.29.4":
+"moment@npm:2.30.1, moment@npm:^2.15.2, moment@npm:^2.29.4":
   version: 2.30.1
   resolution: "moment@npm:2.30.1"
   checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6