i don't know what exactly i'm doing
This commit is contained in:
parent
b8669dd01f
commit
bbdbf58b66
1 changed files with 14 additions and 10 deletions
|
|
@ -28,26 +28,30 @@ defmodule Pleroma.Web.Plugs.OAuthPlug do
|
||||||
false <- Token.expired?(user_token) do
|
false <- Token.expired?(user_token) do
|
||||||
with true <- needs_update?(user_token),
|
with true <- needs_update?(user_token),
|
||||||
{:ok, updated_token} <- Token.update_activity(user_token) do
|
{:ok, updated_token} <- Token.update_activity(user_token) do
|
||||||
assign(conn, :token, updated_token)
|
conn
|
||||||
|
|> assign(conn, :token, updated_token)
|
||||||
|
|> assign(:user, user)
|
||||||
else
|
else
|
||||||
_ -> assign(conn, :token, user_token)
|
_ ->
|
||||||
|
conn
|
||||||
|
|> assign(:token, user_token)
|
||||||
|
|> assign(:user, user)
|
||||||
end
|
end
|
||||||
|
|
||||||
conn
|
|
||||||
|> assign(:user, user)
|
|
||||||
else
|
else
|
||||||
_ ->
|
_ ->
|
||||||
with {:ok, app, app_token} <- fetch_app_and_token(token_str),
|
with {:ok, app, app_token} <- fetch_app_and_token(token_str),
|
||||||
false <- Token.expired?(app_token) do
|
false <- Token.expired?(app_token) do
|
||||||
with true <- needs_update?(app_token),
|
with true <- needs_update?(app_token),
|
||||||
{:ok, updated_token} <- Token.update_activity(app_token) do
|
{:ok, updated_token} <- Token.update_activity(app_token) do
|
||||||
assign(conn, :token, updated_token)
|
conn
|
||||||
|
|> assign(:token, updated_token)
|
||||||
|
|> assign(:app, app)
|
||||||
else
|
else
|
||||||
_ -> assign(conn, :token, app_token)
|
_ ->
|
||||||
|
conn
|
||||||
|
|> assign(:token, app_token)
|
||||||
|
|> assign(:app, app)
|
||||||
end
|
end
|
||||||
|
|
||||||
conn
|
|
||||||
|> assign(:app, app)
|
|
||||||
else
|
else
|
||||||
_ -> conn
|
_ -> conn
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue