From b0e27b21dd655a663969b8b179c2966974e6e046 Mon Sep 17 00:00:00 2001 From: eal Date: Mon, 6 Nov 2017 21:51:31 +0200 Subject: [PATCH 1/2] Fix tootdon logins. --- lib/pleroma/web/oauth/oauth_controller.ex | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 3e66c3ee8..841df8c32 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -40,7 +40,8 @@ def create_authorization(conn, %{"authorization" => %{"name" => name, "password" # - proper scope handling 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"]), - %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 response = %{ token_type: "Bearer", @@ -50,6 +51,14 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do scope: "read write follow" } json(conn, response) + else + _error -> json(conn, %{error: "Invalid credentials"}) end end + + defp fix_padding(token) do + token + |> Base.url_decode64!(padding: false) + |> Base.url_encode64 + end end From d1c126ac98ff1664fa0491145b428212829619a0 Mon Sep 17 00:00:00 2001 From: eal Date: Mon, 6 Nov 2017 22:22:36 +0200 Subject: [PATCH 2/2] Update README. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 339f8cc69..cb91f0b48 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Mobile clients that are known to work well: * Pawoo (Android + iOS) * Subway Tooter * 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.