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

diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index f0e091ac2..e8483dec0 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -1,8 +1,8 @@
 defmodule Pleroma.Web.OAuth.OAuthController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.Web.OAuth.{Authorization, Token}
-  alias Pleroma.{Repo, User, App}
+  alias Pleroma.Web.OAuth.{Authorization, Token, App}
+  alias Pleroma.{Repo, User}
   alias Comeonin.Pbkdf2
 
   def authorize(conn, params) do
@@ -10,27 +10,40 @@ 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}} = 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 <- Pleroma.Repo.get_by(Pleroma.App, client_id: client_id),
+         %App{} = app <- Repo.get_by(App, client_id: client_id),
          {:ok, auth} <- Authorization.create_authorization(app, user) do
-      render conn, "results.html", %{
-        auth: auth
-      }
+      if redirect_uri == "urn:ietf:wg:oauth:2.0:oob" do
+        render conn, "results.html", %{
+          auth: auth
+        }
+      else
+        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
   end
 
-  # TODO CRITICAL
-  # - Check validity of auth token
+  # TODO
+  # - 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),
-         {:ok, token} <- Token.create_token(app, Repo.get(User, auth.user_id)) do
+         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",
         access_token: token.token,
@@ -39,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