Merge branch 'fix-tootdon-oauth' into 'develop'

Fix tootdon logins.

See merge request pleroma/pleroma!6
This commit is contained in:
lambda 2017-11-06 20:27:31 +00:00
commit ed1eb5deea
2 changed files with 11 additions and 1 deletions

View File

@ -13,6 +13,7 @@ Mobile clients that are known to work well:
* Pawoo (Android + iOS) * Pawoo (Android + iOS)
* Subway Tooter * Subway Tooter
* Amaroq (iOS) * Amaroq (iOS)
* Tootdon (Android + iOS)
No release has been made yet, but several servers have been online for months already. If you want to run your own server, feel free to contact us at @lain@pleroma.soykaf.com or in our dev chat at https://matrix.heldscal.la/#/room/#pleromafe:matrix.heldscal.la. No release has been made yet, but several servers have been online for months already. If you want to run your own server, feel free to contact us at @lain@pleroma.soykaf.com or in our dev chat at https://matrix.heldscal.la/#/room/#pleromafe:matrix.heldscal.la.

View File

@ -40,7 +40,8 @@ defmodule Pleroma.Web.OAuth.OAuthController do
# - proper scope handling # - proper scope handling
def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
with %App{} = app <- Repo.get_by(App, client_id: params["client_id"], client_secret: params["client_secret"]), with %App{} = app <- Repo.get_by(App, client_id: params["client_id"], client_secret: params["client_secret"]),
%Authorization{} = auth <- Repo.get_by(Authorization, token: params["code"], app_id: app.id), fixed_token = fix_padding(params["code"]),
%Authorization{} = auth <- Repo.get_by(Authorization, token: fixed_token, app_id: app.id),
{:ok, token} <- Token.exchange_token(app, auth) do {:ok, token} <- Token.exchange_token(app, auth) do
response = %{ response = %{
token_type: "Bearer", token_type: "Bearer",
@ -50,6 +51,14 @@ defmodule Pleroma.Web.OAuth.OAuthController do
scope: "read write follow" scope: "read write follow"
} }
json(conn, response) json(conn, response)
else
_error -> json(conn, %{error: "Invalid credentials"})
end end
end end
defp fix_padding(token) do
token
|> Base.url_decode64!(padding: false)
|> Base.url_encode64
end
end end