diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-31 14:12:29 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-31 14:12:29 +0300 |
| commit | c88a5d32514f4ed78e4b9216198db62e8799ffe4 (patch) | |
| tree | bc979f2522156be74138491114892e7acbeaafcb /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | 41e0304757c5a0d9778f7e685c9ddf481f0e15cb (diff) | |
| parent | 66575061851f13355958fd292ee545462bf191c0 (diff) | |
| download | pleroma-c88a5d32514f4ed78e4b9216198db62e8799ffe4.tar.gz | |
Merge branch 'develop' into feature/hide-follows-remote
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index ef53b7ae3..81eae2c8b 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -365,8 +365,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do def register(%Plug.Conn{} = conn, %{"authorization" => _, "op" => "connect"} = params) do with registration_id when not is_nil(registration_id) <- get_session_registration_id(conn), %Registration{} = registration <- Repo.get(Registration, registration_id), - {_, {:ok, auth}} <- - {:create_authorization, do_create_authorization(conn, params)}, + {_, {:ok, auth}} <- {:create_authorization, do_create_authorization(conn, params)}, %User{} = user <- Repo.preload(auth, :user).user, {:ok, _updated_registration} <- Registration.bind_to_user(registration, user) do conn |