X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fauth%2Fpleroma_authenticator.ex;h=c4a6fce08113b76932c04df6fc116d44f3a747ad;hb=5e2b491276d5cd8d90fddf219f7653d1c9b31ef3;hp=8b190f97f25223338a14004ff99caa506c3f8d6c;hpb=2a95014b9d7142aa2549e70f428293af78fae8eb;p=akkoma

diff --git a/lib/pleroma/web/auth/pleroma_authenticator.ex b/lib/pleroma/web/auth/pleroma_authenticator.ex
index 8b190f97f..c4a6fce08 100644
--- a/lib/pleroma/web/auth/pleroma_authenticator.ex
+++ b/lib/pleroma/web/auth/pleroma_authenticator.ex
@@ -4,23 +4,18 @@
 
 defmodule Pleroma.Web.Auth.PleromaAuthenticator do
   alias Comeonin.Pbkdf2
-  alias Pleroma.User
   alias Pleroma.Registration
   alias Pleroma.Repo
+  alias Pleroma.User
 
-  @behaviour Pleroma.Web.Auth.Authenticator
-
-  def get_user(%Plug.Conn{} = _conn, params) do
-    {name, password} =
-      case params do
-        %{"authorization" => %{"name" => name, "password" => password}} ->
-          {name, password}
+  import Pleroma.Web.Auth.Authenticator,
+    only: [fetch_credentials: 1, fetch_user: 1]
 
-        %{"grant_type" => "password", "username" => name, "password" => password} ->
-          {name, password}
-      end
+  @behaviour Pleroma.Web.Auth.Authenticator
 
-    with {_, %User{} = user} <- {:user, User.get_by_nickname_or_email(name)},
+  def get_user(%Plug.Conn{} = conn) do
+    with {:ok, {name, password}} <- fetch_credentials(conn),
+         {_, %User{} = user} <- {:user, fetch_user(name)},
          {_, true} <- {:checkpw, Pbkdf2.checkpw(password, user.password_hash)} do
       {:ok, user}
     else
@@ -29,10 +24,9 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticator do
     end
   end
 
-  def get_registration(
-        %Plug.Conn{assigns: %{ueberauth_auth: %{provider: provider, uid: uid} = auth}},
-        _params
-      ) do
+  def get_registration(%Plug.Conn{
+        assigns: %{ueberauth_auth: %{provider: provider, uid: uid} = auth}
+      }) do
     registration = Registration.get_by_provider_uid(provider, uid)
 
     if registration do
@@ -40,7 +34,8 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticator do
     else
       info = auth.info
 
-      Registration.changeset(%Registration{}, %{
+      %Registration{}
+      |> Registration.changeset(%{
         provider: to_string(provider),
         uid: to_string(uid),
         info: %{
@@ -54,13 +49,16 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticator do
     end
   end
 
-  def get_registration(%Plug.Conn{} = _conn, _params), do: {:error, :missing_credentials}
+  def get_registration(%Plug.Conn{} = _conn), do: {:error, :missing_credentials}
 
-  def create_from_registration(_conn, params, registration) do
-    nickname = value([params["nickname"], Registration.nickname(registration)])
-    email = value([params["email"], Registration.email(registration)])
-    name = value([params["name"], Registration.name(registration)]) || nickname
-    bio = value([params["bio"], Registration.description(registration)])
+  def create_from_registration(
+        %Plug.Conn{params: %{"authorization" => registration_attrs}},
+        registration
+      ) do
+    nickname = value([registration_attrs["nickname"], Registration.nickname(registration)])
+    email = value([registration_attrs["email"], Registration.email(registration)])
+    name = value([registration_attrs["name"], Registration.name(registration)]) || nickname
+    bio = value([registration_attrs["bio"], Registration.description(registration)])
 
     random_password = :crypto.strong_rand_bytes(64) |> Base.encode64()
 
@@ -76,7 +74,7 @@ defmodule Pleroma.Web.Auth.PleromaAuthenticator do
                password_confirmation: random_password
              },
              external: true,
-             confirmed: true
+             need_confirmation: false
            )
            |> Repo.insert(),
          {:ok, _} <-