improve invites, record usage

lib/memex_web/controllers/user_registration_controller.ex

@@ -1,14 +1,12 @@
 defmodule MemexWeb.UserRegistrationController do
   use MemexWeb, :controller
   import MemexWeb.Gettext
-  alias Memex.{Accounts, Invites}
-  alias MemexWeb.HomeLive
+  alias Memex.{Accounts, Accounts.Invites}
+  alias MemexWeb.{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 MemexWeb.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,24 +53,25 @@ defmodule MemexWeb.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)
         )
 
         conn
-        |> put_flash(:info, dgettext("prompts", "Please check your email to verify your account"))
+        |> 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/memex_web/controllers/user_settings_controller.ex

@@ -7,7 +7,7 @@ defmodule MemexWeb.UserSettingsController do
   plug :assign_email_and_password_changesets
 
   def edit(conn, _params) do
-    render(conn, "edit.html", page_title: gettext("Settings"))
+    render(conn, "edit.html", page_title: gettext("settings"))
   end
 
   def update(%{assigns: %{current_user: user}} = conn, %{
@@ -28,7 +28,7 @@ defmodule MemexWeb.UserSettingsController do
           :info,
           dgettext(
             "prompts",
-            "A link to confirm your email change has been sent to the new address."
+            "a link to confirm your email change has been sent to the new address."
           )
         )
         |> redirect(to: Routes.user_settings_path(conn, :edit))
@@ -46,7 +46,7 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_password(user, password, user_params) do
       {:ok, user} ->
         conn
-        |> put_flash(:info, dgettext("prompts", "Password updated successfully."))
+        |> put_flash(:info, dgettext("prompts", "password updated successfully."))
         |> put_session(:user_return_to, Routes.user_settings_path(conn, :edit))
         |> UserAuth.log_in_user(user)
 
@@ -74,14 +74,14 @@ defmodule MemexWeb.UserSettingsController do
     case Accounts.update_user_email(user, token) do
       :ok ->
         conn
-        |> put_flash(:info, dgettext("prompts", "Email changed successfully."))
+        |> put_flash(:info, dgettext("prompts", "email changed successfully."))
         |> redirect(to: Routes.user_settings_path(conn, :edit))
 
       :error ->
         conn
         |> put_flash(
           :error,
-          dgettext("errors", "Email change link is invalid or it has expired.")
+          dgettext("errors", "email change link is invalid or it has expired.")
         )
         |> redirect(to: Routes.user_settings_path(conn, :edit))
     end
@@ -92,11 +92,11 @@ defmodule MemexWeb.UserSettingsController do
       current_user |> Accounts.delete_user!(current_user)
 
       conn
-      |> put_flash(:error, dgettext("prompts", "Your account has been deleted"))
+      |> put_flash(:error, dgettext("prompts", "your account has been deleted"))
       |> redirect(to: Routes.live_path(conn, HomeLive))
     else
       conn
-      |> put_flash(:error, dgettext("errors", "Unable to delete user"))
+      |> put_flash(:error, dgettext("errors", "unable to delete user"))
       |> redirect(to: Routes.user_settings_path(conn, :edit))
     end
   end