diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-04 21:12:37 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-04 21:12:37 -0500 |
| commit | 3be08e7c2ec8b77e02e3d0572227221d68163df0 (patch) | |
| tree | 0f1d9ab79c29060edd3f95c4795e634a10d1a5a3 /lib/pleroma/web/mastodon_api/controllers/auth_controller.ex | |
| parent | 1c3fe43d231428fee392afd726363193fdcb8008 (diff) | |
| parent | 94687e23938b808a3fff95c92956ec337160cd0b (diff) | |
| download | pleroma-3be08e7c2ec8b77e02e3d0572227221d68163df0.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into cycles-reverse-proxy
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/auth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/auth_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex index eb6639fc5..4920d65da 100644 --- a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex @@ -53,7 +53,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthController do defp redirect_to_oauth_form(conn, _params) do with {:ok, app} <- local_mastofe_app() do path = - o_auth_path(conn, :authorize, + Routes.o_auth_path(conn, :authorize, response_type: "code", client_id: app.client_id, redirect_uri: ".", @@ -90,7 +90,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthController do defp local_mastodon_post_login_path(conn) do case get_session(conn, :return_to) do nil -> - masto_fe_path(conn, :index, ["getting-started"]) + Routes.masto_fe_path(conn, :index, ["getting-started"]) return_to -> delete_session(conn, :return_to) |