diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-08-05 09:43:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-08-05 11:11:24 -0500 |
| commit | b83758bd9634d4f2fb70a92159072dd44e49bb31 (patch) | |
| tree | 2452e8c4e1544fc9a0ad71292901b6cd52765566 /lib/pleroma/web/mastodon_api/controllers/auth_controller.ex | |
| parent | 2b3d7794b23aac30cf8f977009d17b1abc602d19 (diff) | |
| parent | 5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0 (diff) | |
| download | pleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into moderators
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) |