integrate mitxonline api (#2256)

* change local code to hit mitxonline API (currently broken)

* partially wire up the dashboard to actual mitxonline api client library

* remove remaining mocked data, wire in API

* update the api and pull org content based on org id

* fix yarn lock after rebase

* replace hard coded domain with CSRF_COOKIE_DOMAIN

* add CSRF_COOKIE_DOMAIN to docker-compose config for apigateway

* fix function call name in enrollmentdisplay

* fix test url config issue

* fix unit tests

* fix issue with nextjs build

* fix feature flagging of org dashboard tab

* make mitxonline domain configurable

* match apisix config for mitxonline on domain instead

* set the proper name for the mitx online base url

* hide enrollements display if not enrolled in any courses

* fix homecontent test

* don't show "show all" unless there is something to reveal

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* whoops this copy of the repo doesn't have pre-commit on

* add mitx online url to the default frontend env

* separate upstream and domain in apisix config for mitxonline

* update api client and use org_id in course filtering on org page

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: gumaerc

config/apisix/apisix.yaml

@@ -3,6 +3,10 @@ upstreams:
     nodes:
       "nginx:${{NGINX_PORT}}": 1
     type: roundrobin
+  - id: 2
+    nodes:
+      "${{MITX_ONLINE_UPSTREAM}}": 1
+    type: roundrobin
 
 routes:
   - id: 1
@@ -22,7 +26,9 @@ routes:
         ssl_verify: false
         session:
           secret: ${{APISIX_SESSION_SECRET_KEY}}
-          cookie: { lifetime = 1209600 }
+          cookie:
+            lifetime: 1209600
+            domain: ${{CSRF_COOKIE_DOMAIN}}
         logout_path: "/logout/oidc"
         post_logout_redirect_uri: ${{APISIX_LOGOUT_URL}}
         unauth_action: "pass"
@@ -53,7 +59,9 @@ routes:
         ssl_verify: false
         session:
           secret: ${{APISIX_SESSION_SECRET_KEY}}
-          cookie: { lifetime = 1209600 }
+          cookie:
+            lifetime: 1209600
+            domain: ${{CSRF_COOKIE_DOMAIN}}
         logout_path: "/logout/oidc"
         post_logout_redirect_uri: ${{APISIX_LOGOUT_URL}}
         unauth_action: "auth"
@@ -69,4 +77,30 @@ routes:
     uris:
       - "/admin/login/*"
       - "/login"
+  - id: 3
+    name: "mitxonline-wildcard"
+    desc: "General route for the mitxonline application, includes user data if any."
+    priority: 10
+    upstream_id: 2
+    plugins:
+      openid-connect:
+        client_id: ${{KEYCLOAK_CLIENT_ID}}
+        client_secret: ${{KEYCLOAK_CLIENT_SECRET}}
+        discovery: ${{KEYCLOAK_DISCOVERY_URL}}
+        realm: ${{KEYCLOAK_REALM_NAME}}
+        scope: "openid profile ol-profile"
+        bearer_only: false
+        introspection_endpoint_auth_method: "client_secret_post"
+        ssl_verify: false
+        session:
+          secret: ${{APISIX_SESSION_SECRET_KEY}}
+          cookie:
+            lifetime: 1209600
+            domain: ${{CSRF_COOKIE_DOMAIN}}
+        logout_path: "/logout"
+        post_logout_redirect_uri: ${{APISIX_LOGOUT_URL}}
+        unauth_action: "pass"
+    uri: "*"
+    hosts:
+      - ${{MITX_ONLINE_DOMAIN}}
 #END

docker-compose.services.yml

@@ -119,6 +119,7 @@ services:
       - apisix
     image: apache/apisix:latest
     environment:
+      - CSRF_COOKIE_DOMAIN=${CSRF_COOKIE_DOMAIN:-.odl.local}
       - KEYCLOAK_REALM_NAME=${KEYCLOAK_REALM_NAME:-ol-local}
       - KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID:-apisix}
       - KEYCLOAK_CLIENT_SECRET=${KEYCLOAK_CLIENT_SECRET}
@@ -127,6 +128,8 @@ services:
       - APISIX_PORT=${APISIX_PORT:-8065}
       - APISIX_SESSION_SECRET_KEY=${APISIX_SESSION_SECRET_KEY:-something_at_least_16_characters}
       - APISIX_LOGOUT_URL=${APISIX_LOGOUT_URL:-http://open.odl.local:8065/}
+      - MITX_ONLINE_UPSTREAM=${MITX_ONLINE_UPSTREAM:-mitxonline.odl.local:8013}
+      - MITX_ONLINE_DOMAIN=${MITX_ONLINE_DOMAIN:-mitxonline.odl.local}
       - NGINX_PORT=${NGINX_PORT:-8062}
     ports:
       - ${APISIX_PORT}:${APISIX_PORT}

env/frontend.env

@@ -21,3 +21,5 @@ NEXT_PUBLIC_DEFAULT_SEARCH_MAX_INCOMPLETENESS_PENALTY=90
 
 NEXT_PUBLIC_LEARN_AI_RECOMMENDATION_ENDPOINT=https://api-learn-ai-qa.ol.mit.edu/http/recommendation_agent/
 NEXT_PUBLIC_LEARN_AI_SYLLABUS_ENDPOINT=https://api-learn-ai-qa.ol.mit.edu/http/syllabus_agent/
+
+NEXT_PUBLIC_MITX_ONLINE_BASE_URL=${MITX_ONLINE_BASE_URL}

frontends/api/package.json

@@ -30,6 +30,7 @@
     "ol-test-utilities": "0.0.0"
   },
   "dependencies": {
+    "@mitodl/mitxonline-api-axios": "^2025.6.3",
     "@tanstack/react-query": "^5.66.0",
     "axios": "^1.6.3"
   }

frontends/api/src/mitxonline/clients.ts

@@ -1,13 +1,35 @@
-import { EnrollmentsApi, ProgramsApi, CoursesApi } from "./generated/v0/api"
+import {
+  B2bApi,
+  CoursesApi,
+  EnrollmentsApi,
+  ProgramsApi,
+  UsersApi,
+} from "@mitodl/mitxonline-api-axios/v1"
 import axios from "axios"
 
-const axiosInstance = axios.create({})
+const axiosInstance = axios.create({
+  baseURL: process.env.NEXT_PUBLIC_MITX_ONLINE_BASE_URL,
+  xsrfCookieName: process.env.NEXT_PUBLIC_CSRF_COOKIE_NAME,
+  xsrfHeaderName: "X-CSRFToken",
+  withXSRFToken: true,
+  withCredentials:
+    process.env.NEXT_PUBLIC_MITOL_AXIOS_WITH_CREDENTIALS === "true",
+})
 
 const BASE_PATH =
-  process.env.NEXT_PUBLIC_MITXONLINE_API_BASE_URL?.replace(/\/+$/, "") ?? ""
+  process.env.NEXT_PUBLIC_MITX_ONLINE_BASE_URL?.replace(/\/+$/, "") ?? ""
 
+const usersApi = new UsersApi(undefined, BASE_PATH, axiosInstance)
+const b2bApi = new B2bApi(undefined, BASE_PATH, axiosInstance)
 const enrollmentsApi = new EnrollmentsApi(undefined, BASE_PATH, axiosInstance)
 const programsApi = new ProgramsApi(undefined, BASE_PATH, axiosInstance)
 const coursesApi = new CoursesApi(undefined, BASE_PATH, axiosInstance)
 
-export { enrollmentsApi, programsApi, coursesApi, axiosInstance }
+export {
+  usersApi,
+  b2bApi,
+  enrollmentsApi,
+  programsApi,
+  coursesApi,
+  axiosInstance,
+}