improve invites

lib/lokal_web/controllers/user_registration_controller.ex

@@ -1,14 +1,12 @@
 defmodule LokalWeb.UserRegistrationController do
   use LokalWeb, :controller
   import LokalWeb.Gettext
-  alias Lokal.{Accounts, Invites}
+  alias Lokal.{Accounts, Accounts.Invites}
   alias LokalWeb.{Endpoint, HomeLive}
 
   def new(conn, %{"invite" => invite_token}) do
-    invite = Invites.get_invite_by_token(invite_token)
-
-    if invite do
-      conn |> render_new(invite)
+    if Invites.valid_invite_token?(invite_token) do
+      conn |> render_new(invite_token)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -27,19 +25,17 @@ defmodule LokalWeb.UserRegistrationController do
   end
 
   # renders new user registration page
-  defp render_new(conn, invite \\ nil) do
+  defp render_new(conn, invite_token \\ nil) do
     render(conn, "new.html",
       changeset: Accounts.change_user_registration(),
-      invite: invite,
+      invite_token: invite_token,
       page_title: gettext("Register")
     )
   end
 
   def create(conn, %{"user" => %{"invite_token" => invite_token}} = attrs) do
-    invite = Invites.get_invite_by_token(invite_token)
-
-    if invite do
-      conn |> create_user(attrs, invite)
+    if Invites.valid_invite_token?(invite_token) do
+      conn |> create_user(attrs, invite_token)
     else
       conn
       |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
@@ -57,13 +53,9 @@ defmodule LokalWeb.UserRegistrationController do
     end
   end
 
-  defp create_user(conn, %{"user" => user_params}, invite \\ nil) do
-    case Accounts.register_user(user_params) do
+  defp create_user(conn, %{"user" => user_params}, invite_token \\ nil) do
+    case Accounts.register_user(user_params, invite_token) do
       {:ok, user} ->
-        unless invite |> is_nil() do
-          invite |> Invites.use_invite!()
-        end
-
         Accounts.deliver_user_confirmation_instructions(
           user,
           &Routes.user_confirmation_url(conn, :confirm, &1)
@@ -73,8 +65,13 @@ defmodule LokalWeb.UserRegistrationController do
         |> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
         |> redirect(to: Routes.user_session_path(Endpoint, :new))
 
+      {:error, :invalid_token} ->
+        conn
+        |> put_flash(:error, dgettext("errors", "Sorry, this invite was not found or expired"))
+        |> redirect(to: Routes.live_path(Endpoint, HomeLive))
+
       {:error, %Ecto.Changeset{} = changeset} ->
-        conn |> render("new.html", changeset: changeset, invite: invite)
+        conn |> render("new.html", changeset: changeset, invite_token: invite_token)
     end
   end
 end

lib/lokal_web/live/invite_live/form_component.ex

@@ -1,11 +1,11 @@
 defmodule LokalWeb.InviteLive.FormComponent do
   @moduledoc """
-  Livecomponent that can update or create an Lokal.Invites.Invite
+  Livecomponent that can update or create an Lokal.Accounts.Invite
   """
 
   use LokalWeb, :live_component
   alias Ecto.Changeset
-  alias Lokal.{Accounts.User, Invites, Invites.Invite}
+  alias Lokal.Accounts.{Invite, Invites, User}
   alias Phoenix.LiveView.Socket
 
   @impl true
@@ -13,23 +13,44 @@ defmodule LokalWeb.InviteLive.FormComponent do
           %{:invite => Invite.t(), :current_user => User.t(), optional(any) => any},
           Socket.t()
         ) :: {:ok, Socket.t()}
-  def update(%{invite: invite} = assigns, socket) do
-    {:ok, socket |> assign(assigns) |> assign(:changeset, Invites.change_invite(invite))}
+  def update(%{invite: _invite} = assigns, socket) do
+    {:ok, socket |> assign(assigns) |> assign_changeset(%{})}
   end
 
   @impl true
-  def handle_event(
-        "validate",
-        %{"invite" => invite_params},
-        %{assigns: %{invite: invite}} = socket
-      ) do
-    {:noreply, socket |> assign(:changeset, invite |> Invites.change_invite(invite_params))}
+  def handle_event("validate", %{"invite" => invite_params}, socket) do
+    {:noreply, socket |> assign_changeset(invite_params)}
   end
 
   def handle_event("save", %{"invite" => invite_params}, %{assigns: %{action: action}} = socket) do
     save_invite(socket, action, invite_params)
   end
 
+  defp assign_changeset(
+         %{assigns: %{action: action, current_user: user, invite: invite}} = socket,
+         invite_params
+       ) do
+    changeset_action =
+      case action do
+        :new -> :insert
+        :edit -> :update
+      end
+
+    changeset =
+      case action do
+        :new -> Invite.create_changeset(user, "example_token", invite_params)
+        :edit -> invite |> Invite.update_changeset(invite_params)
+      end
+
+    changeset =
+      case changeset |> Changeset.apply_action(changeset_action) do
+        {:ok, _data} -> changeset
+        {:error, changeset} -> changeset
+      end
+
+    socket |> assign(:changeset, changeset)
+  end
+
   defp save_invite(
          %{assigns: %{current_user: current_user, invite: invite, return_to: return_to}} = socket,
          :edit,
@@ -38,10 +59,8 @@ defmodule LokalWeb.InviteLive.FormComponent do
     socket =
       case invite |> Invites.update_invite(invite_params, current_user) do
         {:ok, %{name: invite_name}} ->
-          prompt =
-            dgettext("prompts", "%{invite_name} updated successfully", invite_name: invite_name)
-
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          prompt = dgettext("prompts", "%{name} updated successfully", name: invite_name)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(:changeset, changeset)
@@ -58,10 +77,8 @@ defmodule LokalWeb.InviteLive.FormComponent do
     socket =
       case current_user |> Invites.create_invite(invite_params) do
         {:ok, %{name: invite_name}} ->
-          prompt =
-            dgettext("prompts", "%{invite_name} created successfully", invite_name: invite_name)
-
-          socket |> put_flash(:info, prompt) |> push_redirect(to: return_to)
+          prompt = dgettext("prompts", "%{name} created successfully", name: invite_name)
+          socket |> put_flash(:info, prompt) |> push_navigate(to: return_to)
 
         {:error, %Changeset{} = changeset} ->
           socket |> assign(changeset: changeset)

lib/lokal_web/live/invite_live/index.ex

@@ -1,11 +1,12 @@
 defmodule LokalWeb.InviteLive.Index do
   @moduledoc """
-  Liveview to show a Lokal.Invites.Invite index
+  Liveview to show a Lokal.Accounts.Invite index
   """
 
   use LokalWeb, :live_view
   import LokalWeb.Components.{InviteCard, UserCard}
-  alias Lokal.{Accounts, Invites, Invites.Invite}
+  alias Lokal.Accounts
+  alias Lokal.Accounts.{Invite, Invites}
   alias LokalWeb.{Endpoint, HomeLive}
   alias Phoenix.LiveView.JS
 

lib/lokal_web/templates/user_registration/new.html.heex

@@ -13,8 +13,8 @@
       <%= dgettext("errors", "Oops, something went wrong! Please check the errors below.") %>
     </p>
 
-    <%= if @invite do %>
-      <%= hidden_input(f, :invite_token, value: @invite.token) %>
+    <%= if @invite_token do %>
+      <%= hidden_input(f, :invite_token, value: @invite_token) %>
     <% end %>
 
     <%= label(f, :email, class: "title text-lg text-primary-600") %>