Fix tests for task comment

Author: vtm9

services/app/apps/codebattle/lib/codebattle/task.ex

@@ -123,7 +123,6 @@ defmodule Codebattle.Task do
           asserts: params.asserts,
           asserts_examples: Map.get(params, :asserts_examples, []),
           comment: Map.get(params, :comment),
-          conflict: params.conflict,
           creator_id: params[:creator_id],
           description_en: params.description_en,
           description_ru: params.description_ru,

services/app/apps/codebattle/lib/codebattle/user.ex

@@ -2,6 +2,7 @@ defmodule Codebattle.User do
   @moduledoc """
     Represents authenticatable user
   """
+
   use Ecto.Schema
 
   import Ecto.Changeset
@@ -63,6 +64,7 @@ defmodule Codebattle.User do
     field(:is_bot, :boolean, default: false)
     field(:lang, :string, default: "js")
     field(:name, :string)
+    field(:password_hash, :string)
     field(:public_id, :binary_id)
     field(:rank, :integer, default: 5432)
     field(:rating, :integer, default: 1200)
@@ -199,6 +201,38 @@ defmodule Codebattle.User do
     |> Repo.update()
   end
 
+  def authenticate(name, password) do
+    __MODULE__
+    |> Repo.get_by(name: name)
+    |> case do
+      nil -> nil
+      user -> verify_password(user, password)
+    end
+  end
+
+  defp verify_password(_user, nil), do: nil
+
+  defp verify_password(user, password) do
+    if Bcrypt.verify_pass(password, user.password_hash) do
+      user
+    else
+      nil
+    end
+  end
+
+  def create_password_hash_by_id(user_id, password) do
+    user_id
+    |> get!()
+    |> create_password_hash(password)
+  end
+
+  def create_password_hash(user, password) do
+    hashed_password = Bcrypt.hash_pwd_salt(password)
+
+    from(u in __MODULE__, where: u.id == ^user.id)
+    |> Repo.update_all(set: [password_hash: hashed_password])
+  end
+
   def subscription_types, do: @subscription_types
 
   defp assign_clan(changeset, %{:clan => clan}, _user_id) when clan in ["", nil], do: changeset

services/app/apps/codebattle/lib/codebattle_web/controllers/session_controller.ex

@@ -1,22 +1,47 @@
 defmodule CodebattleWeb.SessionController do
   use CodebattleWeb, :controller
 
+  alias Codebattle.User
+
   def new(conn, _params) do
-    if Application.get_env(:codebattle, :use_only_token_auth) do
-      render(conn, "token_only.html")
-    else
-      render(conn, "index.html")
+    cond do
+      Application.get_env(:codebattle, :use_only_token_auth) ->
+        render(conn, "token_only.html")
+
+      Application.get_env(:codebattle, :use_local_password_auth) || true ->
+        render(conn, "local_password.html")
+
+      :default ->
+        render(conn, "index.html")
     end
   end
 
-  def remind_password(conn, _params) do
-    render(conn, "index.html")
+  def create(conn, %{"session" => %{"name" => name, "password" => password}})
+      when is_binary(name) and is_binary(password) do
+    case User.authenticate(name, password) do
+      nil ->
+        conn
+        |> put_flash(:danger, gettext("Invalid name or password"))
+        |> redirect(to: "/session/new")
+
+      user ->
+        conn
+        |> put_flash(:info, gettext("Welcome to Codebattle!"))
+        |> put_session(:user_id, user.id)
+        |> redirect(to: "/")
+    end
   end
 
+  def create(conn, _params), do: render(conn, "index.html")
+
   def delete(conn, _params) do
     conn
     |> put_flash(:info, gettext("You have been logged out!"))
     |> configure_session(drop: true)
     |> redirect(to: "/")
   end
+
+  def remind_password(conn, _params) do
+    render(conn, "index.html")
+  end
 end

services/app/apps/codebattle/lib/codebattle_web/router.ex

@@ -149,7 +149,7 @@ defmodule CodebattleWeb.Router do
 
     get("/", RootController, :index)
 
-    resources("/session", SessionController, singleton: true, only: [:delete, :new])
+    resources("/session", SessionController, singleton: true, only: [:delete, :new, :create])
     get("/remind_password", SessionController, :remind_password)
 
     resources("/tournaments", TournamentController, only: [:index, :show])

services/app/apps/codebattle/lib/codebattle_web/templates/session/local_password.html.heex

@@ -0,0 +1,15 @@
+<div class="container d-flex align-items-center justify-content-center vh-100">
+  <%= form_for @conn, Routes.session_path(@conn, :create), [as: :session], fn f -> %>
+    <div class="mb-3">
+      <%= label(f, :name, "Name", class: "form-label") %>
+      <%= text_input(f, :name, class: "form-control", placeholder: "Enter your name") %>
+    </div>
+    <div class="mb-3">
+      <%= label(f, :password, "Password", class: "form-label") %>
+      <%= password_input(f, :password, class: "form-control", placeholder: "Enter your password") %>
+    </div>
+    <div>
+      <%= submit("Log in", class: "btn btn-primary") %>
+    </div>
+  <% end %>
+</div>

services/app/apps/codebattle/mix.exs

@@ -41,16 +41,23 @@ defmodule Codebattle.MixProject do
     [
       {:runner, in_umbrella: true, runtime: false},
       {:phoenix_gon, in_umbrella: true},
+      {:bandit, "~> 1.0"},
+      {:bcrypt_elixir, "~> 2.0"},
       {:cowboy, "~> 2.8"},
       {:delta, github: "slab/delta-elixir"},
       {:diff_match_patch, github: "vtm9/diff_match_patch", override: true},
       {:earmark, "~> 1.4"},
       {:ecto_psql_extras, "~> 0.2"},
       {:ecto_sql, "~> 3.6"},
       {:envy, "~> 1.1.1"},
+      {:exfake, "~> 1.0.0"},
+      {:finch, "~> 0.16"},
+      {:fun_with_flags, "~> 1.11"},
+      {:fun_with_flags_ui, "~> 1.0"},
       {:gettext, "~> 0.18"},
       {:html_to_image, github: "vtm9/html_to_image"},
       {:jason, "~> 1.2"},
+      {:nimble_csv, "~> 1.1"},
       {:phoenix, "~> 1.7"},
       {:phoenix_client, github: "vtm9/phoenix_client"},
       {:phoenix_ecto, "~> 4.4"},
@@ -62,21 +69,15 @@ defmodule Codebattle.MixProject do
       {:plug, "~> 1.14"},
       {:plug_cowboy, "~> 2.7"},
       {:postgrex, ">= 0.0.0"},
+      {:recon, "~> 2.5"},
+      {:req, "~> 0.5.0"},
       {:sentry, "~> 10.0"},
+      {:statistics, "~> 0.6"},
       {:telemetry_metrics, "~> 0.6"},
       {:telemetry_poller, "~> 1.0"},
-      {:req, "~> 0.5.0"},
-      {:finch, "~> 0.16"},
       {:timex, "~> 3.6"},
       {:typed_struct, "~> 0.3"},
       {:yaml_elixir, "~> 2.4"},
-      {:exfake, "~> 1.0.0"},
-      {:fun_with_flags, "~> 1.11"},
-      {:fun_with_flags_ui, "~> 1.0"},
-      {:recon, "~> 2.5"},
-      {:bandit, "~> 1.0"},
-      {:statistics, "~> 0.6"},
-      {:nimble_csv, "~> 1.1"},
 
       # dev_and_test
       {:credo, "~> 1.6", only: [:dev, :test], runtime: false},

services/app/apps/codebattle/priv/gettext/ru/LC_MESSAGES/default.po

@@ -122,6 +122,14 @@ msgstr "%{index}) имя: %{name}, рейтинг: %{rating}"
 msgid "You have been logged out!"
 msgstr "Вы успешно вышли из системы!"
 
+#: lib/codebattle_web/controllers/session_controller.ex:29
+msgid "Welcome to Codebattle!"
+msgstr  "Добро пожаловать в Codebattle!"
+
+#: lib/codebattle_web/controllers/session_controller.ex:24
+msgid "Invalid name or password"
+msgstr  "Неверное имя пользователя или пароль"
+
 #: lib/codebattle_web/controllers/auth_controller.ex:15
 msgid "Failed to authenticate."
 msgstr "Ошибка аутентификации."

services/app/apps/codebattle/priv/repo/migrations/20250216225721_add_password_hash_to_users.exs

@@ -0,0 +1,9 @@
+defmodule Codebattle.Repo.Migrations.AddPasswordHashToUsers do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      add(:password_hash, :text)
+    end
+  end
+end

services/app/apps/codebattle/test/codebattle/bot/playbook_store_test.exs

@@ -128,7 +128,7 @@ defmodule Codebattle.PlaybookStoreTest do
                    check_result: %{output: "", result: ""},
                    editor_lang: "js",
                    editor_text:
-                     "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n\nmodule.exports = solution;",
+                     "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n// use stdout to debug\n\nmodule.exports = solution;",
                    id: ^user2_id,
                    name: "second",
                    record_id: 1,
@@ -140,7 +140,7 @@ defmodule Codebattle.PlaybookStoreTest do
                    check_result: %{output: "", result: ""},
                    editor_lang: "js",
                    editor_text:
-                     "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n\nmodule.exports = solution;",
+                     "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n// use stdout to debug\n\nmodule.exports = solution;",
                    id: ^user1_id,
                    name: "first",
                    record_id: 0,
@@ -150,14 +150,14 @@ defmodule Codebattle.PlaybookStoreTest do
                    check_result: %{output: "", result: ""},
                    editor_lang: "js",
                    editor_text:
-                     "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n\nmodule.exports = solution;",
+                     "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n// use stdout to debug\n\nmodule.exports = solution;",
                    id: ^user2_id,
                    name: "second",
                    record_id: 1,
                    type: "init"
                  },
                  %{
-                   diff: %{delta: [%{delete: 130}, %{insert: "t"}]},
+                   diff: %{delta: [%{delete: 153}, %{insert: "t"}]},
                    id: ^user1_id,
                    record_id: 2,
                    type: "update_editor_data"

services/app/apps/codebattle/test/codebattle_web/integration/game/rematch_test.exs

@@ -42,7 +42,7 @@ defmodule CodebattleWeb.Integration.Game.RematchTest do
     {:ok, _response, socket2} = subscribe_and_join(socket2, GameChannel, game_topic)
 
     editor_text_init =
-      "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n\nmodule.exports = solution;"
+      "const _ = require(\"lodash\");\nconst R = require(\"rambda\");\n\nconst solution = (a, b) => {\n  return 0;\n};\n// use stdout to debug\n\nmodule.exports = solution;"
 
     game = Game.Context.get_game!(game_id)
     assert game.state == "playing"