Merge pull request #119 from mikrofusion/master

uuid support for reset password
trenpixster · Jan 31, 2017 · fdc16a7 · fdc16a7
2 parents d4abf5d + 67d8199
commit fdc16a7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/lib/addict/interactors/reset_password.ex b/lib/addict/interactors/reset_password.ex
@@ -36,7 +36,13 @@ defmodule Addict.Interactors.ResetPassword do
 
   defp parse_token(token) do
     [generation_time, user_id] = Base.decode16!(token) |> String.split(",")
-    {:ok, String.to_integer(generation_time), String.to_integer(user_id)}
+
+    id = case is_integer(user_id) do
+      true -> String.to_integer(user_id)
+      false -> user_id
+    end
+
+    {:ok, String.to_integer(generation_time), String.to_integer(id)}
   end
 
   defp validate_generation_time(generation_time) do