2 files changed, 16 insertions, 2 deletions
diff --git a/lib/chessh/auth/keys.ex b/lib/chessh/auth/keys.ex
index a29d169..f0e1c78 100644
--- a/lib/chessh/auth/keys.ex
+++ b/lib/chessh/auth/keys.ex
@@ -1,7 +1,16 @@
 defmodule Chessh.Auth.KeyAuthenticator do
-  alias Chessh.{Key, Repo}
+  alias Chessh.{Key, Repo, Player}
   import Ecto.Query
 
+  def authenticate(player = %Player{}, public_key) do
+    !!Repo.one(
+      from(k in Key,
+        where: k.key == ^Key.encode_key(public_key),
+        where: k.player_id == ^player.id
+      )
+    )
+  end
+
   def authenticate(username, public_key) do
     !!Repo.one(
       from(k in Key,
diff --git a/lib/chessh/auth/password.ex b/lib/chessh/auth/password.ex
index ea2c8fc..a01291d 100644
--- a/lib/chessh/auth/password.ex
+++ b/lib/chessh/auth/password.ex
@@ -1,9 +1,14 @@
 defmodule Chessh.Auth.PasswordAuthenticator do
   alias Chessh.{Player, Repo}
 
+  def authenticate(player = %Player{}, password) do
+    Player.valid_password?(player, password)
+  end
+
   def authenticate(username, password) do
     case Repo.get_by(Player, username: username) do
-      x -> Player.valid_password?(x, password)
+      player -> authenticate(player, password)
+      nil -> false
     end
   end
 end