remove remaining mocked data, wire in API

Author: gumaerc

config/apisix/apisix.yaml

@@ -3,6 +3,10 @@ upstreams:
     nodes:
       "nginx:${{NGINX_PORT}}": 1
     type: roundrobin
+  - id: 2
+    nodes:
+      "192.168.1.50:8013": 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: ".c4103.com"
         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: ".c4103.com"
         logout_path: "/logout/oidc"
         post_logout_redirect_uri: ${{APISIX_LOGOUT_URL}}
         unauth_action: "auth"
@@ -69,4 +77,33 @@ 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: ".c4103.com"
+        logout_path: "/logout"
+        post_logout_redirect_uri: ${{APISIX_LOGOUT_URL}}
+        unauth_action: "pass"
+      proxy-rewrite:
+        regex_uri:
+          - "/mitxonline/(.*)"
+          - "/$1"
+    uris:
+      - "/mitxonline/*"
 #END

frontends/api/package.json

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

frontends/api/src/mitxonline/clients.ts

@@ -1,12 +1,14 @@
 import {
+  B2bApi,
   CoursesApi,
   EnrollmentsApi,
   ProgramsApi,
+  UsersApi,
 } from "@mitodl/mitxonline-api-axios/v1"
 import axios from "axios"
 
 const axiosInstance = axios.create({
-  baseURL: "https://mitxonline.c4103.com/",
+  baseURL: process.env.NEXT_PUBLIC_MITXONLINE_API_BASE_URL,
   xsrfCookieName: process.env.NEXT_PUBLIC_CSRF_COOKIE_NAME,
   xsrfHeaderName: "X-CSRFToken",
   withXSRFToken: true,
@@ -17,8 +19,17 @@ const axiosInstance = axios.create({
 const BASE_PATH =
   process.env.NEXT_PUBLIC_MITXONLINE_API_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,
+}

frontends/api/src/mitxonline/hooks/courses/data.ts

@@ -5,8 +5,6 @@ import type {
 } from "@mitodl/mitxonline-api-axios/v1"
 import { coursesApi } from "../../clients"
 
-// import * as data from "./data"
-
 const coursesKeys = {
   root: ["mitxonline", "courses"],
   coursesList: (opts?: CoursesApiApiV2CoursesListRequest) => [
@@ -22,30 +20,6 @@ const coursesQueries = {
       queryKey: coursesKeys.coursesList(opts),
       queryFn: async (): Promise<PaginatedCourseWithCourseRunsList> => {
         return coursesApi.apiV2CoursesList(opts).then((res) => res.data)
-
-        // if (process.env.NODE_ENV === "test") {
-        //   /**
-        //    * For now, only use the API client during tests so we
-        //    * can mock it the way we normally do.
-        //    */
-        //   return coursesApi.apiV2CoursesList(opts).then((res) => res.data)
-        // }
-        // const ids = opts?.id ?? []
-        // const courses =
-        //   ids.length === 0
-        //     ? data.universalAiCourses
-        //     : data.universalAiCourses.filter((c) => ids.includes(c.id))
-        // if (courses.length === 0) {
-        //   console.error("No mock courses matching the given ids found.", {
-        //     ids,
-        //   })
-        // }
-        // return {
-        //   count: courses.length,
-        //   next: null,
-        //   previous: null,
-        //   results: courses,
-        // }
       },
     }),
 }