diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-05 23:15:10 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-05 23:15:10 +0400 |
commit | b02df1803e16b40ad8a30465604e2892b6d65e6f (patch) | |
tree | 8d60100ab9fdb8ebe29b0ceff3655e71570d30bd /lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex | |
parent | 317e2b8d6126d86eafb493fe6c3b7a29af65ee21 (diff) | |
parent | d74985af2381b1c0dae2bc9c79c14582e5c61b97 (diff) | |
download | pleroma-b02df1803e16b40ad8a30465604e2892b6d65e6f.tar.gz |
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex')
-rw-r--r-- | lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex b/lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex index 04e629fc1..dca23ea73 100644 --- a/lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/oauth_app_controller.ex @@ -42,12 +42,7 @@ defmodule Pleroma.Web.AdminAPI.OAuthAppController do end def create(%{body_params: params} = conn, _) do - params = - if params[:name] do - Map.put(params, :client_name, params[:name]) - else - params - end + params = Pleroma.Maps.put_if_present(params, :client_name, params[:name]) case App.create(params) do {:ok, app} -> @@ -59,12 +54,7 @@ defmodule Pleroma.Web.AdminAPI.OAuthAppController do end def update(%{body_params: params} = conn, %{id: id}) do - params = - if params[:name] do - Map.put(params, :client_name, params.name) - else - params - end + params = Pleroma.Maps.put_if_present(params, :client_name, params[:name]) with {:ok, app} <- App.update(id, params) do render(conn, "show.json", app: app, admin: true) |