projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add follow_requests_outstanding_since?/3 to Pleroma.Activity
[akkoma]
/
lib
/
pleroma
/
web
/
masto_fe_controller.ex
diff --git
a/lib/pleroma/web/masto_fe_controller.ex
b/lib/pleroma/web/masto_fe_controller.ex
index 87860f1d5a2a5c0979cc68801ca4357d244e8379..e788ab37a57252835cfd067088744c91b4ab6014 100644
(file)
--- a/
lib/pleroma/web/masto_fe_controller.ex
+++ b/
lib/pleroma/web/masto_fe_controller.ex
@@
-1,42
+1,59
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastoFEController do
use Pleroma.Web, :controller
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastoFEController do
use Pleroma.Web, :controller
- alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.User
+ alias Pleroma.Web.MastodonAPI.AuthController
+ alias Pleroma.Web.OAuth.Token
+ alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
+ alias Pleroma.Web.Plugs.OAuthScopesPlug
plug(OAuthScopesPlug, %{scopes: ["write:accounts"]} when action == :put_settings)
# Note: :index action handles attempt of unauthenticated access to private instance with redirect
plug(OAuthScopesPlug, %{scopes: ["write:accounts"]} when action == :put_settings)
# Note: :index action handles attempt of unauthenticated access to private instance with redirect
+ plug(:skip_plug, EnsurePublicOrAuthenticatedPlug when action == :index)
+
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
- %{scopes: ["read"], fallback: :proceed_unauthenticated
, skip_instance_privacy_check: true
}
+ %{scopes: ["read"], fallback: :proceed_unauthenticated}
when action == :index
)
when action == :index
)
- plug(Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug when action != :index)
+ plug(
+ :skip_plug,
+ [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] when action == :manifest
+ )
@doc "GET /web/*path"
@doc "GET /web/*path"
- def index(%{assigns: %{user: user}} = conn, _params) do
- token = get_session(conn, :oauth_token)
-
- if user && token do
+ def index(conn, _params) do
+ with %{assigns: %{user: %User{} = user, token: %Token{app_id: token_app_id} = token}} <- conn,
+ {:ok, %{id: ^token_app_id}} <- AuthController.local_mastofe_app() do
conn
|> put_layout(false)
conn
|> put_layout(false)
- |> render("index.html", token: token, user: user, custom_emojis: Pleroma.Emoji.get_all())
+ |> render("index.html",
+ token: token.token,
+ user: user,
+ custom_emojis: Pleroma.Emoji.get_all()
+ )
else
else
- conn
- |> put_session(:return_to, conn.request_path)
- |> redirect(to: "/web/login")
+ _ ->
+ conn
+ |> put_session(:return_to, conn.request_path)
+ |> redirect(to: "/web/login")
end
end
end
end
- @doc "PUT /api/web/settings"
+ @doc "GET /web/manifest.json"
+ def manifest(conn, _params) do
+ render(conn, "manifest.json")
+ end
+
+ @doc "PUT /api/web/settings: Backend-obscure settings blob for MastoFE, don't parse/reuse elsewhere"
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
- with {:ok, _} <- User.
update_info(user, &User.Info.mastodon_settings_update(&1, settings)
) do
+ with {:ok, _} <- User.
mastodon_settings_update(user, settings
) do
json(conn, %{})
else
e ->
json(conn, %{})
else
e ->