feat(api): add v2.0 session-based “_s” endpoints (token routes kept for CLI)

Update supported_versions so:
 - legacy token routes are valid Upto v2.0
 - new session routes are valid Since v2.0

Clients ≥ 2.0 negotiate the new API; CLI clients continue to work.

Front-end now uses only the “_s” routes.

Author: MNassimM

src/app/learnocaml_common.ml

@@ -472,7 +472,7 @@ let get_state_as_save_file ?(include_reports = false) () =
   }
 
 let rec sync_save session save_file on_sync =
-  Server_caller.request (Learnocaml_api.Update_save (session, save_file))
+  Server_caller.request (Learnocaml_api.Update_save_s (session, save_file))
   >>= function
   | Ok save ->
      set_state_from_save_file ~session save;
@@ -937,7 +937,7 @@ module Editor_button (E : Editor_info) = struct
     let rec fetch_draft_solution sess () =
       match sess with
       | session ->
-         Server_caller.request (Learnocaml_api.Fetch_save session) >>= function
+         Server_caller.request (Learnocaml_api.Fetch_save_s session) >>= function
          | Ok save ->
             set_state_from_save_file ~session save;
             Lwt.return_some (save.Save.nickname)
@@ -1174,7 +1174,7 @@ let get_session ?(has_server = true) () =
       let token = Token.parse (input_tok) in
       Server_caller.request (Learnocaml_api.Login token) >>= function
       | Ok session ->
-         (Server_caller.request (Learnocaml_api.Fetch_save session)
+         (Server_caller.request (Learnocaml_api.Fetch_save_s session)
           >>= function
           | Ok save ->
              set_state_from_save_file ~session save;
@@ -1263,7 +1263,7 @@ module Display_exercise =
 
     let get_skill_index session =
       let index = lazy (
-                      retrieve (Learnocaml_api.Exercise_index (Some session))
+                      retrieve (Learnocaml_api.Exercise_index_s (Some session))
     >|= fun (index, _) ->
                       Exercise.Index.fold_exercises (fun (req, focus) id meta ->
                           let add sk id map =
@@ -1381,7 +1381,7 @@ module Display_exercise =
         | [] -> None
         | [author] -> Some (display_authors [%i "Author:"] [author])
         | authors -> Some (display_authors [%i "Authors:"] authors) in
-      retrieve (Learnocaml_api.Exercise_index session)
+      retrieve (Learnocaml_api.Exercise_index_s session)
       >|= fun (index, _) ->
       let req_map, focus_map = extract_maps_exo_index index in
       let focus =

src/app/learnocaml_description_main.ml

@@ -63,7 +63,7 @@ let () =
      match get_encoded_session () with
      | Some { arg_name = _; raw_arg = _; session } -> begin
          let exercise_fetch =
-           retrieve (Learnocaml_api.Exercise (Some session, id, true))
+           retrieve (Learnocaml_api.Exercise_s (Some session, id, true))
          in
          init_tabs ();
          exercise_fetch >>= fun (ex_meta, exo, _deadline) ->

src/app/learnocaml_exercise_main.ml

@@ -119,7 +119,7 @@ let () =
     Js.string (id ^ " - " ^ "Learn OCaml" ^" v."^ Learnocaml_api.version);
   let exercise_fetch =
     session >>= fun session ->
-    retrieve (Learnocaml_api.Exercise (session, id, true))
+    retrieve (Learnocaml_api.Exercise_s (session, id, true))
   in
   let after_init top =
     exercise_fetch >>= fun (_meta, exo, _deadline) ->

src/app/learnocaml_index_main.ml

@@ -175,7 +175,7 @@ let exercises_tab session: tab_handler =
     let open Tyxml_js.Html5 in
     show_loading  [%i"Loading exercises"] @@ fun () ->
     Lwt_js.sleep 0.5 >>= fun () ->
-    retrieve (Learnocaml_api.Exercise_index session)
+    retrieve (Learnocaml_api.Exercise_index_s session)
     >>= fun (index, deadlines) ->
     let exercises_to_display_signal =
       make_exercises_to_display_signal index
@@ -741,7 +741,7 @@ let init_token_dialog () =
        | Ok session ->
           Learnocaml_local_storage.(store sync_session) session;
           Learnocaml_local_storage.(store is_teacher) (Token.is_teacher token);
-          Server_caller.request (Learnocaml_api.Fetch_save session)
+          Server_caller.request (Learnocaml_api.Fetch_save_s session)
           >>= (function
                | Ok save ->
                   set_state_from_save_file ~session:session save;
@@ -981,7 +981,7 @@ let () =
   let logout_dialog () =
     fetch_token () >>= fun token ->
     Server_caller.request
-      (Learnocaml_api.Update_save
+      (Learnocaml_api.Update_save_s
          (get_stored_session (), get_state_as_save_file ()))
     >|= (function
         | Ok _ ->

src/app/learnocaml_partition_view.ml

@@ -235,7 +235,7 @@ let main () =
     | None -> true
     | Some (tok,_) ->
        Lwt.async (fun () ->
-           retrieve (Learnocaml_api.Fetch_save session)
+           retrieve (Learnocaml_api.Fetch_save_s session)
            >|= fun save ->
            match SMap.find_opt exercise_id save.Save.all_exercise_states with
            | None -> ()
@@ -251,15 +251,15 @@ let main () =
       else true in
 
   let fetch_students =
-    retrieve (Learnocaml_api.Students_list session)
+    retrieve (Learnocaml_api.Students_list_s session)
     >|= fun students ->
     let map =
       List.fold_left (fun res st -> Token.Map.add st.Student.token st res)
         Token.Map.empty students in
     students_map := map in
 
   let fetch_part =
-    retrieve (Learnocaml_api.Partition (session, exercise_id, fun_id, prof))
+    retrieve (Learnocaml_api.Partition_s (session, exercise_id, fun_id, prof))
     >|= fun part ->
     partition := Some part in
 

src/app/learnocaml_student_view.ml

@@ -349,9 +349,9 @@ let stats_tab assignments answers =
   ]
 
 let init_exercises_and_stats_tabs student_token session answers =
-  retrieve (Learnocaml_api.Exercise_index (Some session))
+  retrieve (Learnocaml_api.Exercise_index_s (Some session))
   >>= fun (index, _) ->
-  retrieve (Learnocaml_api.Exercise_status_index session)
+  retrieve (Learnocaml_api.Exercise_status_index_s session)
   >>= fun status ->
   let assignments = gather_assignments student_token index status in
   Manip.replaceChildren El.Tabs.(stats.tab) (stats_tab assignments answers);
@@ -504,7 +504,7 @@ let () =
   init_draft_tab ();
   Manip.setInnerText El.token
     ([%i"Status of student: "] ^ Token.to_string student_token);
-  retrieve (Learnocaml_api.Fetch_save session)
+  retrieve (Learnocaml_api.Fetch_save_s session)
   >>= fun save ->
   Manip.setInnerText El.nickname save.Save.nickname;
   init_exercises_and_stats_tabs
@@ -516,7 +516,7 @@ let () =
     | None -> ()
     | Some ex_id ->
         Lwt.async @@ fun () ->
-        retrieve (Learnocaml_api.Exercise (Some session, ex_id, true))
+        retrieve (Learnocaml_api.Exercise_s (Some session, ex_id, true))
         >>= fun (meta, exo, _) ->
         clear_tabs ();
         let ans = SMap.find_opt ex_id save.Save.all_exercise_states in

src/app/learnocaml_teacher_tab.ml

@@ -101,7 +101,7 @@ let rec teacher_tab session _select _params () =
       | "" -> None
       | s -> Some s
     in
-    retrieve (Learnocaml_api.Create_teacher_token (session, nick))
+    retrieve (Learnocaml_api.Create_teacher_token_s (session, nick))
     >|= fun new_token ->
     alert ~title:[%i"TEACHER TOKEN"]
       (Printf.sprintf [%if"New teacher token created:\n%s\n\n\
@@ -217,7 +217,7 @@ let rec teacher_tab session _select _params () =
       Seq.filter_map (function `Token tk -> Some tk | `Any -> None) |>
       List.of_seq
     in
-    retrieve (Learnocaml_api.Students_csv (session, exercises, students))
+    retrieve (Learnocaml_api.Students_csv_s (session, exercises, students))
     >|= fun csv ->
     Learnocaml_common.fake_download
       ~name:"learnocaml.csv"
@@ -946,11 +946,11 @@ let rec teacher_tab session _select _params () =
     in
     (if changes = [] then Lwt.return () else
        retrieve
-         (Learnocaml_api.Set_exercise_status (session, changes)))
+         (Learnocaml_api.Set_exercise_status_s (session, changes)))
     >>= fun () ->
     (if students_changes = [] then Lwt.return () else
        retrieve
-         (Learnocaml_api.Set_students_list (session, students_changes)))
+         (Learnocaml_api.Set_students_list_s (session, students_changes)))
     >>= fun () ->
     (* Reload the full tab: a bit more costly, but safer & simpler *)
     teacher_tab session _select _params () >|=
@@ -1333,12 +1333,12 @@ let rec teacher_tab session _select _params () =
     ]
   in
   let fetch_exercises =
-    retrieve (Learnocaml_api.Exercise_index (Some session))
+    retrieve (Learnocaml_api.Exercise_index_s (Some session))
     >|= fun (index, _) ->
     exercises_index := index
   in
   let fetch_stats =
-    retrieve (Learnocaml_api.Exercise_status_index session)
+    retrieve (Learnocaml_api.Exercise_status_index_s session)
     >|= fun statuses ->
     let map =
       List.fold_left (fun m ex -> SMap.add ex.ES.id ex m)
@@ -1347,7 +1347,7 @@ let rec teacher_tab session _select _params () =
     status_map := map
   in
   let fetch_students =
-    retrieve (Learnocaml_api.Students_list session)
+    retrieve (Learnocaml_api.Students_list_s session)
     >|= fun students ->
     students_map :=
       List.fold_left (fun m st -> Token.Map.add st.Student.token st m)

src/app/server_caller.ml

@@ -115,7 +115,7 @@ let fetch_lesson id =
   request_exn (Learnocaml_api.Lesson id)
 
 let fetch_exercise session id js =
-  request_exn (Learnocaml_api.Exercise (session,id,js))
+  request_exn (Learnocaml_api.Exercise_s (session,id,js))
 
 let fetch_tutorial_index () =
   request_exn (Learnocaml_api.Tutorial_index ())