aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-02-15 14:58:13 +0000
committerlambda <pleromagit@rogerbraun.net>2019-02-15 14:58:13 +0000
commit1ce1b7b58dc0e009635c9dd6e2571df56c04f356 (patch)
tree477fc43ca2dd22ea19edc28c596f8e8d685c9103 /lib/pleroma/web/oauth/oauth_controller.ex
parent921571c19bf4a7fcea666aa70744a02fe108d11a (diff)
parente9ef4b8da627e516d5f1a2b742c6dafa65232098 (diff)
downloadpleroma-1ce1b7b58dc0e009635c9dd6e2571df56c04f356.tar.gz
Merge branch 'bugfix/oauth-token-padding' into 'develop'
oauth: never use base64 padding when returning tokens to applications See merge request pleroma/pleroma!825
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index e4d0601f8..dddfcf299 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -173,7 +173,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
token
|> URI.decode()
|> Base.url_decode64!(padding: false)
- |> Base.url_encode64()
+ |> Base.url_encode64(padding: false)
end
defp get_app_from_request(conn, params) do