projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cycles-router-api-routes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
o_auth
/
o_auth_controller.ex
diff --git
a/lib/pleroma/web/o_auth/o_auth_controller.ex
b/lib/pleroma/web/o_auth/o_auth_controller.ex
index 6e3c7e1a1c75c71372cc85e25e2ba7a5f9c1679f..42f4d768f0b3643d075a30844bcaca52168c167c 100644
(file)
--- a/
lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/
lib/pleroma/web/o_auth/o_auth_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.OAuthController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.OAuth.OAuthController do
@@
-427,7
+427,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
|> Map.put("state", state)
# Handing the request to Ueberauth
|> Map.put("state", state)
# Handing the request to Ueberauth
- redirect(conn, to: o_auth_path(conn, :request, provider, params))
+ redirect(conn, to:
Routes.
o_auth_path(conn, :request, provider, params))
end
def request(%Plug.Conn{} = conn, params) do
end
def request(%Plug.Conn{} = conn, params) do
@@
-601,7
+601,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
end
# Special case: Local MastodonFE
end
# Special case: Local MastodonFE
- defp redirect_uri(%Plug.Conn{} = conn, "."), do: auth_url(conn, :login)
+ defp redirect_uri(%Plug.Conn{} = conn, "."), do:
Routes.
auth_url(conn, :login)
defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri
defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri