Browse Source

Add EnsureUserKeyPlug, smaller fixes

tags/v0.9.9
lain 5 years ago
parent
commit
12bc73dd28
4 changed files with 42 additions and 1 deletions
  1. +2
    -0
      lib/pleroma/plugs/authentication_plug.ex
  2. +14
    -0
      lib/pleroma/plugs/ensure_user_key_plug.ex
  3. +1
    -1
      test/plugs/basic_auth_decoder_plug_test.exs
  4. +25
    -0
      test/plugs/ensure_user_key_plug_test.exs

+ 2
- 0
lib/pleroma/plugs/authentication_plug.ex View File

@@ -37,4 +37,6 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
Pbkdf2.dummy_checkpw()
conn
end

def call(conn, _), do: conn
end

+ 14
- 0
lib/pleroma/plugs/ensure_user_key_plug.ex View File

@@ -0,0 +1,14 @@
defmodule Pleroma.Plugs.EnsureUserKeyPlug do
import Plug.Conn

def init(opts) do
opts
end

def call(%{assigns: %{user: _}} = conn, _), do: conn

def call(conn, _) do
conn
|> assign(:user, nil)
end
end

+ 1
- 1
test/plugs/basic_auth_decoder_plug_test.exs View File

@@ -1,4 +1,4 @@
defmodule Pleroma.Plugs.AuthenticationPlugTest do
defmodule Pleroma.Plugs.BasicAuthDecoderPlugTest do
use Pleroma.Web.ConnCase, async: true

alias Pleroma.Plugs.BasicAuthDecoderPlug


+ 25
- 0
test/plugs/ensure_user_key_plug_test.exs View File

@@ -0,0 +1,25 @@
defmodule Pleroma.Plugs.EnsureUserKeyPlugTest do
use Pleroma.Web.ConnCase, async: true

alias Pleroma.Plugs.EnsureUserKeyPlug

test "if the conn has a user key set, it does nothing", %{conn: conn} do
conn =
conn
|> assign(:user, 1)

ret_conn =
conn
|> EnsureUserKeyPlug.call(%{})

assert conn == ret_conn
end

test "if the conn has no key set, it sets it to nil", %{conn: conn} do
conn =
conn
|> EnsureUserKeyPlug.call(%{})

assert Map.has_key?(conn.assigns, :user)
end
end

Loading…
Cancel
Save