[#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
This commit is contained in:
parent
baffdcc480
commit
eadafc88b8
|
@ -4,9 +4,9 @@
|
||||||
|
|
||||||
defmodule Pleroma.Web.Auth.PleromaAuthenticator do
|
defmodule Pleroma.Web.Auth.PleromaAuthenticator do
|
||||||
alias Comeonin.Pbkdf2
|
alias Comeonin.Pbkdf2
|
||||||
alias Pleroma.User
|
|
||||||
alias Pleroma.Registration
|
alias Pleroma.Registration
|
||||||
alias Pleroma.Repo
|
alias Pleroma.Repo
|
||||||
|
alias Pleroma.User
|
||||||
|
|
||||||
@behaviour Pleroma.Web.Auth.Authenticator
|
@behaviour Pleroma.Web.Auth.Authenticator
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,8 @@ defmodule Pleroma.Web.Endpoint do
|
||||||
|
|
||||||
same_site =
|
same_site =
|
||||||
if Pleroma.Config.get([:auth, :oauth_consumer_enabled]) do
|
if Pleroma.Config.get([:auth, :oauth_consumer_enabled]) do
|
||||||
# Note: "SameSite=Strict" prevents sign in with external OAuth provider (no cookies during callback request)
|
# Note: "SameSite=Strict" prevents sign in with external OAuth provider
|
||||||
|
# (there would be no cookies during callback request from OAuth provider)
|
||||||
"SameSite=Lax"
|
"SameSite=Lax"
|
||||||
else
|
else
|
||||||
"SameSite=Strict"
|
"SameSite=Strict"
|
||||||
|
|
|
@ -5,9 +5,9 @@
|
||||||
defmodule Pleroma.Web.OAuth.OAuthController do
|
defmodule Pleroma.Web.OAuth.OAuthController do
|
||||||
use Pleroma.Web, :controller
|
use Pleroma.Web, :controller
|
||||||
|
|
||||||
|
alias Pleroma.Registration
|
||||||
alias Pleroma.Repo
|
alias Pleroma.Repo
|
||||||
alias Pleroma.User
|
alias Pleroma.User
|
||||||
alias Pleroma.Registration
|
|
||||||
alias Pleroma.Web.Auth.Authenticator
|
alias Pleroma.Web.Auth.Authenticator
|
||||||
alias Pleroma.Web.OAuth.App
|
alias Pleroma.Web.OAuth.App
|
||||||
alias Pleroma.Web.OAuth.Authorization
|
alias Pleroma.Web.OAuth.Authorization
|
||||||
|
|
2
mix.exs
2
mix.exs
|
@ -76,7 +76,7 @@ defp deps do
|
||||||
{:phoenix_html, "~> 2.10"},
|
{:phoenix_html, "~> 2.10"},
|
||||||
{:calendar, "~> 0.17.4"},
|
{:calendar, "~> 0.17.4"},
|
||||||
{:cachex, "~> 3.0.2"},
|
{:cachex, "~> 3.0.2"},
|
||||||
{:httpoison, "~> 1.2.0", override: true},
|
{:httpoison, "~> 1.2.0"},
|
||||||
{:poison, "~> 3.0", override: true},
|
{:poison, "~> 3.0", override: true},
|
||||||
{:tesla, "~> 1.2"},
|
{:tesla, "~> 1.2"},
|
||||||
{:jason, "~> 1.0"},
|
{:jason, "~> 1.0"},
|
||||||
|
|
Loading…
Reference in New Issue