chore: simplify the Auth module, remove auth configuration parameter

Author: zookzook

lib/mongo.ex

@@ -104,8 +104,6 @@ defmodule Mongo do
       `:hostname` (optional)
     * `:username` - The User to connect with (optional)
     * `:password` - The password to connect with (optional)
-    * `:auth` - List of additional users to authenticate as a keyword list with
-      `:username` and `:password` keys (optional)
     * `:auth_source` - The database to authenticate against
     * `:appname` - The name of the application used the driver for the MongoDB-Handshake
     * `:set_name` - The name of the replica set to connect to (required if

lib/mongo/auth.ex

@@ -4,52 +4,46 @@ defmodule Mongo.Auth do
   alias Mongo.PasswordSafe
 
   def run(opts, state) do
-    db = opts[:database]
-    auth = setup(opts)
-    auther = mechanism(state)
     auth_source = opts[:auth_source]
-    wire_version = state[:wire_version]
+    mechanism = mechanism(state)
 
     # change database for auth
-    state =
-      case auth_source != nil && wire_version > 0 do
-        true -> Map.put(state, :database, auth_source)
-        false -> state
-      end
+    auth_state =
+      case auth_source != nil && state.wire_version > 0 do
+        true ->
+          Map.put(state, :database, auth_source)
 
-    # do auth
-    # restore old database
-    Enum.find_value(auth, fn credentials ->
-      case auther.auth(credentials, db, state) do
-        # everything is okay, then return nil
-        :ok ->
-          nil
-
-        error ->
-          {mod, socket} = state.connection
-          mod.close(socket)
-          error
+        false ->
+          state
       end
-    end) || {:ok, Map.put(state, :database, opts[:database])}
+
+    case opts |> credentials() |> mechanism.auth(state.database, auth_state) do
+      :ok ->
+        {:ok, state}
+
+      error ->
+        {mod, socket} = state.connection
+        mod.close(socket)
+        error
+    end
   end
 
-  defp setup(opts) do
+  defp credentials(opts) do
     username = opts[:username]
     pw_safe = opts[:pw_safe]
-    password = PasswordSafe.get_pasword(pw_safe)
-    auth = opts[:auth] || []
+    password = PasswordSafe.get_password(pw_safe)
+    {username, password}
+  end
 
-    auth =
-      Enum.map(auth, fn opts ->
-        username = opts[:username]
-        password = PasswordSafe.get_pasword(pw_safe)
-        {username, password}
-      end)
+  defp mechanism(%{wire_version: version, auth_mechanism: :x509}) when version >= 3 do
+    Mongo.Auth.X509
+  end
 
-    if username && password, do: auth ++ [{username, password}], else: auth
+  defp mechanism(%{wire_version: version}) when version >= 3 do
+    Mongo.Auth.SCRAM
   end
 
-  defp mechanism(%{wire_version: version, auth_mechanism: :x509}) when version >= 3, do: Mongo.Auth.X509
-  defp mechanism(%{wire_version: version}) when version >= 3, do: Mongo.Auth.SCRAM
-  defp mechanism(_), do: Mongo.Auth.CR
+  defp mechanism(_) do
+    Mongo.Auth.CR
+  end
 end

lib/mongo/auth/x509.ex

@@ -3,14 +3,14 @@ defmodule Mongo.Auth.X509 do
   alias Mongo.MongoDBConnection.Utils
 
   def auth({username, _password}, _db, s) do
-    IO.inspect(username)
     cmd = [authenticate: 1, user: username, mechanism: "MONGODB-X509"]
 
     case Utils.command(-2, cmd, s) do
-      {:ok, _flags, message} ->
-        IO.inspect(message)
+      {:ok, _flags, _message} ->
         :ok
-      _error -> {:error, "X509 auth failed"}
+
+      _error ->
+        {:error, "X509 auth failed"}
     end
   end
 end

lib/mongo/password_safe.ex

@@ -18,9 +18,9 @@ defmodule Mongo.PasswordSafe do
     GenServer.cast(pid, {:set, password})
   end
 
-  def get_pasword(nil), do: nil
+  def get_password(nil), do: nil
 
-  def get_pasword(pid) do
+  def get_password(pid) do
     GenServer.call(pid, :get)
   end