X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fauthentication_plug.ex;h=86a514541025083c33adec55dda58bb48d0c29f6;hb=bf9d3d4abaecc4e842c38866f039ebd8f5f96948;hp=4794e625a566b3703b54e97e1747fba476fb9304;hpb=d2099c849d355a9b8d3b1f2e0342dfe3c7e3497c;p=akkoma diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex index 4794e625a..86a514541 100644 --- a/lib/pleroma/plugs/authentication_plug.ex +++ b/lib/pleroma/plugs/authentication_plug.ex @@ -14,8 +14,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do {:ok, user} <- opts[:fetcher].(username), false <- !!user.info["deactivated"], saved_user_id <- get_session(conn, :user_id), - {:ok, verified_user} <- verify(user, password, saved_user_id) - do + {:ok, verified_user} <- verify(user, password, saved_user_id) do conn |> assign(:user, verified_user) |> put_session(:user_id, verified_user.id) @@ -30,7 +29,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do end defp verify(nil, _password, _user_id) do - Pbkdf2.dummy_checkpw + Pbkdf2.dummy_checkpw() :error end @@ -45,8 +44,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do defp decode_header(conn) do with ["Basic " <> header] <- get_req_header(conn, "authorization"), {:ok, userinfo} <- Base.decode64(header), - [username, password] <- String.split(userinfo, ":", parts: 2) - do + [username, password] <- String.split(userinfo, ":", parts: 2) do {:ok, username, password} end end