From 5fe9e4dd3feaeea9e35c3ef126e8c3b0ee8601a6 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 9 Sep 2017 19:03:57 +0200 Subject: [PATCH] Do oauth redirect. --- lib/pleroma/web/oauth/oauth_controller.ex | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 579d6b3f4..4672ce00e 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -14,14 +14,19 @@ defmodule Pleroma.Web.OAuth.OAuthController do } 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 <- 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 + url = "#{redirect_uri}?code=#{auth.token}" + redirect(conn, external: url) + end end end