hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Session token setting on token exchange. Auth-related refactoring.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-11-25 21:47:23 +03:00
commit 12a5981cc3
11 changed files with 56 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/pleroma/web/plugs/o_auth_plug_test.exs
View file

@ -5,6 +5,7 @@
defmodule Pleroma.Web.Plugs.OAuthPlugTest do
use Pleroma.Web.ConnCase, async: true
alias Pleroma.Helpers.AuthHelper
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.OAuth.Token.Strategy.Revoke
alias Pleroma.Web.Plugs.OAuthPlug
@ -84,7 +85,7 @@ defmodule Pleroma.Web.Plugs.OAuthPlugTest do
conn
|> Session.call(Session.init(session_opts))
|> fetch_session()
|> put_session(:oauth_token, oauth_token.token)
|> AuthHelper.put_session_token(oauth_token.token)
%{conn: conn}
end

5
test/pleroma/web/plugs/set_user_session_id_plug_test.exs
View file

@ -5,6 +5,7 @@
defmodule Pleroma.Web.Plugs.SetUserSessionIdPlugTest do
use Pleroma.Web.ConnCase, async: true
alias Pleroma.Helpers.AuthHelper
alias Pleroma.Web.Plugs.SetUserSessionIdPlug
setup %{conn: conn} do
@ -28,7 +29,7 @@ defmodule Pleroma.Web.Plugs.SetUserSessionIdPlugTest do
assert ret_conn == conn
end
test "sets :oauth_token in session to :token assign", %{conn: conn} do
test "sets session token basing on :token assign", %{conn: conn} do
%{user: user, token: oauth_token} = oauth_access(["read"])
ret_conn =
@ -37,6 +38,6 @@ defmodule Pleroma.Web.Plugs.SetUserSessionIdPlugTest do
|> assign(:token, oauth_token)
|> SetUserSessionIdPlug.call(%{})
assert get_session(ret_conn, :oauth_token) == oauth_token.token
assert AuthHelper.get_session_token(ret_conn) == oauth_token.token
end
end