pleroma

commit: 61d173d37c840df4ddba1e328298bc64508880e0
parent: f745e823f0acf6e10f777d6b924993f99e26a2c2
Author: kaniini <nenolod@gmail.com>
Date:   Sun, 11 Nov 2018 05:34:45 +0000

Merge branch 'bugfix/oauth-padding' into 'develop'

hotfix: oauth: fix token decode regression

Closes #373

See merge request pleroma/pleroma!439
Diffstat:
M
lib/pleroma/web/oauth/oauth_controller.ex
3
+++

1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -143,8 +143,11 @@ defmodule Pleroma.Web.OAuth.OAuthController do
     end
   end
 
+  # XXX - for whatever reason our token arrives urlencoded, but Plug.Conn should be
+  # decoding it.  Investigate sometime.
   defp fix_padding(token) do
     token
+    |> URI.decode()
     |> Base.url_decode64!(padding: false)
     |> Base.url_encode64()
   end