diff --git a/lib/accounts/accounts.ex b/lib/accounts/accounts.ex index 7bc5073..a96b5ac 100644 --- a/lib/accounts/accounts.ex +++ b/lib/accounts/accounts.ex @@ -21,4 +21,15 @@ defmodule Mv.Accounts do resource Mv.Accounts.Token end + + @doc """ + Register a new user with password using AshAuthentication's standard action. + This creates a user and the notifier will automatically create a member. + """ + def register_with_password(params) do + # Use AshAuthentication's standard register_with_password action + Mv.Accounts.User + |> Ash.Changeset.for_create(:register_with_password, params) + |> Ash.create(domain: __MODULE__) + end end diff --git a/lib/accounts/user.ex b/lib/accounts/user.ex index d8c7a66..6604f91 100644 --- a/lib/accounts/user.ex +++ b/lib/accounts/user.ex @@ -5,7 +5,8 @@ defmodule Mv.Accounts.User do use Ash.Resource, domain: Mv.Accounts, data_layer: AshPostgres.DataLayer, - extensions: [AshAuthentication] + extensions: [AshAuthentication], + notifiers: [Mv.Accounts.User.MemberCreationNotifier] # authorizers: [Ash.Policy.Authorizer] @@ -64,11 +65,16 @@ defmodule Mv.Accounts.User do defaults [:read, :create, :destroy, :update] create :create_user do - accept [:email] + accept [:email, :member_id] + argument :member, :map + change manage_relationship(:member, type: :create) end update :update_user do - accept [:email] + require_atomic? false + accept [:email, :member_id] + argument :member, :map + change manage_relationship(:member, on_match: :update, on_no_match: :create) end # Admin action for direct password changes in admin panel @@ -117,13 +123,30 @@ defmodule Mv.Accounts.User do |> Ash.Changeset.change_attribute(:oidc_id, user_info["sub"] || user_info["id"]) end end + + create :register_with_password do + accept [:email] + argument :password, :string, allow_nil?: false, sensitive?: true + argument :password_confirmation, :string, allow_nil?: false, sensitive?: true + argument :member, :map + change AshAuthentication.Strategy.Password.HashPasswordChange + change AshAuthentication.GenerateTokenChange + change manage_relationship(:member, type: :create) + end end # Global validations - applied to all relevant actions validations do - # Password strength policy: minimum 8 characters for all password-related actions + # Password strength policy: minimum 8 characters + # Note: register_with_password has built-in AshAuthentication validation, but admin_set_password doesn't validate string_length(:password, min: 8) do - where action_is([:register_with_password, :admin_set_password]) + # Only needed for admin actions, AshAuthentication handles register_with_password + where action_is([:admin_set_password]) + end + + # Email uniqueness for registration actions + validate attribute_does_not_equal(:email, nil) do + where action_is([:register_with_password, :register_with_rauthy]) end end @@ -143,6 +166,7 @@ defmodule Mv.Accounts.User do attribute :email, :ci_string, allow_nil?: false, public?: true attribute :hashed_password, :string, sensitive?: true, allow_nil?: true attribute :oidc_id, :string, allow_nil?: true + attribute :admin?, :boolean, allow_nil?: false, default: false, public?: true end relationships do @@ -152,6 +176,7 @@ defmodule Mv.Accounts.User do identities do identity :unique_email, [:email] identity :unique_oidc_id, [:oidc_id] + identity :unique_member_id, [:member_id] end # You can customize this if you wish, but this is a safe default that diff --git a/lib/accounts/user/member_creation_notifier.ex b/lib/accounts/user/member_creation_notifier.ex new file mode 100644 index 0000000..5506775 --- /dev/null +++ b/lib/accounts/user/member_creation_notifier.ex @@ -0,0 +1,71 @@ +defmodule Mv.Accounts.User.MemberCreationNotifier do + @moduledoc """ + Notifier that automatically creates a member for newly registered users. + + This runs after user creation/registration and ensures every user has an associated member. + It's designed to work with AshAuthentication without interfering with LiveView integration. + """ + use Ash.Notifier + + require Logger + + @impl Ash.Notifier + def notify(%Ash.Notifier.Notification{ + action: %{name: action_name}, + resource: Mv.Accounts.User, + data: user + }) + when action_name in [:register_with_password, :register_with_rauthy, :create_user] do + # Only create member if user doesn't already have one + if should_create_member?(user) do + create_member_for_user(user) + end + + :ok + end + + @impl Ash.Notifier + def notify(_), do: :ok + + defp should_create_member?(user) do + # Check if user has a member_id and if that member actually exists + case user.member_id do + nil -> + true + + member_id -> + case Ash.get(Mv.Membership.Member, member_id, domain: Mv.Membership) do + {:ok, _member} -> false + {:error, _} -> true + end + end + end + + defp create_member_for_user(user) do + member_params = %{ + email: to_string(user.email), + first_name: "User", + last_name: "Generated" + } + + case Mv.Membership.create_member(member_params) do + {:ok, member} -> + # Update user with member_id + case Ash.Changeset.for_update(user, :update_user, %{member_id: member.id}) + |> Ash.update(domain: Mv.Accounts) do + {:ok, _updated_user} -> + Logger.info( + "Successfully created and assigned member #{member.id} to user #{user.id}" + ) + + {:error, error} -> + Logger.warning( + "Failed to assign member #{member.id} to user #{user.id}: #{inspect(error)}" + ) + end + + {:error, error} -> + Logger.warning("Failed to create member for user #{user.id}: #{inspect(error)}") + end + end +end diff --git a/lib/membership/member.ex b/lib/membership/member.ex index 583f173..a533292 100644 --- a/lib/membership/member.ex +++ b/lib/membership/member.ex @@ -170,5 +170,6 @@ defmodule Mv.Membership.Member do relationships do has_many :properties, Mv.Membership.Property + has_one :user, Mv.Accounts.User, destination_attribute: :member_id end end diff --git a/lib/membership/membership.ex b/lib/membership/membership.ex index 0c7c14d..afed432 100644 --- a/lib/membership/membership.ex +++ b/lib/membership/membership.ex @@ -10,6 +10,7 @@ defmodule Mv.Membership do resource Mv.Membership.Member do define :create_member, action: :create_member define :list_members, action: :read + define :get_member!, action: :read, get_by: [:id] define :update_member, action: :update_member define :destroy_member, action: :destroy end diff --git a/lib/mv_web/components/layouts.ex b/lib/mv_web/components/layouts.ex index 1495bb1..ef0c990 100644 --- a/lib/mv_web/components/layouts.ex +++ b/lib/mv_web/components/layouts.ex @@ -24,6 +24,7 @@ defmodule MvWeb.Layouts do """ attr :flash, :map, required: true, doc: "the map of flash messages" + attr :current_user, :map, default: nil, doc: "the current user" attr :current_scope, :map, default: nil, @@ -33,7 +34,7 @@ defmodule MvWeb.Layouts do def app(assigns) do ~H""" - <.navbar /> + <.navbar current_user={@current_user} />
{render_slot(@inner_block)} diff --git a/lib/mv_web/components/layouts/navbar.ex b/lib/mv_web/components/layouts/navbar.ex index b917ddc..1a6a7c6 100644 --- a/lib/mv_web/components/layouts/navbar.ex +++ b/lib/mv_web/components/layouts/navbar.ex @@ -5,6 +5,8 @@ defmodule MvWeb.Layouts.Navbar do use Phoenix.Component use Gettext, backend: MvWeb.Gettext + attr :current_user, :map, default: nil + def navbar(assigns) do ~H"""
@@ -65,7 +67,7 @@ defmodule MvWeb.Layouts.Navbar do class="menu menu-sm dropdown-content bg-base-100 rounded-box z-1 mt-3 w-52 p-2 shadow" >
  • - + {gettext("Profil")}
    • diff --git a/lib/mv_web/components/member_form_component.ex b/lib/mv_web/components/member_form_component.ex new file mode 100644 index 0000000..15ac008 --- /dev/null +++ b/lib/mv_web/components/member_form_component.ex @@ -0,0 +1,50 @@ +defmodule MvWeb.MemberFormComponent do + use Phoenix.Component + use Gettext, backend: MvWeb.Gettext + import MvWeb.CoreComponents + + @doc """ + Reusable form for member data (without
    -tag and buttons). + Expects: + - form: Phoenix.HTML.FormField for Member + - property_types: List of PropertyTypes + """ + attr :form, :any, required: true + attr :property_types, :list, required: true + def member_form(assigns) do + ~H""" + <.input field={@form[:first_name]} label={gettext("First Name")} required /> + <.input field={@form[:last_name]} label={gettext("Last Name")} required /> + <.input field={@form[:email]} label={gettext("Email")} required type="email" /> + <.input field={@form[:birth_date]} label={gettext("Birth Date")} type="date" /> + <.input field={@form[:paid]} label={gettext("Paid")} type="checkbox" /> + <.input field={@form[:phone_number]} label={gettext("Phone Number")} /> + <.input field={@form[:join_date]} label={gettext("Join Date")} type="date" /> + <.input field={@form[:exit_date]} label={gettext("Exit Date")} type="date" /> + <.input field={@form[:notes]} label={gettext("Notes")} /> + <.input field={@form[:city]} label={gettext("City")} /> + <.input field={@form[:street]} label={gettext("Street")} /> + <.input field={@form[:house_number]} label={gettext("House Number")} /> + <.input field={@form[:postal_code]} label={gettext("Postal Code")} /> + +

    {gettext("Custom Properties")}

    + <.inputs_for :let={f_property} field={@form[:properties]}> + <% type = Enum.find(@property_types, &(&1.id == f_property[:property_type_id].value)) %> + <.inputs_for :let={value_form} field={f_property[:value]}> + <% input_type = + cond do + type && type.value_type == :boolean -> "checkbox" + type && type.value_type == :date -> :date + true -> "text" + end %> + <.input field={value_form[:value]} label={type && type.name} type={input_type} /> + + + + """ + end +end \ No newline at end of file diff --git a/lib/mv_web/live/member_live/form.ex b/lib/mv_web/live/member_live/form.ex index a526fc3..d8199e2 100644 --- a/lib/mv_web/live/member_live/form.ex +++ b/lib/mv_web/live/member_live/form.ex @@ -4,7 +4,7 @@ defmodule MvWeb.MemberLive.Form do @impl true def render(assigns) do ~H""" - + <.header> {@page_title} <:subtitle> @@ -155,7 +155,7 @@ defmodule MvWeb.MemberLive.Form do AshPhoenix.Form.for_update( member, :update_member, - api: Mv.Membership, + domain: Mv.Membership, as: "member", params: params, forms: [auto?: true] @@ -172,7 +172,7 @@ defmodule MvWeb.MemberLive.Form do AshPhoenix.Form.for_create( Mv.Membership.Member, :create_member, - api: Mv.Membership, + domain: Mv.Membership, as: "member", params: %{"properties" => socket.assigns[:initial_properties]}, forms: [auto?: true] diff --git a/lib/mv_web/live/member_live/index.html.heex b/lib/mv_web/live/member_live/index.html.heex index fc38889..ab117ee 100644 --- a/lib/mv_web/live/member_live/index.html.heex +++ b/lib/mv_web/live/member_live/index.html.heex @@ -1,4 +1,4 @@ - + <.header> {gettext("Members")} <:actions> diff --git a/lib/mv_web/live/member_live/show.ex b/lib/mv_web/live/member_live/show.ex index 304709c..fbf5b4a 100644 --- a/lib/mv_web/live/member_live/show.ex +++ b/lib/mv_web/live/member_live/show.ex @@ -5,7 +5,7 @@ defmodule MvWeb.MemberLive.Show do @impl true def render(assigns) do ~H""" - + <.header> {@member.first_name} {@member.last_name} <:subtitle>{gettext("This is a member record from your database.")} diff --git a/lib/mv_web/live/property_live/form.ex b/lib/mv_web/live/property_live/form.ex index 42814a3..a60a2e4 100644 --- a/lib/mv_web/live/property_live/form.ex +++ b/lib/mv_web/live/property_live/form.ex @@ -4,7 +4,7 @@ defmodule MvWeb.PropertyLive.Form do @impl true def render(assigns) do ~H""" - + <.header> {@page_title} <:subtitle>{gettext("Use this form to manage property records in your database.")} diff --git a/lib/mv_web/live/property_live/index.ex b/lib/mv_web/live/property_live/index.ex index 7e27344..70171ef 100644 --- a/lib/mv_web/live/property_live/index.ex +++ b/lib/mv_web/live/property_live/index.ex @@ -4,7 +4,7 @@ defmodule MvWeb.PropertyLive.Index do @impl true def render(assigns) do ~H""" - + <.header> Listing Properties <:actions> diff --git a/lib/mv_web/live/property_live/show.ex b/lib/mv_web/live/property_live/show.ex index 6d9bb1a..2a1e2ec 100644 --- a/lib/mv_web/live/property_live/show.ex +++ b/lib/mv_web/live/property_live/show.ex @@ -4,7 +4,7 @@ defmodule MvWeb.PropertyLive.Show do @impl true def render(assigns) do ~H""" - + <.header> Property {@property.id} <:subtitle>This is a property record from your database. diff --git a/lib/mv_web/live/property_type_live/form.ex b/lib/mv_web/live/property_type_live/form.ex index 87cac94..8b8b452 100644 --- a/lib/mv_web/live/property_type_live/form.ex +++ b/lib/mv_web/live/property_type_live/form.ex @@ -4,7 +4,7 @@ defmodule MvWeb.PropertyTypeLive.Form do @impl true def render(assigns) do ~H""" - + <.header> {@page_title} <:subtitle> diff --git a/lib/mv_web/live/property_type_live/index.ex b/lib/mv_web/live/property_type_live/index.ex index ed9ff7d..dae4da0 100644 --- a/lib/mv_web/live/property_type_live/index.ex +++ b/lib/mv_web/live/property_type_live/index.ex @@ -4,7 +4,7 @@ defmodule MvWeb.PropertyTypeLive.Index do @impl true def render(assigns) do ~H""" - + <.header> Listing Property types <:actions> diff --git a/lib/mv_web/live/property_type_live/show.ex b/lib/mv_web/live/property_type_live/show.ex index 027baa6..ec2b0bf 100644 --- a/lib/mv_web/live/property_type_live/show.ex +++ b/lib/mv_web/live/property_type_live/show.ex @@ -4,7 +4,7 @@ defmodule MvWeb.PropertyTypeLive.Show do @impl true def render(assigns) do ~H""" - + <.header> Property type {@property_type.id} <:subtitle>This is a property_type record from your database. diff --git a/lib/mv_web/live/user_live/form.ex b/lib/mv_web/live/user_live/form.ex index e77283a..45f145f 100644 --- a/lib/mv_web/live/user_live/form.ex +++ b/lib/mv_web/live/user_live/form.ex @@ -1,10 +1,11 @@ defmodule MvWeb.UserLive.Form do use MvWeb, :live_view + import MvWeb.MemberFormComponent, only: [member_form: 1] @impl true def render(assigns) do ~H""" - + <.header> {@page_title} <:subtitle>{gettext("Use this form to manage user records in your database.")} @@ -13,6 +14,84 @@ defmodule MvWeb.UserLive.Form do <.form for={@form} id="user-form" phx-change="validate" phx-submit="save"> <.input field={@form[:email]} label={gettext("Email")} required type="email" /> + + <%= if !@user || !@user.member do %> +
    +

    {gettext("Member Assignment")}

    + + + + + + <%= if @member_assignment_mode == "assign_existing" do %> +
    + <.input + field={@form[:member_id]} + label={gettext("Select Member")} + type="select" + options={@available_members} + prompt={gettext("Choose a member...")} + /> +
    + <% end %> + + <%= if @member_assignment_mode == "create_new" do %> +
    + <%= if @form[:member] do %> + <.inputs_for :let={f_member} field={@form[:member]}> + <.member_form form={f_member} property_types={@property_types} /> + + <% else %> +

    {gettext("Member form will be available after saving the user.")}

    + <% end %> +
    + <% end %> +
    + <% else %> +
    +

    {gettext("Member Assignment")}

    +

    + {gettext("Edit assigned member")}: {@user.member.first_name} {@user.member.last_name} ({@user.member.email}) +

    + <%= if @member_form do %> +
    + <.form for={@member_form} id="member-form" phx-change="validate_member" phx-submit="save_member"> + <.member_form form={@member_form} property_types={@property_types} /> + <.button type="submit" variant="primary" class="mt-4"> + {gettext("Save Member")} + + +
    + <% end %> +
    + <% end %> +