projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'
[akkoma]
/
lib
/
pleroma
/
plugs
/
oauth_plug.ex
diff --git
a/lib/pleroma/plugs/oauth_plug.ex
b/lib/pleroma/plugs/oauth_plug.ex
index 13c914c1b7f3fae2542ad54be418934efcfec6aa..22f0406f4637cfc486a1a86155903667b8b7729c 100644
(file)
--- a/
lib/pleroma/plugs/oauth_plug.ex
+++ b/
lib/pleroma/plugs/oauth_plug.ex
@@
-1,12
+1,14
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Plugs.OAuthPlug do
import Plug.Conn
import Ecto.Query
defmodule Pleroma.Plugs.OAuthPlug do
import Plug.Conn
import Ecto.Query
- alias Pleroma.{
- User,
- Repo,
- Web.OAuth.Token
- }
+ alias Pleroma.User
+ alias Pleroma.Repo
+ alias Pleroma.Web.OAuth.Token
@realm_reg Regex.compile!("Bearer\:?\s+(.*)$", "i")
@realm_reg Regex.compile!("Bearer\:?\s+(.*)$", "i")
@@
-29,7
+31,12
@@
defmodule Pleroma.Plugs.OAuthPlug do
#
@spec fetch_user_and_token(String.t()) :: {:ok, User.t(), Token.t()} | nil
defp fetch_user_and_token(token) do
#
@spec fetch_user_and_token(String.t()) :: {:ok, User.t(), Token.t()} | nil
defp fetch_user_and_token(token) do
- query = from(q in Token, where: q.token == ^token, preload: [:user])
+ query =
+ from(t in Token,
+ where: t.token == ^token,
+ join: user in assoc(t, :user),
+ preload: [user: user]
+ )
with %Token{user: %{info: %{deactivated: false} = _} = user} = token_record <- Repo.one(query) do
{:ok, user, token_record}
with %Token{user: %{info: %{deactivated: false} = _} = user} = token_record <- Repo.one(query) do
{:ok, user, token_record}