X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Foauth%2Foauth_controller.ex;h=e8483dec061ee0338678c13fdaca9c4c553eb34d;hb=4524721fba0582774b7c38fdc1f270c43fd8d53b;hp=4672ce00ef9da24c3a4bafccaf926b7a06247842;hpb=2b21c05105d550d09d85807246be696a1aed4b32;p=akkoma

diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index 4672ce00e..e8483dec0 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -10,11 +10,12 @@ defmodule Pleroma.Web.OAuth.OAuthController do
       response_type: params["response_type"],
       client_id: params["client_id"],
       scope: params["scope"],
-      redirect_uri: params["redirect_uri"]
+      redirect_uri: params["redirect_uri"],
+      state: params["state"]
     }
   end
 
-  def create_authorization(conn, %{"authorization" => %{"name" => name, "password" => password, "client_id" => client_id, "redirect_uri" => redirect_uri}} = params) do
+  def create_authorization(conn, %{"authorization" => %{"name" => name, "password" => password, "client_id" => client_id, "redirect_uri" => redirect_uri} = params}) do
     with %User{} = user <- User.get_cached_by_nickname(name),
          true <- Pbkdf2.checkpw(password, user.password_hash),
          %App{} = app <- Repo.get_by(App, client_id: client_id),
@@ -24,7 +25,13 @@ defmodule Pleroma.Web.OAuth.OAuthController do
           auth: auth
         }
       else
-        url = "#{redirect_uri}?code=#{auth.token}"
+        connector = if String.contains?(redirect_uri, "?"), do: "&", else: "?"
+        url = "#{redirect_uri}#{connector}code=#{auth.token}"
+        url = if params["state"] do
+          url <> "&state=#{params["state"]}"
+        else
+          url
+        end
         redirect(conn, external: url)
       end
     end
@@ -34,7 +41,8 @@ defmodule Pleroma.Web.OAuth.OAuthController do
   # - 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",
@@ -44,6 +52,14 @@ defmodule Pleroma.Web.OAuth.OAuthController 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