Discord login revised

config/config.exs

@@ -5,7 +5,7 @@
 # is restricted to this project.
 
 # General application configuration
-use Mix.Config
+import Config
 
 config :hammer,
   backend: {Hammer.Backend.ETS, [expiry_ms: 60_000 * 60 * 4, cleanup_interval_ms: 60_000 * 10]}
@@ -53,7 +53,13 @@ config :uro, :pow,
 
 config :uro, :pow_assent,
   user_identities_context: Uro.UserIdentities,
-  providers: []
+  providers: [
+    discord: [
+      client_id: System.get_env("DISCORD_CLIENT_ID", ""),
+      client_secret: System.get_env("DISCORD_CLIENT_SECRET", ""),
+      strategy: Assent.Strategy.Discord
+    ]
+  ]
 
 config :uro, :phoenix_swagger,
   swagger_files: %{

lib/uro/accounts/user.ex

@@ -45,6 +45,12 @@ defmodule Uro.Accounts.User do
     timestamps()
   end
 
+  def user_identity_changeset(user_or_changeset, user_identity, attrs, user_id_attrs) do
+    user_or_changeset
+    |> user_custom_changeset(attrs, true)
+    |> pow_assent_user_identity_changeset(user_identity, attrs, user_id_attrs)
+  end
+
   @spec lock_changeset(Schema.t() | Changeset.t()) :: Changeset.t()
   def lock_changeset(user_or_changeset) do
     changeset = change(user_or_changeset)
@@ -66,18 +72,24 @@ defmodule Uro.Accounts.User do
     end
   end
 
-  @spec user_custom_changeset(Schema.t() | Changeset.t(), Map) :: Changeset.t()
-  def user_custom_changeset(user_or_changeset, attrs) do
+  @spec user_custom_changeset(Schema.t() | Changeset.t(), Map, Boolean) :: Changeset.t()
+  def user_custom_changeset(user_or_changeset, attrs, force_unique_username) do
     user_or_changeset
     |> cast(attrs, [:username, :email_notifications])
     |> validate_required([:username])
     |> put_display_name
     |> downcase_username
+    |> make_username_unique(force_unique_username)
     |> validate_username(:username)
     |> validate_email(:email)
     |> unique_constraint(:username)
   end
 
+  @spec user_custom_changeset(Schema.t() | Changeset.t(), Map) :: Changeset.t()
+  def user_custom_changeset(user_or_changeset, attrs) do
+    user_custom_changeset(user_or_changeset, attrs, false)
+  end
+
   @spec changeset(Schema.t() | Changeset.t(), Map) :: Changeset.t()
   def changeset(user_or_changeset, attrs) do
     user_or_changeset
@@ -105,7 +117,22 @@ defmodule Uro.Accounts.User do
     put_change(changeset, :username, username |> String.downcase())
   end
 
-  def downcase_username(changeset), do: changeset
+  defp make_username_unique(
+         %Ecto.Changeset{valid?: true, changes: %{username: username}} = changeset,
+         make_username_unique
+       ) do
+    if make_username_unique do
+      put_change(
+        changeset,
+        :username,
+        username <> "_" <> UroWeb.Helpers.UsernameStringGen.generate()
+      )
+    else
+      changeset
+    end
+  end
+
+  defp make_username_unique(changeset, make_username_unique), do: changeset
 
   def validate_username(changeset, field) when is_atom(field) do
     validate_change(changeset, field, fn _current_field, value ->

lib/uro_web/helpers/username_string_gen.ex

@@ -0,0 +1,3 @@
+defmodule UroWeb.Helpers.UsernameStringGen do
+  use(Puid, bits: 64)
+end

lib/uro_web/pow/routes.ex

@@ -1,3 +1,15 @@
 defmodule UroWeb.Pow.Routes do
   use Pow.Phoenix.Routes
+  alias UroWeb.Router.Helpers, as: Routes
+
+  def session_path(conn, verb, query_params \\ []),
+    do: Routes.signin_path(conn, verb, query_params)
+
+  def registration_path(conn, verb, query_params \\ []) do
+    if verb == :edit do
+      Routes.profile_path(conn, verb, query_params)
+    else
+      Routes.signup_path(conn, verb, query_params)
+    end
+  end
 end

lib/uro_web/templates/registration/edit.html.eex

@@ -31,6 +31,12 @@
   </div>
   <% end %>
 
+  <span>
+  <%= label f, :linked_services, gettext("Linked services") %>
+  <%= for link <- PowAssent.Phoenix.ViewHelpers.provider_links(@conn),
+    do: content_tag(:div, content_tag(:span, link)) %>
+  </span>
+
   <div>
     <%= submit gettext("Update") %>
   </div>

lib/uro_web/templates/registration/new.html.eex

@@ -35,5 +35,12 @@
   </span>
   </ul>
 
-  <%= submit gettext("Register") %>
+  <div>
+    <%= submit gettext("Register") %>
+  </div>
+
+  <div>
+    <%= for link <- PowAssent.Phoenix.ViewHelpers.provider_links(@conn),
+        do: content_tag(:div, content_tag(:span, link)) %>
+  </div>
 <% end %>

lib/uro_web/templates/session/new.html.eex

@@ -21,5 +21,8 @@
   <div>
     <%= link(gettext("Reset password"), to: Routes.pow_reset_password_reset_password_path(@conn, :new)) %>
   </div>
-  <PowAssent.Phoenix.HTML.CoreComponents.provider_links conn={@conn} />
+  <div>
+    <%= for link <- PowAssent.Phoenix.ViewHelpers.provider_links(@conn),
+        do: content_tag(:div, content_tag(:span, link)) %>
+  </div>
 <% end %>

mix.exs

@@ -60,7 +60,8 @@ defmodule Uro.MixProject do
       {:waffle_ecto, "~> 0.0.10"},
       {:swoosh, "~> 1.3"},
       {:hammer, "~> 6.0"},
-      {:scrivener_ecto, "~> 2.7"}
+      {:scrivener_ecto, "~> 2.7"},
+      {:puid, "~> 1.1"}
     ]
   end