Refactored skip_if_no_credentials_configured

Author: ivalentinee

lib/basic_auth/configured.ex

@@ -13,24 +13,24 @@ defmodule BasicAuth.Configured do
      %__MODULE__{config_options: config_options}
   end
 
-  def respond(conn, ["Basic " <> encoded], options) do
+  def respond(conn, params, options) do
     if skip_authentication?(options) do
       conn
     else
-      case Base.decode64(encoded) do
-        {:ok, token} -> check_token(conn, token, options)
-        _ ->
-          send_unauthorised_response(conn, options)
-      end
+      authenticate(conn, params, options)
     end
   end
-  def respond(conn, _, options) do
-    if skip_authentication?(options) do
-      conn
-    else
-      send_unauthorised_response(conn, options)
+
+  def authenticate(conn, ["Basic " <> encoded], options) do
+    case Base.decode64(encoded) do
+      {:ok, token} -> check_token(conn, token, options)
+      _ ->
+        send_unauthorised_response(conn, options)
     end
   end
+  def authenticate(conn, _, options) do
+    send_unauthorised_response(conn, options)
+  end
 
   defp check_token(conn, token, options = %__MODULE__{config_options: config_options}) do
     if Crypto.secure_compare(token, configured_token(config_options)) do

test/basic_auth/configured_test.exs

@@ -128,7 +128,7 @@ defmodule BasicAuth.ConfiguredTest do
         username: nil,
         password: nil,
         realm: "Admin Area",
-        skip_if_no_credentials_configured: true,
+        skip_if_no_credentials_configured: true
       )
 
       conn = call_without_credentials(SimplePlug)
@@ -140,7 +140,7 @@ defmodule BasicAuth.ConfiguredTest do
         username: "admin",
         password: "simple:password",
         realm: "Admin Area",
-        skip_if_no_credentials_configured: true,
+        skip_if_no_credentials_configured: true
       )
 
       conn = call_without_credentials(SimplePlug)
@@ -152,7 +152,7 @@ defmodule BasicAuth.ConfiguredTest do
         username: "admin",
         password: "simple:password",
         realm: "Admin Area",
-        skip_if_no_credentials_configured: true,
+        skip_if_no_credentials_configured: true
       )
 
       conn = call_with_credentials(SimplePlug, "admin:simple:password")