projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
account_controller.ex
diff --git
a/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
b/lib/pleroma/web/pleroma_api/controllers/account_controller.ex
index d6ffdcbe4923a6048397479121006d4c0f6e2d1f..be7477867b3592766fa10170331922c90c50c6a9 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/account_controller.ex
@@
-9,6
+9,7
@@
defmodule Pleroma.Web.PleromaAPI.AccountController do
only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2, skip_relationships?: 1]
alias Ecto.Changeset
only: [json_response: 3, add_link_headers: 2, assign_account_by_id: 2, skip_relationships?: 1]
alias Ecto.Changeset
+ alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Plugs.RateLimiter
alias Pleroma.User
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Plugs.RateLimiter
alias Pleroma.User
@@
-17,11
+18,9
@@
defmodule Pleroma.Web.PleromaAPI.AccountController do
require Pleroma.Constants
require Pleroma.Constants
- plug(:skip_plug, OAuthScopesPlug when action == :confirmation_resend)
-
plug(
:skip_plug,
plug(
:skip_plug,
-
Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
when action == :confirmation_resend
+
[OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug]
when action == :confirmation_resend
)
plug(
)
plug(
@@
-40,7
+39,10
@@
defmodule Pleroma.Web.PleromaAPI.AccountController do
]
)
]
)
- plug(OAuthScopesPlug, %{scopes: ["read:favourites"]} when action == :favourites)
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["read:favourites"], fallback: :proceed_unauthenticated} when action == :favourites
+ )
plug(RateLimiter, [name: :account_confirmation_resend] when action == :confirmation_resend)
plug(RateLimiter, [name: :account_confirmation_resend] when action == :confirmation_resend)