diff options
author | Logan Hunt <loganhunt@simponic.xyz> | 2023-01-19 14:04:10 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-19 14:04:10 -0700 |
commit | 4666d7871a9e064a3b3033c7c1daa9c3c4972d98 (patch) | |
tree | 340ee6ae1dc6410f73bb7862a89c01b7039807de /lib/chessh/schema | |
parent | bdf99b4ee989df1813745e1dfd2983689b09ca85 (diff) | |
download | chessh-4666d7871a9e064a3b3033c7c1daa9c3c4972d98.tar.gz chessh-4666d7871a9e064a3b3033c7c1daa9c3c4972d98.zip |
Web Client (#11)
* Github Oauth
* A simple frontend
* Add middleware proxy on dev
* Forward proxy and rewrite path, add oauth to frontend, increase jwt expiry time to 12 hours
* Some simple style changes
* Add keys as user
* Checkpoint - auth is broken
* Fix auth and use player model, unrelated to this pr: flip board if dark
* Close player session when password or key deleted or put
* Add build script - this branch is quickly becoming cringe
* Docker v2 - add migration and scripts, fix local storage and index that caused build issues
* Ignore keys, proxy api correctly nginx
* Finally nginx is resolved jesus christ
* Remove max screen dimension limits cuz cringe
* Cursor highlight
* Add password form, some minor frontend changes as well
* Remove cringe on home page
* Move to 127.0.0.1 loopback in env
* Add github id in player structs for tests
Diffstat (limited to 'lib/chessh/schema')
-rw-r--r-- | lib/chessh/schema/key.ex | 11 | ||||
-rw-r--r-- | lib/chessh/schema/player.ex | 13 | ||||
-rw-r--r-- | lib/chessh/schema/player_session.ex | 8 |
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 |