Improve Federation boundaries

This commit is contained in:
rustra
2020-01-23 21:59:50 +01:00
parent 8ca5c0b320
commit 3577fe42e1
67 changed files with 314 additions and 227 deletions

View File

@@ -30,7 +30,7 @@ defmodule MobilizonWeb.ConnCase do
@endpoint MobilizonWeb.Endpoint
def auth_conn(%Plug.Conn{} = conn, %User{} = user) do
{:ok, token, _claims} = MobilizonWeb.Guardian.encode_and_sign(user)
{:ok, token, _claims} = MobilizonWeb.Auth.Guardian.encode_and_sign(user)
conn
|> Plug.Conn.put_req_header("authorization", "Bearer #{token}")

View File

@@ -19,6 +19,9 @@ defmodule Mobilizon.DataCase do
alias Mobilizon.Config
alias Mobilizon.Storage.Repo
alias MobilizonWeb.Upload
alias MobilizonWeb.Upload.Uploader
using do
quote do
alias Mobilizon.Storage.Repo
@@ -55,16 +58,16 @@ defmodule Mobilizon.DataCase do
end
def ensure_local_uploader(_context) do
uploader = Config.get([MobilizonWeb.Upload, :uploader])
filters = Config.get([MobilizonWeb.Upload, :filters])
uploader = Config.get([Upload, :uploader])
filters = Config.get([Upload, :filters])
unless uploader == MobilizonWeb.Uploaders.Local || filters != [] do
Config.put([MobilizonWeb.Upload, :uploader], MobilizonWeb.Uploaders.Local)
Config.put([MobilizonWeb.Upload, :filters], [])
unless uploader == Uploader.Local || filters != [] do
Config.put([Upload, :uploader], Uploader.Local)
Config.put([Upload, :filters], [])
on_exit(fn ->
Config.put([MobilizonWeb.Upload, :uploader], uploader)
Config.put([MobilizonWeb.Upload, :filters], filters)
Config.put([Upload, :uploader], uploader)
Config.put([Upload, :filters], filters)
end)
end