Merge pull request #364 from danschultzer/fix-nil-value-bug

Fix bug with nil user id change exception

Author: danschultzer

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 * [`PowPersistentSession.Plug.Cookie`] Now supports `:persistent_session_cookie_opts` to customize any options that will be passed on to `Plug.Conn.put_resp_cookie/4`
 
+### Bug fixes
+
+* [`Pow.Ecto.Schema.Changeset`] Fixed bug where `Pow.Ecto.Schema.Changeset.user_id_field_changeset/3` update with `nil` value caused an exception to be raised
+
 ## v1.0.15 (2019-11-20)
 
 ### Enhancements

lib/pow/ecto/schema/changeset.ex

@@ -45,12 +45,15 @@ defmodule Pow.Ecto.Schema.Changeset do
 
     user_or_changeset
     |> Changeset.cast(params, [user_id_field])
-    |> Changeset.update_change(user_id_field, &Schema.normalize_user_id_field_value/1)
+    |> Changeset.update_change(user_id_field, &maybe_normalize_user_id_field_value/1)
     |> maybe_validate_email_format(user_id_field, config)
     |> Changeset.validate_required([user_id_field])
     |> Changeset.unique_constraint(user_id_field)
   end
 
+  defp maybe_normalize_user_id_field_value(value) when is_binary(value), do: Schema.normalize_user_id_field_value(value)
+  defp maybe_normalize_user_id_field_value(any), do: any
+
   @doc """
   Validates the password field.
 

test/pow/ecto/schema/changeset_test.exs

@@ -26,6 +26,10 @@ defmodule Pow.Ecto.Schema.ChangesetTest do
       refute changeset.valid?
       assert changeset.errors[:email] == {"can't be blank", [validation: :required]}
 
+      changeset = User.changeset(%User{email: "[email protected]"}, %{email: nil})
+      refute changeset.valid?
+      assert changeset.errors[:email] == {"can't be blank", [validation: :required]}
+
       changeset = UsernameUser.changeset(%UsernameUser{}, Map.delete(@valid_params_username, "username"))
       refute changeset.valid?
       assert changeset.errors[:username] == {"can't be blank", [validation: :required]}