diff options
| author | kaniini <nenolod@gmail.com> | 2019-05-13 20:47:26 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-13 20:47:26 +0000 |
| commit | a0ec7326f9885eb571e06d24821c8e6c6df5f500 (patch) | |
| tree | 5734139e64ce5819db803e118bbe14387dd8c8f7 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | b14a314ce7e8f2a8803c69329978e26939a40ee4 (diff) | |
| parent | 498bfdf403b6d20f92363a4b650dd0b926351e17 (diff) | |
| download | pleroma-a0ec7326f9885eb571e06d24821c8e6c6df5f500.tar.gz | |
Merge branch 'refactor/jason' into 'develop'
Switch to Jason over Poison
See merge request pleroma/pleroma!1145
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 862b8f8c9..4ee8339e2 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -274,7 +274,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do auth_attrs |> Map.delete("scopes") |> Map.put("scope", scope) - |> Poison.encode!() + |> Jason.encode!() params = auth_attrs @@ -338,7 +338,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do end defp callback_params(%{"state" => state} = params) do - Map.merge(params, Poison.decode!(state)) + Map.merge(params, Jason.decode!(state)) end def registration_details(conn, %{"authorization" => auth_attrs}) do |