hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/return-link-for-password-reset' into 'develop'

Browse source 
Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691
This commit is contained in:
kaniini 2019-09-26 03:12:03 +00:00
commit a39e065916
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
alias Pleroma.Web.AdminAPI.ReportView
alias Pleroma.Web.AdminAPI.Search
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Endpoint
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.Router
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
@ -435,7 +437,10 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
{:ok, token} = Pleroma.PasswordResetToken.create_token(user)
conn
|> json(token.token)
|> json(%{
token: token.token,
link: Router.Helpers.reset_password_url(Endpoint, :reset, token.token)
})
end
@doc "Force password reset for a given user"