[#923] Deps config adjustment (no `override` for `httpoison`), code analysis issues...

diff --git a/lib/pleroma/web/auth/pleroma_authenticator.ex b/lib/pleroma/web/auth/pleroma_authenticator.ex
index 8b190f97f25223338a14004ff99caa506c3f8d6c..c826adb4c504ab6c64823bcc71b53ffbdb180c92 100644 (file)
--- a/lib/pleroma/web/auth/pleroma_authenticator.ex
+++ b/lib/pleroma/web/auth/pleroma_authenticator.ex
@@ -4,9 +4,9 @@
 
 defmodule Pleroma.Web.Auth.PleromaAuthenticator do
   alias Comeonin.Pbkdf2
-  alias Pleroma.User
   alias Pleroma.Registration
   alias Pleroma.Repo
+  alias Pleroma.User
 
   @behaviour Pleroma.Web.Auth.Authenticator
 

diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index f92724d8b183b27157a2c0377c4a83249a9404ab..b85b95bf93a4c84041a9feabd23d1811737184a7 100644 (file)
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -60,7 +60,8 @@ defmodule Pleroma.Web.Endpoint do
 
   same_site =
     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"
     else
       "SameSite=Strict"

diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index e54e196aa7ed3696eb73568fa31bbad2f2097689..54e0a35ba1d2efb144e7fabe6458003dd7d0af9c 100644 (file)
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -5,9 +5,9 @@
 defmodule Pleroma.Web.OAuth.OAuthController do
   use Pleroma.Web, :controller
 
+  alias Pleroma.Registration
   alias Pleroma.Repo
   alias Pleroma.User
-  alias Pleroma.Registration
   alias Pleroma.Web.Auth.Authenticator
   alias Pleroma.Web.OAuth.App
   alias Pleroma.Web.OAuth.Authorization

diff --git a/mix.exs b/mix.exs
index 34c17bd6bb18d8f732fbbec4841d5f228d129c97..2b0d25b551ad00b0c30f438ac0defa1cec6a5aec 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -76,7 +76,7 @@ defmodule Pleroma.Mixfile do
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
-      {:httpoison, "~> 1.2.0", override: true},
+      {:httpoison, "~> 1.2.0"},
       {:poison, "~> 3.0", override: true},
       {:tesla, "~> 1.2"},
       {:jason, "~> 1.0"},