sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Admin API: Return link alongside with token on password reset

Browse Source
This commit is contained in:
Maxim Filippov 2019-09-17 23:09:08 +03:00
parent 7318095657
commit f9dd121ad3
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
– Pagination: (optional) return `total` alongside with `items` when paginating – Pagination: (optional) return `total` alongside with `items` when paginating
- Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings) - Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings)
- Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler
- Admin API: Return link alongside with token on password reset
### Fixed ### Fixed
- Following from Osada - Following from Osada

7
lib/pleroma/web/admin_api/admin_api_controller.ex
View File

@ -432,9 +432,14 @@ def revoke_invite(conn, %{"token" => token}) do
def get_password_reset(conn, %{"nickname" => nickname}) do def get_password_reset(conn, %{"nickname" => nickname}) do
(%User{local: true} = user) = User.get_cached_by_nickname(nickname) (%User{local: true} = user) = User.get_cached_by_nickname(nickname)
{:ok, token} = Pleroma.PasswordResetToken.create_token(user) {:ok, token} = Pleroma.PasswordResetToken.create_token(user)
host = Pleroma.Config.get([Pleroma.Web.Endpoint, :url, :host])
protocol = Pleroma.Config.get([Pleroma.Web.Endpoint, :protocol])
conn conn
|> json(token.token) |> json(%{
token: token.token,
link: "#{protocol}://#{host}/api/pleroma/password_reset/#{token}"
})
end end
def list_reports(conn, params) do def list_reports(conn, params) do