Merge branch 'master' into exam_mode

Author: iZUMi-kyouka

.credo.exs

@@ -83,7 +83,7 @@
         {Credo.Check.Readability.ModuleNames},
         {Credo.Check.Readability.ParenthesesOnZeroArityDefs},
         {Credo.Check.Readability.ParenthesesInCondition},
-        {Credo.Check.Readability.PredicateFunctionNames},
+        {Credo.Check.Readability.PredicateFunctionNames, exit_status: 0},
         {Credo.Check.Readability.PreferImplicitTry},
         {Credo.Check.Readability.RedundantBlankLines},
         {Credo.Check.Readability.StringSigils},

.github/workflows/ci.yml

@@ -23,11 +23,11 @@ jobs:
     env:
       MIX_ENV: test
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      ELIXIR_VERSION: 1.13.4
-      OTP_VERSION: 25.3.2
+      ELIXIR_VERSION: 1.18.3
+      OTP_VERSION: 27.3.3
     services:
       postgres:
-        image: postgres:14.2
+        image: postgres:17.4
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres

README.md

@@ -14,9 +14,9 @@ Cadet is the web application powering Source Academy.
 
 ### System requirements
 
-1. Elixir 1.13.3+ (current version: 1.13.4)
-2. Erlang/OTP 23.2.1+ (current version: 25.3.2)
-3. PostgreSQL 12+ (tested to be working up to 14.5)
+1. Elixir 1.18+ (current version: 1.18.3)
+2. Erlang/OTP 27+ (current version: 27.3.3)
+3. PostgreSQL 12+ (tested to be working up to 17)
 
 It is probably okay to use a different version of PostgreSQL or Erlang/OTP, but using a different version of Elixir may result in differences in e.g. `mix format`.
 

config/config.exs

@@ -25,7 +25,9 @@ config :cadet, Cadet.Jobs.Scheduler,
     # Compute rolling leaderboard every 2 hours
     {"0 */2 * * *", {Cadet.Assessments, :update_rolling_contest_leaderboards, []}},
     # Collate contest entries that close in the previous day at 00:01
-    {"1 0 * * *", {Cadet.Assessments, :update_final_contest_entries, []}}
+    {"1 0 * * *", {Cadet.Assessments, :update_final_contest_entries, []}},
+    # Clean up expired exchange tokens at 00:01
+    {"1 0 * * *", {Cadet.TokenExchange, :delete_expired, []}}
   ]
 
 # Configures the endpoint

config/dev.secrets.exs.example

@@ -36,6 +36,8 @@ config :cadet,
     #    %{
     #      assertion_extractor: Cadet.Auth.Providers.NusstuAssertionExtractor,
     #      client_redirect_url: "http://cadet.frontend:8000/login/callback"
+    #      vscode_redirect_url_prefix: "vscode://source-academy.source-academy/sso",
+    #      client_post_exchange_redirect_url: "http://cadet.frontend:8000/login/vscode_callback",
     #    }},
 
     "test" =>

lib/cadet/assessments/assessments.ex

@@ -941,7 +941,7 @@ defmodule Cadet.Assessments do
         raw_answer,
         force_submit
       ) do
-    with {:ok, team} <- find_team(question.assessment.id, cr_id),
+    with {:ok, _team} <- find_team(question.assessment.id, cr_id),
          {:ok, submission} <- find_or_create_submission(cr, question.assessment),
          {:status, true} <- {:status, force_submit or submission.status != :submitted},
          {:ok, _answer} <- insert_or_update_answer(submission, question, raw_answer, cr_id) do
@@ -1055,7 +1055,7 @@ defmodule Cadet.Assessments do
 
       # Begin autograding job
       GradingJob.force_grade_individual_submission(updated_submission)
-      update_xp_bonus(submission)
+      update_xp_bonus(updated_submission)
 
       {:ok, nil}
     else
@@ -1294,6 +1294,8 @@ defmodule Cadet.Assessments do
         |> Submission.changeset(%{is_grading_published: true})
         |> Repo.update()
 
+        update_xp_bonus(submission)
+
         Notifications.write_notification_when_published(
           submission.id,
           :published_grading
@@ -1493,23 +1495,18 @@ defmodule Cadet.Assessments do
         Answer
         |> where(submission_id: ^submission_id)
         |> order_by(:question_id)
-        |> group_by([a], a.id)
         |> select([a], %{
-          # grouping by submission, so s.xp_bonus will be the same, but we need an
-          # aggregate function
-          total_xp: sum(a.xp) + sum(a.xp_adjustment)
+          total_xp: a.xp + a.xp_adjustment
         })
 
       total =
         ans_xp
         |> subquery
         |> select([a], %{
-          total_xp: sum(a.total_xp)
+          total_xp: coalesce(sum(a.total_xp), 0)
         })
         |> Repo.one()
 
-      xp = decimal_to_integer(total.total_xp)
-
       cur_time =
         if submission.submitted_at == nil do
           Timex.now()
@@ -1518,7 +1515,7 @@ defmodule Cadet.Assessments do
         end
 
       xp_bonus =
-        if xp <= 0 do
+        if total.total_xp <= 0 do
           0
         else
           if Timex.before?(cur_time, Timex.shift(assessment.open_at, hours: early_hours)) do
@@ -2692,7 +2689,7 @@ defmodule Cadet.Assessments do
 
   def has_last_modified_answer?(
         question = %Question{},
-        cr = %CourseRegistration{id: cr_id},
+        cr = %CourseRegistration{id: _cr_id},
         last_modified_at,
         force_submit
       ) do
@@ -2703,15 +2700,6 @@ defmodule Cadet.Assessments do
     else
       {:status, _} ->
         {:error, {:forbidden, "Assessment submission already finalised"}}
-
-      {:error, :race_condition} ->
-        {:error, {:internal_server_error, "Please try again later."}}
-
-      {:error, :invalid_vote} ->
-        {:error, {:bad_request, "Invalid vote! Vote is not saved."}}
-
-      _ ->
-        {:error, {:bad_request, "Missing or invalid parameter(s)"}}
     end
   end
 

lib/cadet/code_exchange.ex

@@ -0,0 +1,60 @@
+defmodule Cadet.TokenExchange do
+  @moduledoc """
+  The TokenExchange entity stores short-lived codes to be exchanged for long-lived auth tokens.
+  """
+  use Cadet, :model
+
+  import Ecto.Query
+
+  alias Cadet.Repo
+  alias Cadet.Accounts.User
+
+  @primary_key {:code, :string, []}
+  schema "token_exchange" do
+    field(:generated_at, :utc_datetime_usec)
+    field(:expires_at, :utc_datetime_usec)
+
+    belongs_to(:user, User)
+
+    timestamps()
+  end
+
+  @required_fields ~w(code generated_at expires_at user_id)a
+
+  def get_by_code(code) do
+    case Repo.get_by(__MODULE__, code: code) do
+      nil ->
+        {:error, "Not found"}
+
+      struct ->
+        if Timex.before?(struct.expires_at, Timex.now()) do
+          {:error, "Expired"}
+        else
+          struct = Repo.preload(struct, :user)
+          Repo.delete(struct)
+          {:ok, struct}
+        end
+    end
+  end
+
+  def delete_expired do
+    now = Timex.now()
+
+    Repo.delete_all(from(c in __MODULE__, where: c.expires_at < ^now))
+  end
+
+  def changeset(struct, attrs) do
+    struct
+    |> cast(attrs, @required_fields)
+    |> validate_required(@required_fields)
+  end
+
+  def insert(attrs) do
+    changeset =
+      %__MODULE__{}
+      |> changeset(attrs)
+
+    changeset
+    |> Repo.insert()
+  end
+end

lib/cadet/devices/devices.ex

@@ -72,7 +72,11 @@ defmodule Cadet.Devices do
     with {:ok, device} <- maybe_insert_device(type, secret),
          {:ok, registration} <-
            %DeviceRegistration{}
-           |> DeviceRegistration.changeset(%{user_id: user_id, device_id: device.id, title: title})
+           |> DeviceRegistration.changeset(%{
+             user_id: user_id,
+             device_id: device.id,
+             title: title
+           })
            |> Repo.insert() do
       {:ok, registration |> Repo.preload(:device)}
     end

lib/cadet_web/admin_controllers/admin_assets_controller.ex

@@ -22,10 +22,15 @@ defmodule CadetWeb.AdminAssetsController do
 
     case Assets.delete_object(Courses.assets_prefix(course_reg.course), foldername, filename) do
       {:error, {status, message}} -> conn |> put_status(status) |> text(message)
-      _ -> conn |> put_status(204) |> text('')
+      _ -> conn |> put_status(204) |> text("")
     end
   end
 
+  # Ignore the dialyzer warning, just ctrl click the
+  # `Assets.upload_to_s3` function to see the type,
+  # it clearly returns a string URL
+  @dialyzer {:no_match, upload: 2}
+
   def upload(conn, %{
         "upload" => upload_params,
         "filename" => filename,
@@ -96,7 +101,9 @@ defmodule CadetWeb.AdminAssetsController do
     parameters do
       folderName(:path, :string, "Folder name", required: true)
 
-      fileName(:path, :string, "File path in folder, which may contain subfolders", required: true)
+      fileName(:path, :string, "File path in folder, which may contain subfolders",
+        required: true
+      )
     end
 
     security([%{JWT: []}])
@@ -115,7 +122,9 @@ defmodule CadetWeb.AdminAssetsController do
     parameters do
       folderName(:path, :string, "Folder name", required: true)
 
-      fileName(:path, :string, "File path in folder, which may contain subfolders", required: true)
+      fileName(:path, :string, "File path in folder, which may contain subfolders",
+        required: true
+      )
     end
 
     security([%{JWT: []}])

lib/cadet_web/admin_controllers/admin_grading_controller.ex

@@ -378,7 +378,9 @@ defmodule CadetWeb.AdminGradingController do
               required: true
             )
 
-            student(Schema.ref(:StudentInfo), "Student who created the submission", required: true)
+            student(Schema.ref(:StudentInfo), "Student who created the submission",
+              required: true
+            )
 
             unsubmittedBy(Schema.ref(:GraderInfo))
             unsubmittedAt(:string, "Last unsubmitted at", format: "date-time", required: false)