+
- * Official website: https://www.phoenixframework.org/
- * Guides: https://hexdocs.pm/phoenix/overview.html
- * Docs: https://hexdocs.pm/phoenix
- * Forum: https://elixirforum.com/c/phoenix-forum
- * Source: https://github.com/phoenixframework/phoenix
+Copyright (c) 2023 CeSIUM - Centro de Estudantes de Eng. Informática
+This project is licensed under the MIT License - see the [LICENSE][license]
+file for details.
diff --git a/lib/atomic/accounts.ex b/lib/atomic/accounts.ex
index 6578551c6..549382235 100644
--- a/lib/atomic/accounts.ex
+++ b/lib/atomic/accounts.ex
@@ -24,6 +24,22 @@ defmodule Atomic.Accounts do
Repo.get_by(User, email: email)
end
+ @doc """
+ Gets a user by handle.
+
+ ## Examples
+
+ iex> get_user_by_handle("foo_bar")
+ %User{}
+
+ iex> get_user_by_handle("unknown")
+ nil
+
+ """
+ def get_user_by_handle(handle) when is_binary(handle) do
+ Repo.get_by(User, handle: handle)
+ end
+
@doc """
Gets a user by email and password.
@@ -195,6 +211,19 @@ defmodule Atomic.Accounts do
User.email_changeset(user, attrs)
end
+ @doc """
+ Returns an `%Ecto.Changeset{}` for changing the user handle.
+
+ ## Examples
+
+ iex> change_user_handle(user)
+ %Ecto.Changeset{data: %User{}}
+
+ """
+ def change_user_handle(user, attrs \\ %{}) do
+ User.handle_changeset(user, attrs)
+ end
+
@doc """
Emulates that the email will change without actually changing
it in the database.
diff --git a/lib/atomic/accounts/user.ex b/lib/atomic/accounts/user.ex
index a2ec48297..577d6c9b9 100644
--- a/lib/atomic/accounts/user.ex
+++ b/lib/atomic/accounts/user.ex
@@ -9,7 +9,7 @@ defmodule Atomic.Accounts.User do
alias Atomic.Organizations.{Membership, Organization}
alias Atomic.Uploaders.ProfilePicture
- @required_fields ~w(email password)a
+ @required_fields ~w(email handle password)a
@optional_fields ~w(name role confirmed_at course_id default_organization_id)a
@roles ~w(admin student)a
@@ -17,6 +17,7 @@ defmodule Atomic.Accounts.User do
schema "users" do
field :name, :string
field :email, :string
+ field :handle, :string
field :password, :string, virtual: true, redact: true
field :hashed_password, :string, redact: true
field :confirmed_at, :naive_datetime
@@ -53,6 +54,7 @@ defmodule Atomic.Accounts.User do
user
|> cast(attrs, @required_fields ++ @optional_fields)
|> validate_email()
+ |> validate_handle()
|> validate_password(opts)
end
@@ -79,6 +81,20 @@ defmodule Atomic.Accounts.User do
|> unique_constraint(:email)
end
+ defp validate_handle(changeset) do
+ changeset
+ |> validate_required([:handle])
+ |> validate_format(:handle, ~r/^[a-zA-Z0-9_.]+$/,
+ message:
+ Gettext.gettext(
+ "must only contain alphanumeric characters, numbers, underscores and periods"
+ )
+ )
+ |> validate_length(:handle, min: 3, max: 30)
+ |> unsafe_validate_unique(:handle, Atomic.Repo)
+ |> unique_constraint(:handle)
+ end
+
defp validate_password(changeset, opts) do
changeset
|> validate_required([:password])
@@ -119,6 +135,21 @@ defmodule Atomic.Accounts.User do
end
end
+ @doc """
+ A user changeset for changing the handle.
+
+ It requires the handle to change otherwise an error is added.
+ """
+ def handle_changeset(user, attrs) do
+ user
+ |> cast(attrs, [:handle])
+ |> validate_handle()
+ |> case do
+ %{changes: %{handle: _}} = changeset -> changeset
+ %{} = changeset -> add_error(changeset, :handle, "did not change")
+ end
+ end
+
@doc """
A user changeset for changing the password.
diff --git a/lib/atomic_web/live/membership_live/index.html.heex b/lib/atomic_web/live/membership_live/index.html.heex
index 96955f2a1..e5c3b1785 100644
--- a/lib/atomic_web/live/membership_live/index.html.heex
+++ b/lib/atomic_web/live/membership_live/index.html.heex
@@ -30,7 +30,11 @@
<%= for membership <- @memberships do %>
+
diff --git a/lib/atomic_web/router.ex b/lib/atomic_web/router.ex
index b9993ec15..7188c9cbf 100644
--- a/lib/atomic_web/router.ex
+++ b/lib/atomic_web/router.ex
@@ -36,6 +36,8 @@ defmodule AtomicWeb.Router do
live "/organizations", OrganizationLive.Index, :index
live "/organizations/:organization_id", OrganizationLive.Show, :show
+ live "/profile/:handle", UserLive.Show, :show
+
scope "/organizations/:organization_id" do
live "/board/", BoardLive.Index, :index
live "/board/:id", BoardLive.Show, :show
diff --git a/lib/atomic_web/templates/layout/live.html.heex b/lib/atomic_web/templates/layout/live.html.heex
index bf76b873d..630fec9d3 100644
--- a/lib/atomic_web/templates/layout/live.html.heex
+++ b/lib/atomic_web/templates/layout/live.html.heex
@@ -201,11 +201,14 @@
+
+
+
+
+
+
+
+
+ + <%= @user.name %> +
+@<%= @user.handle %>
+
+
+
+ <%= Atomic.Accounts.extract_initials(@user.name) %>
+
+
+
+ + <%= gettext("Organizations") %> +
+ +
+ <%= for {organization, index} <- Enum.with_index(@organizations) do %>
+ <%= live_redirect to: Routes.organization_show_path(@socket, :show, organization) do %>
+
+ <%= if @is_current_user do %>
+
+
+ <% end %>
+ <% end %>
+
+ <%= if organization.logo do %>
+
+ 
+
+ <% else %>
+
+
+ <%= Atomic.Accounts.extract_initials(organization.name) %>
+
+
+ <% end %>
+
+
+
+ <%= organization.name %>
+
+
+ <%= Atomic.Organizations.get_role(@user.id, organization.id) %>
+
+
+
+ <%= live_patch to: Routes.user_settings_path(@socket, :edit), class: "inline-flex px-6 py-2 text-sm font-medium text-orange-500 bg-white border-2 border-orange-500 rounded-md shadow-sm hover:bg-orange-500 hover:text-white" do %>
+
+ <% end %>
+
- <%= live_redirect to: Routes.activity_index_path(@socket, :index, @current_organization), class: "text-zinc-400 hover:text-zinc-500" do %>
+ <%= live_redirect to: Routes.home_index_path(@socket, :index), class: "text-zinc-400 hover:text-zinc-500" do %>
diff --git a/lib/atomic_web/templates/user_registration/new.html.heex b/lib/atomic_web/templates/user_registration/new.html.heex
index 28e0ee17b..73c5c0923 100644
--- a/lib/atomic_web/templates/user_registration/new.html.heex
+++ b/lib/atomic_web/templates/user_registration/new.html.heex
@@ -17,6 +17,14 @@
) %>
<%= error_tag(f, :email) %>
+ <%= label(f, :handle, class: "sr-only") %>
+ <%= text_input(f, :handle,
+ required: true,
+ placeholder: gettext("Username"),
+ class: "mt-1 relative block lg:w-96 w-full appearance-none rounded border border-zinc-300 px-3 py-2 text-zinc-900 placeholder-zinc-500 focus:z-10 focus:border-indigo-400 focus:outline-none sm:text-sm"
+ ) %>
+ <%= error_tag(f, :handle) %>
+
<%= label(f, :password, class: "sr-only") %>
<%= password_input(f, :password,
required: true,
diff --git a/priv/repo/migrations/20221014155230_create_users_auth_tables.exs b/priv/repo/migrations/20221014155230_create_users_auth_tables.exs
index 4bbc4fc9b..9029cde37 100644
--- a/priv/repo/migrations/20221014155230_create_users_auth_tables.exs
+++ b/priv/repo/migrations/20221014155230_create_users_auth_tables.exs
@@ -8,6 +8,7 @@ defmodule Atomic.Repo.Migrations.CreateUsersAuthTables do
add :id, :binary_id, primary_key: true
add :name, :string
add :email, :citext, null: false
+ add :handle, :citext, null: false
add :hashed_password, :string, null: false
add :confirmed_at, :naive_datetime
add :profile_picture, :string
@@ -20,6 +21,7 @@ defmodule Atomic.Repo.Migrations.CreateUsersAuthTables do
end
create unique_index(:users, [:email])
+ create unique_index(:users, [:handle])
create table(:users_tokens, primary_key: false) do
add :id, :binary_id, primary_key: true
diff --git a/priv/repo/seeds/accounts.exs b/priv/repo/seeds/accounts.exs
index dd6c763db..7e06fd0db 100644
--- a/priv/repo/seeds/accounts.exs
+++ b/priv/repo/seeds/accounts.exs
@@ -111,10 +111,12 @@ defmodule Atomic.Repo.Seeds.Accounts do
for character <- characters do
email = (character |> String.downcase() |> String.replace(~r/\s*/, "")) <> "@mail.pt"
+ handle = character |> String.downcase() |> String.replace(~r/\s/, "_")
user = %{
"name" => character,
"email" => email,
+ "handle" => handle,
"password" => "password1234",
"role" => role,
"course_id" => Enum.random(courses).id,
diff --git a/test/atomic/accounts_test.exs b/test/atomic/accounts_test.exs
index 5ea1c2fe9..b662d1f79 100644
--- a/test/atomic/accounts_test.exs
+++ b/test/atomic/accounts_test.exs
@@ -53,19 +53,27 @@ defmodule Atomic.AccountsTest do
} = errors_on(changeset)
end
- test "validates email and password when given" do
- {:error, changeset} = Accounts.register_user(%{email: "not valid", password: "not valid"})
+ test "validates email, handle and password when given" do
+ {:error, changeset} =
+ Accounts.register_user(%{email: "not valid", handle: "not valid", password: "not valid"})
assert %{
email: ["must have the @ sign and no spaces"],
+ handle: [
+ "must only contain alphanumeric characters, numbers, underscores and periods"
+ ],
password: ["should be at least 12 character(s)"]
} = errors_on(changeset)
end
- test "validates maximum values for email and password for security" do
+ test "validates maximum values for email, handle and password for security" do
too_long = String.duplicate("db", 100)
- {:error, changeset} = Accounts.register_user(%{email: too_long, password: too_long})
+
+ {:error, changeset} =
+ Accounts.register_user(%{email: too_long, handle: too_long, password: too_long})
+
assert "should be at most 160 character(s)" in errors_on(changeset).email
+ assert "should be at most 30 character(s)" in errors_on(changeset).handle
assert "should be at most 72 character(s)" in errors_on(changeset).password
end
@@ -79,11 +87,22 @@ defmodule Atomic.AccountsTest do
assert "has already been taken" in errors_on(changeset).email
end
+ test "validates handle uniqueness" do
+ %{handle: handle} = insert(:user)
+ {:error, changeset} = Accounts.register_user(%{handle: handle})
+ assert "has already been taken" in errors_on(changeset).handle
+
+ # Now try with the upper cased handle too, to check that handle case is ignored.
+ {:error, changeset} = Accounts.register_user(%{handle: String.upcase(handle)})
+ assert "has already been taken" in errors_on(changeset).handle
+ end
+
test "registers users with a hashed password" do
user_attrs = params_for(:user) |> Map.put(:password, valid_user_password())
{:ok, user} = Accounts.register_user(user_attrs)
assert user.email == user_attrs.email
+ assert user.handle == user_attrs.handle
assert is_binary(user.hashed_password)
assert is_nil(user.confirmed_at)
assert is_nil(user.password)
@@ -93,17 +112,18 @@ defmodule Atomic.AccountsTest do
describe "change_user_registration/2" do
test "returns a changeset" do
assert %Ecto.Changeset{} = changeset = Accounts.change_user_registration(%User{})
- assert changeset.required == [:password, :email]
+ assert changeset.required == [:password, :handle, :email]
end
test "allows fields to be set" do
email = Faker.Internet.email()
password = valid_user_password()
+ handle = Faker.Internet.user_name()
changeset =
Accounts.change_user_registration(
%User{},
- params_for(:user, %{email: email, password: password})
+ params_for(:user, %{email: email, handle: handle, password: password})
)
assert changeset.valid?
@@ -120,6 +140,13 @@ defmodule Atomic.AccountsTest do
end
end
+ describe "change_user_handle/2" do
+ test "returns a user changeset" do
+ assert %Ecto.Changeset{} = changeset = Accounts.change_user_handle(%User{})
+ assert changeset.required == [:handle]
+ end
+ end
+
describe "apply_user_email/3" do
setup do
%{user: insert(:user)}
diff --git a/test/support/factories/accounts_factory.ex b/test/support/factories/accounts_factory.ex
index edef51bf5..f53abebc3 100644
--- a/test/support/factories/accounts_factory.ex
+++ b/test/support/factories/accounts_factory.ex
@@ -13,6 +13,7 @@ defmodule Atomic.Factories.AccountFactory do
%User{
name: Faker.Person.name(),
email: Faker.Internet.email(),
+ handle: Faker.Internet.user_name(),
role: Enum.random(@roles),
hashed_password: Bcrypt.hash_pwd_salt("password1234")
}