Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tootdon logins.

Browse Source
This commit is contained in:
eal 2017-11-06 21:51:31 +02:00
parent fa1f11e8e9
commit b0e27b21dd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/oauth/oauth_controller.ex
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