Commit ed1eb5de authored by lain's avatar lain
Browse files

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

Fix tootdon logins.

See merge request !6
parents 7252f6b0 d1c126ac
Pipeline #32 passed with stage
in 1 minute and 51 seconds
......@@ -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.
......
......@@ -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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment