Merge branch 'hotfix/delete-activities' into 'develop'

[akkoma] / lib / pleroma / PasswordResetToken.ex

diff --git a/lib/pleroma/PasswordResetToken.ex b/lib/pleroma/PasswordResetToken.ex
index 79e60bf6969b5ff847fe2c7d4cc978dc168fafdd..772c239a1cc3afabed220d60513285219f9f1a3b 100644 (file)
--- a/lib/pleroma/PasswordResetToken.ex
+++ b/lib/pleroma/PasswordResetToken.ex
@@ -1,20 +1,26 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.PasswordResetToken do
   use Ecto.Schema
 
-  import Ecto.{Changeset, Query}
+  import Ecto.Changeset
 
-  alias Pleroma.{User, PasswordResetToken, Repo}
+  alias Pleroma.PasswordResetToken
+  alias Pleroma.Repo
+  alias Pleroma.User
 
   schema "password_reset_tokens" do
-    belongs_to :user, User
-    field :token, :string
-    field :used, :boolean, default: false
+    belongs_to(:user, User, type: Pleroma.FlakeId)
+    field(:token, :string)
+    field(:used, :boolean, default: false)
 
     timestamps()
   end
 
   def create_token(%User{} = user) do
-    token = :crypto.strong_rand_bytes(32) |> Base.url_encode64
+    token = :crypto.strong_rand_bytes(32) |> Base.url_encode64()
 
     token = %PasswordResetToken{
       user_id: user.id,
@@ -26,7 +32,7 @@ defmodule Pleroma.PasswordResetToken do
   end
 
   def used_changeset(struct) do
-    changeset = struct
+    struct
     |> cast(%{}, [])
     |> put_change(:used, true)
   end
@@ -34,7 +40,7 @@ defmodule Pleroma.PasswordResetToken do
   def reset_password(token, data) do
     with %{used: false} = token <- Repo.get_by(PasswordResetToken, %{token: token}),
          %User{} = user <- Repo.get(User, token.user_id),
-         {:ok, user} <- User.reset_password(user, data),
+         {:ok, _user} <- User.reset_password(user, data),
          {:ok, token} <- Repo.update(used_changeset(token)) do
       {:ok, token}
     else