Add testing configuration for MOOC

.vscode/tasks.json

@@ -44,7 +44,7 @@
             "type": "pickString",
             "id": "zBackend",
             "description": "Select backend mode",
-            "options": ["mockBackend", "localTMCServer", "production"],
+            "options": ["mockTmcLocalMooc", "mockBackend", "production"],
             "default": "production"
         }
     ]

backend/controllers/oauth.ts

@@ -20,11 +20,20 @@ oauthRouter.post("/token", (req, res: Response<Token>) => {
     const { username, password } = req.body;
     console.log("Username:" + username, "Password:", password);
 
+    if (username === password) {
+        return res.json({
+            access_token: username,
+            token_type: "bearer",
+            scope: "public",
+            created_at: 1234567890,
+        });
+    }
+
     const isTestUser = username === USER.username && password === USER.password;
     const isStudent = username === "student" && password === "student";
     if (isTestUser || isStudent) {
         return res.json({
-            access_token: "1234",
+            access_token: "token",
             token_type: "bearer",
             scope: "public",
             created_at: 1234567890,

config.js

@@ -5,25 +5,29 @@ const path = require("path");
 
 const TMC_LANGS_RUST_VERSION = "0.36.1";
 
-const localTMCServer = {
-    __TMC_BACKEND__URL__: JSON.stringify("http://localhost:3000"),
-    __TMC_LANGS_CONFIG_DIR__: JSON.stringify(null),
-    __TMC_LANGS_DL_URL__: JSON.stringify("https://download.mooc.fi/tmc-langs-rust/"),
+const mockTmcLocalMooc = {
+    __TMC_BACKEND_URL__: JSON.stringify("http://localhost:4001"),
+    __TMC_LANGS_CONFIG_DIR__: JSON.stringify(path.join(__dirname, "backend", "cli")),
+    __TMC_LANGS_DL_URL__: JSON.stringify("http://localhost:4001/langs/"),
     __TMC_LANGS_VERSION__: JSON.stringify(TMC_LANGS_RUST_VERSION),
+    __MOOC_BACKEND_URL__: JSON.stringify("http://project-331.local"),
 };
 
 const mockBackend = {
-    __TMC_BACKEND__URL__: JSON.stringify("http://localhost:4001"),
+    __TMC_BACKEND_URL__: JSON.stringify("http://localhost:4001"),
     __TMC_LANGS_CONFIG_DIR__: JSON.stringify(path.join(__dirname, "backend", "cli")),
     __TMC_LANGS_DL_URL__: JSON.stringify("http://localhost:4001/langs/"),
     __TMC_LANGS_VERSION__: JSON.stringify(TMC_LANGS_RUST_VERSION),
+    // no mock mooc backend yet
+    __MOOC_BACKEND_URL__: JSON.stringify("https://courses.mooc.fi"),
 };
 
 const productionApi = {
-    __TMC_BACKEND__URL__: JSON.stringify("https://tmc.mooc.fi"),
+    __TMC_BACKEND_URL__: JSON.stringify("https://tmc.mooc.fi"),
     __TMC_LANGS_CONFIG_DIR__: JSON.stringify(null),
     __TMC_LANGS_DL_URL__: JSON.stringify("https://download.mooc.fi/tmc-langs-rust/"),
     __TMC_LANGS_VERSION__: JSON.stringify(TMC_LANGS_RUST_VERSION),
+    __MOOC_BACKEND_URL__: JSON.stringify("https://courses.mooc.fi"),
 };
 
-module.exports = { mockBackend, localTMCServer, productionApi };
+module.exports = { mockTmcLocalMooc, mockBackend, productionApi };

src/api/tmc.ts

@@ -7,6 +7,7 @@ import {
     API_CACHE_LIFETIME,
     CLI_PROCESS_TIMEOUT,
     MINIMUM_SUBMISSION_INTERVAL,
+    MOOC_BACKEND_URL,
     TMC_BACKEND_URL,
 } from "../config/constants";
 import {
@@ -1012,11 +1013,13 @@ export default class TMC {
             .join(" ");
 
         // override settings with environment variables, mainly for testing
-        const tmcLangsBackendUrl = process.env.TMC_LANGS_TMC_ROOT_URL ?? TMC_BACKEND_URL;
+        const tmcBackendUrl = process.env.TMC_LANGS_TMC_ROOT_URL ?? TMC_BACKEND_URL;
+        const moocBackendUrl = process.env.TMC_LANGS_MOOC_ROOT_URL ?? MOOC_BACKEND_URL;
         const tmcLangsConfigDir = process.env.TMC_LANGS_CONFIG_DIR ?? this._options.cliConfigDir;
 
         Logger.info(`Running ${loggableCommand}`);
-        Logger.debug(`Backend at ${tmcLangsBackendUrl}`);
+        Logger.debug(`TMC backend at ${tmcBackendUrl}`);
+        Logger.debug(`MOOC backend at ${moocBackendUrl}`);
         Logger.debug(`Config dir at ${tmcLangsConfigDir}`);
 
         let active = true;
@@ -1026,7 +1029,8 @@ export default class TMC {
                 ...process.env,
                 ...env,
                 RUST_LOG: "debug,rustls=warn,reqwest=warn",
-                TMC_LANGS_TMC_ROOT_URL: tmcLangsBackendUrl,
+                TMC_LANGS_TMC_ROOT_URL: tmcBackendUrl,
+                TMC_LANGS_MOOC_ROOT_URL: moocBackendUrl,
                 TMC_LANGS_CONFIG_DIR: tmcLangsConfigDir,
             },
         });

src/config/constants.ts

@@ -4,20 +4,22 @@
 // Build time only globals defined in webpack configuration. These values are inlined when
 // compiling.
 declare const __DEBUG_MODE__: boolean;
-declare const __TMC_BACKEND__URL__: string;
+declare const __TMC_BACKEND_URL__: string;
 declare const __TMC_LANGS_CONFIG_DIR__: string | null;
 declare const __TMC_LANGS_DL_URL__: string;
 declare const __TMC_LANGS_VERSION__: string;
+declare const __MOOC_BACKEND_URL__: string;
 
 // @ts-ignore "No module found" error even though the file exists
 import FAQ from "../../docs/FAQ.md";
 import { TestResultData } from "../shared/shared";
 
 export const DEBUG_MODE = __DEBUG_MODE__;
-export const TMC_BACKEND_URL = __TMC_BACKEND__URL__;
+export const TMC_BACKEND_URL = __TMC_BACKEND_URL__;
 export const TMC_LANGS_CONFIG_DIR = __TMC_LANGS_CONFIG_DIR__ || undefined;
 export const TMC_LANGS_DL_URL = __TMC_LANGS_DL_URL__;
 export const TMC_LANGS_VERSION = __TMC_LANGS_VERSION__;
+export const MOOC_BACKEND_URL = __MOOC_BACKEND_URL__;
 
 export const CLIENT_NAME = "vscode_plugin";
 export const EXTENSION_ID = "moocfi.test-my-code";

webpack.config.js

@@ -8,18 +8,18 @@ const TerserPlugin = require("terser-webpack-plugin");
 const webpack = require("webpack");
 const merge = require("webpack-merge").merge;
 
-const { mockBackend, localTMCServer, productionApi } = require("./config");
+const { mockTmcLocalMooc, mockBackend, productionApi } = require("./config");
 
 /**@type {() => import("webpack").Configuration} */
 const config = () => {
     const isDevelopmentMode = process.env.NODE_ENV && process.env.NODE_ENV === "development";
 
     const apiConfig = (() => {
         switch (process.env.BACKEND) {
+            case "mockTmcLocalMooc":
+                return mockTmcLocalMooc;
             case "mockBackend":
                 return mockBackend;
-            case "localTMCServer":
-                return localTMCServer;
             default:
                 return productionApi;
         }
@@ -162,7 +162,8 @@ const config = () => {
     console.log(
         `Webpack building in ${isDevelopmentMode ? "development" : "production"} configuration.`,
     );
-    console.log(`Configured backend: ${apiConfig.__TMC_BACKEND__URL__}`);
+    console.log(`Configured TMC backend: ${apiConfig.__TMC_BACKEND_URL__}`);
+    console.log(`Configured MOOC backend: ${apiConfig.__MOOC_BACKEND_URL__}`);
 
     return merge(commonConfig, isDevelopmentMode ? devConfig() : prodConfig());
 };