Remove unnecessary system time info from submissions and small updates to courses mooc support

Author: Heliozoa

CONTRIBUTING.md

@@ -40,6 +40,14 @@ cargo test
 
 The `docker.sh` script can be conveniently used to build and test the project. To build the binary and copy it out of the container to the project root, simply run `docker.sh`. To run tests, you can run `docker.sh "cargo test"`, or `docker.sh "cargo test -p tmc-langs-r"` and so on. The script also supports the special argument `interactive` to launch into an interactive bash shell inside the Docker container.
 
+## Generating the TypeScript bindings
+
+```bash
+cargo test --features ts-rs generate_cli_bindings -- --ignored
+```
+
+The bindings are written to `crates/tmc-langs-cli/bindings.d.ts`.
+
 ## Formatting and linting
 
 Use `cargo +nightly fmt` and `cargo clippy` for formatting and linting. All crates should have the clippy lints `print_stdout` and `print_stderr` set to deny to allow the CLI to have total control over stdout and stderr. The CLI has one function where writing to stdout is allowed.

Cargo.lock

@@ -37,6 +37,8 @@ fn main() {
         tmc_langs::ExerciseDownload,
         // getCourseData
         tmc_langs::CombinedCourseData,
+
+        // TMC
         // getCourseData
         tmc_langs::tmc::response::CourseDetails,
         tmc_langs::tmc::response::Exercise,
@@ -75,6 +77,10 @@ fn main() {
         tmc_langs::tmc::response::SubmissionFeedbackKind,
         // listSettings
         tmc_langs::TmcConfig,
+
+        // MOOC
+        // course-instances
+        tmc_langs::mooc::CourseInstance,
     }
     .unwrap();
     println!("Wrote bindings to `{path}`");

crates/bindings/tmc-langs-node/src/bin/generate-node-bindings.rs

@@ -22,7 +22,9 @@ Binaries for the supported targets are built and the binaries deployed to Google
 
 | var name                         | usage                                                          |
 | -------------------------------- | -------------------------------------------------------------- |
-| `TMC_LANGS_TMC_ROOT_URL`         | Sets the TMC server url.                                       |
+| `TMC_LANGS_LOG`                  | Sets the logging level.                                        |
+| `TMC_LANGS_TMC_ROOT_URL`         | Sets the courses.mooc.fi server url.                           |
+| `TMC_LANGS_MOOC_ROOT_URL`        | Sets the tmc.mooc.fi server url.                               |
 | `TMC_LANGS_CONFIG_DIR`           | Sets the config directory.                                     |
 | `TMC_LANGS_DEFAULT_PROJECTS_DIR` | Sets the default projects directory.                           |
 | `TMC_SANDBOX`                    | If set, the CLI considers itself to be running in tmc-sandbox. |

crates/tmc-langs-cli/README.md

@@ -110,7 +110,7 @@ export interface TmcConfig { projects_dir: string, }
 
 export interface CourseInstance { id: string, course_id: string, course_slug: string, course_name: string, course_description: string | null, instance_name: string | null, instance_description: string | null, }
 
-export interface TmcExerciseSlide { slide_id: string, exercise_id: string, exercise_name: string, exercise_order_number: number, deadline: Date | null, tasks: Array<TmcExerciseTask>, }
+export interface TmcExerciseSlide { slide_id: string, exercise_id: string, exercise_name: string, exercise_order_number: number, deadline: string | null, tasks: Array<TmcExerciseTask>, }
 
 export interface TmcExerciseTask { task_id: string, order_number: number, assignment: unknown, public_spec: PublicSpec | null, model_solution_spec: ModelSolutionSpec | null, }
 

crates/tmc-langs-cli/bindings.d.ts

@@ -5,6 +5,7 @@ use clap::Parser;
 use schemars::JsonSchema;
 use std::{path::PathBuf, str::FromStr};
 use tmc_langs::{
+    mooc::CourseInstance,
     tmc::{
         response::{
             Course, CourseData, CourseDetails, CourseExercise, ExerciseDetails, NewSubmission,
@@ -541,6 +542,8 @@ pub struct Mooc {
 
 #[derive(Parser)]
 pub enum MoocCommand {
+    /// Fetches the user's enrolled courses.
+    #[clap(long_about = schema_leaked::<Vec<CourseInstance>>())]
     CourseInstances,
     CourseInstanceExercises {
         #[clap(long)]

crates/tmc-langs-cli/src/app.rs

@@ -972,8 +972,8 @@ fn run_tmc_inner(
 }
 
 fn run_mooc(mooc: Mooc) -> Result<CliOutput> {
-    let root_url =
-        env::var("TMC_LANGS_MOOC_ROOT_URL").unwrap_or_else(|_| "https://tmc.mooc.fi".to_string());
+    let root_url = env::var("TMC_LANGS_MOOC_ROOT_URL")
+        .unwrap_or_else(|_| "https://courses.mooc.fi".to_string());
 
     let (mut client, credentials) =
         tmc_langs::init_mooc_client_with_credentials(root_url, &mooc.client_name)?;

crates/tmc-langs-cli/src/lib.rs

@@ -12,6 +12,19 @@ use tmc_langs_cli::{
 };
 
 fn main() -> ExitCode {
+    // convert `TMC_LANGS_LOG` into the appropriate `RUST_LOG`
+    if let Ok(level) = std::env::var("TMC_LANGS_LOG") {
+        let level = level.to_uppercase();
+        let level = match level.as_str() {
+            "WARN" => "WARN,reqwest=ERROR,rustls=ERROR",
+            "INFO" => "INFO,reqwest=WARN,rustls=WARN",
+            "DEBUG" => "DEBUG,reqwest=INFO,rustls=INFO",
+            "TRACE" => "TRACE,reqwest=DEBUG,rustls=DEBUG",
+            other => other,
+        };
+        let _ = std::env::set_var("RUST_LOG", level);
+    }
+
     env_logger::init();
     match run() {
         Ok(()) => ExitCode::SUCCESS,

crates/tmc-langs-cli/src/main.rs

@@ -21,6 +21,7 @@ reqwest = { version = "0.11.18", default-features = false, features = [
   "multipart",
   "cookies",
 ] }
+schemars = { version = "0.8.8", features = ["uuid1"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 thiserror = "1.0.40"

crates/tmc-mooc-client/Cargo.toml

@@ -21,6 +21,7 @@ use reqwest::{
     },
     Method, StatusCode,
 };
+use schemars::JsonSchema;
 use serde::{de::DeserializeOwned, Serialize};
 use std::{borrow::Cow, path::Path, sync::Arc};
 use tmc_langs_util::{serialize, JsonError};
@@ -61,7 +62,7 @@ impl MoocClient {
     fn request_to_url(&self, method: Method, url: String) -> MoocRequest {
         log::debug!("building a request to {url}");
 
-        let trusted_urls = &["https://courses.mooc.fi/", "http://project-331.local"];
+        let trusted_urls = &["https://courses.mooc.fi/", "http://project-331.local/"];
         let include_bearer_token = trusted_urls.iter().any(|tu| url.starts_with(tu));
         let mut builder = self.0.client.request(method.clone(), url.clone());
         if let Some(token) = self.0.token.as_ref() {
@@ -276,7 +277,7 @@ impl MoocRequest {
     }
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, JsonSchema)]
 #[cfg_attr(feature = "ts-rs", derive(TS))]
 pub struct CourseInstance {
     pub id: Uuid,