3 files changed, 29 insertions, 3 deletions
diff --git a/lib/chessh/schema/key.ex b/lib/chessh/schema/key.ex
index df790e2..856aa8e 100644
--- a/lib/chessh/schema/key.ex
+++ b/lib/chessh/schema/key.ex
@@ -11,13 +11,20 @@ defmodule Chessh.Key do
     timestamps()
   end
 
+  defimpl Jason.Encoder, for: Chessh.Key do
+    def encode(value, opts) do
+      Jason.Encode.map(Map.take(value, [:id, :key, :name]), opts)
+    end
+  end
+
   def changeset(key, attrs) do
     key
-    |> cast(update_encode_key(attrs, :key), [:key])
+    |> cast(update_encode_key(attrs, :key), [:key, :player_id])
     |> cast(attrs, [:name])
     |> validate_required([:key, :name])
-    |> validate_format(:key, ~r/[\-\w\d]+ [^ ]+$/, message: "invalid public ssh key")
+    |> validate_format(:key, ~r/^[\-\w\d]+ [^ ]+$/, message: "invalid public ssh key")
     |> validate_format(:key, ~r/^(?!ssh-dss).+/, message: "DSA keys are not supported")
+    |> unique_constraint([:player_id, :key], message: "Player already has that key")
   end
 
   def encode_key(key) do
diff --git a/lib/chessh/schema/player.ex b/lib/chessh/schema/player.ex
index 074ea4e..f12ad9e 100644
--- a/lib/chessh/schema/player.ex
+++ b/lib/chessh/schema/player.ex
@@ -5,6 +5,8 @@ defmodule Chessh.Player do
 
   @derive {Inspect, except: [:password]}
   schema "players" do
+    field(:github_id, :integer)
+
     field(:username, :string)
 
     field(:password, :string, virtual: true)
@@ -19,6 +21,15 @@ defmodule Chessh.Player do
     timestamps()
   end
 
+  defimpl Jason.Encoder, for: Chessh.Player do
+    def encode(value, opts) do
+      Jason.Encode.map(
+        Map.take(value, [:id, :github_id, :username, :created_at, :updated_at]),
+        opts
+      )
+    end
+  end
+
   def authentications_changeset(player, attrs) do
     player
     |> cast(attrs, [:authentications])
@@ -26,7 +37,7 @@ defmodule Chessh.Player do
 
   def registration_changeset(player, attrs, opts \\ []) do
     player
-    |> cast(attrs, [:username, :password])
+    |> cast(attrs, [:username, :password, :github_id])
     |> validate_username()
     |> validate_password(opts)
   end
diff --git a/lib/chessh/schema/player_session.ex b/lib/chessh/schema/player_session.ex
index b16519f..f12387a 100644
--- a/lib/chessh/schema/player_session.ex
+++ b/lib/chessh/schema/player_session.ex
@@ -108,4 +108,12 @@ defmodule Chessh.PlayerSession do
       3_000 -> false
     end
   end
+
+  def close_all_player_sessions(player) do
+    player_sessions = Repo.all(from(p in PlayerSession, where: p.player_id == ^player.id))
+
+    Enum.map(player_sessions, fn session ->
+      :syn.publish(:player_sessions, {:session, session.id}, :session_closed)
+    end)
+  end
 end