X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Foauth_plug.ex;h=630f15eec8e837af098a153bfff666567fd611ee;hb=9938fa3293478e0dfe5f8d82c1526e0cd3747cf1;hp=be737dc9a22e7738893fee460879db7bf6262bba;hpb=30e9b22f96f2bf1cd895e993190f40afba159bb6;p=akkoma diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex index be737dc9a..630f15eec 100644 --- a/lib/pleroma/plugs/oauth_plug.ex +++ b/lib/pleroma/plugs/oauth_plug.ex @@ -9,15 +9,18 @@ defmodule Pleroma.Plugs.OAuthPlug do end def call(%{assigns: %{user: %User{}}} = conn, _), do: conn + def call(conn, _) do - token = case get_req_header(conn, "authorization") do - ["Bearer " <> header] -> header - _ -> get_session(conn, :oauth_token) - end + token = + case get_req_header(conn, "authorization") do + ["Bearer " <> header] -> header + _ -> get_session(conn, :oauth_token) + end + with token when not is_nil(token) <- token, %Token{user_id: user_id} <- Repo.get_by(Token, token: token), %User{} = user <- Repo.get(User, user_id), - false <- !!user.info["deactivated"] do + false <- !!user.info.deactivated do conn |> assign(:user, user) else