projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fix oauth2 (for real) (#179)"
[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 247d8399ce2d1ff02b349e7d6bddaf2790e7ab85..358120fe6c375bd98d8c7d056e59c0635da5b17e 100644
(file)
--- a/
lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/
lib/pleroma/web/o_auth/o_auth_controller.ex
@@
-101,7
+101,8
@@
defmodule Pleroma.Web.OAuth.OAuthController do
scopes: scopes,
redirect_uri: params["redirect_uri"],
state: params["state"],
scopes: scopes,
redirect_uri: params["redirect_uri"],
state: params["state"],
- params: params
+ params: params,
+ view_module: OAuthView
})
end
})
end
@@
-160,7
+161,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
# Enforcing the view to reuse the template when calling from other controllers
conn
|> put_view(OAuthView)
# Enforcing the view to reuse the template when calling from other controllers
conn
|> put_view(OAuthView)
- |> render("oob_authorization_created.html", %{auth: auth})
+ |> render("oob_authorization_created.html", %{auth: auth
, view_module: OAuthView
})
end
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
end
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{