pim/architex
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Restructure code base for API requests/responses

Browse source
This commit is contained in:
Pim Kunis 2021-09-09 17:26:40 +02:00
parent b60c80b882
commit e55aa4b85c
17 changed files with 103 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/architex_web/client/controllers/login_controller.ex
View file

@ -2,11 +2,9 @@ defmodule ArchitexWeb.Client.LoginController do
use ArchitexWeb, :controller
import ArchitexWeb.Error
import Ecto.Changeset
alias Architex.{Repo, Account, Device}
alias ArchitexWeb.Client.Request.Login
alias Ecto.Changeset
@login_type "m.login.password"
@ -33,32 +31,28 @@ defmodule ArchitexWeb.Client.LoginController do
conn,
%{"type" => @login_type, "identifier" => %{"type" => "m.id.user"}} = params
) do
case Login.changeset(params) do
%Changeset{valid?: true} = cs ->
input = apply_changes(cs)
with {:ok, request} <- Login.parse(params) do
case Account.login(request) |> Repo.transaction() do
{:ok,
{%Account{localpart: localpart}, %Device{access_token: access_token, id: device_id}}} ->
data = %{
user_id: Architex.get_mxid(localpart),
access_token: access_token,
device_id: device_id
}
case Account.login(input) |> Repo.transaction() do
{:ok,
{%Account{localpart: localpart}, %Device{access_token: access_token, id: device_id}}} ->
data = %{
user_id: Architex.get_mxid(localpart),
access_token: access_token,
device_id: device_id
}
conn
|> put_status(200)
|> json(data)
conn
|> put_status(200)
|> json(data)
{:error, error} when is_atom(error) ->
put_error(conn, error)
{:error, error} when is_atom(error) ->
put_error(conn, error)
{:error, _} ->
put_error(conn, :unknown)
end
_ ->
put_error(conn, :bad_json)
{:error, _} ->
put_error(conn, :unknown)
end
else
_ -> put_error(conn, :bad_json)
end
end

3
lib/architex_web/client/controllers/profile_controller.ex
View file

@ -85,7 +85,8 @@ defmodule ArchitexWeb.Client.ProfileController do
put_error(conn, :not_found, "User was not found.")
end
else
case HTTPClient.client(domain) |> HTTPClient.query_profile(user_id, Atom.to_string(property_key)) do
case HTTPClient.client(domain)
|> HTTPClient.query_profile(user_id, Atom.to_string(property_key)) do
{:ok, response} ->
conn
|> put_status(200)

51
lib/architex_web/client/controllers/register_controller.ex
View file

@ -2,11 +2,9 @@ defmodule ArchitexWeb.Client.RegisterController do
use ArchitexWeb, :controller
import ArchitexWeb.Error
import Ecto.Changeset
alias Architex.{Repo, Account, Device}
alias ArchitexWeb.Client.Request.Register
alias Ecto.Changeset
@register_type "m.login.dummy"
@ -16,35 +14,32 @@ defmodule ArchitexWeb.Client.RegisterController do
Action for POST /_matrix/client/r0/register.
"""
def register(conn, %{"auth" => %{"type" => @register_type}} = params) do
case Register.changeset(params) do
%Changeset{valid?: true} = cs ->
%Register{inhibit_login: inhibit_login} = input = apply_changes(cs)
with {:ok, %Register{inhibit_login: inhibit_login} = request} <- Register.parse(params) do
case Account.register(request) |> Repo.transaction() do
{:ok,
%{
account: %Account{localpart: localpart},
device: %Device{id: device_id, access_token: access_token}
}} ->
data = %{user_id: Architex.get_mxid(localpart)}
case Account.register(input) |> Repo.transaction() do
{:ok,
%{
account: %Account{localpart: localpart},
device: %Device{id: device_id, access_token: access_token}
}} ->
data = %{user_id: Architex.get_mxid(localpart)}
data =
if not inhibit_login do
data
|> Map.put(:device_id, device_id)
|> Map.put(:access_token, access_token)
else
data
end
data =
if not inhibit_login do
data
|> Map.put(:device_id, device_id)
|> Map.put(:access_token, access_token)
else
data
end
conn
|> put_status(200)
|> json(data)
{:error, _, cs, _} ->
put_error(conn, Register.get_error(cs))
end
conn
|> put_status(200)
|> json(data)
{:error, _, cs, _} ->
put_error(conn, Register.get_error(cs))
end
else
_ ->
put_error(conn, :bad_json)
end

30
lib/architex_web/client/controllers/room_controller.ex
View file

@ -2,12 +2,11 @@ defmodule ArchitexWeb.Client.RoomController do
use ArchitexWeb, :controller
import ArchitexWeb.Error
import Ecto.{Changeset, Query}
import Ecto.Query
alias Architex.{Repo, Room, RoomServer, Event}
alias Architex.Types.UserId
alias ArchitexWeb.Client.Request.{CreateRoom, Kick, Ban, Messages}
alias Ecto.Changeset
alias Plug.Conn
@doc """
@ -16,23 +15,20 @@ defmodule ArchitexWeb.Client.RoomController do
Action for POST /_matrix/client/r0/createRoom.
"""
def create(%Conn{assigns: %{account: account}} = conn, params) do
case CreateRoom.changeset(params) do
%Changeset{valid?: true} = cs ->
input = apply_changes(cs)
with {:ok, request} <- CreateRoom.parse(params) do
case Room.create(account, request) do
{:ok, room_id} ->
conn
|> put_status(200)
|> json(%{room_id: room_id})
case Room.create(account, input) do
{:ok, room_id} ->
conn
|> put_status(200)
|> json(%{room_id: room_id})
{:error, :authorization} ->
put_error(conn, :invalid_room_state)
{:error, :unknown} ->
put_error(conn, :unknown)
end
{:error, :authorization} ->
put_error(conn, :invalid_room_state)
{:error, :unknown} ->
put_error(conn, :unknown)
end
else
_ ->
put_error(conn, :bad_json)
end

20
lib/architex_web/client/request/ban.ex
View file

@ -1,20 +0,0 @@
defmodule ArchitexWeb.Client.Request.Ban do
use ArchitexWeb.Request
@type t :: %__MODULE__{
user_id: String.t(),
reason: String.t() | nil
}
@primary_key false
embedded_schema do
field :user_id, :string
field :reason, :string
end
def changeset(data, params) do
data
|> cast(params, [:user_id, :reason])
|> validate_required([:user_id])
end
end

48
lib/architex_web/client/request/create_room.ex
View file

@ -1,48 +0,0 @@
defmodule ArchitexWeb.Client.Request.CreateRoom do
use Ecto.Schema
import Ecto.Changeset
alias Ecto.Changeset
@type t :: %__MODULE__{
visibility: String.t() | nil,
room_alias_name: String.t() | nil,
name: String.t() | nil,
topic: String.t() | nil,
invite: list(String.t()) | nil,
room_version: String.t() | nil,
preset: String.t() | nil
}
@primary_key false
embedded_schema do
field :visibility, :string
field :room_alias_name, :string
field :name, :string
field :topic, :string
field :invite, {:array, :string}
field :room_version, :string
field :preset, :string
# TODO: unimplemented:
# creation_content, initial_state, invite_3pid, initial_state,
# is_direct, power_level_content_override
end
def changeset(params) do
%__MODULE__{}
|> cast(params, [
:visibility,
:room_alias_name,
:name,
:topic,
:invite,
:room_version,
:preset
])
|> validate_inclusion(:preset, ["private_chat", "public_chat", "trusted_private_chat"])
end
def get_error(%Changeset{errors: [error | _]}), do: get_error(error)
def get_error(_), do: :bad_json
end

20
lib/architex_web/client/request/kick.ex
View file

@ -1,20 +0,0 @@
defmodule ArchitexWeb.Client.Request.Kick do
use ArchitexWeb.Request
@type t :: %__MODULE__{
user_id: String.t(),
reason: String.t() | nil
}
@primary_key false
embedded_schema do
field :user_id, :string
field :reason, :string
end
def changeset(data, params) do
data
|> cast(params, [:user_id, :reason])
|> validate_required([:user_id])
end
end

38
lib/architex_web/client/request/login.ex
View file

@ -1,38 +0,0 @@
defmodule ArchitexWeb.Client.Request.Login do
use Ecto.Schema
import Ecto.Changeset
@type t :: %__MODULE__{
type: String.t(),
password: String.t(),
device_id: String.t(),
initial_device_display_name: String.t()
}
@primary_key false
embedded_schema do
field :type, :string
field :password, :string
field :device_id, :string
field :initial_device_display_name, :string
embeds_one :identifier, Identifier, primary_key: false do
field :type, :string
field :user, :string
end
end
def changeset(params) do
%__MODULE__{}
|> cast(params, [:type, :password, :device_id, :initial_device_display_name])
|> cast_embed(:identifier, with: &identifier_changeset/2, required: true)
|> validate_required([:type, :password])
end
def identifier_changeset(identifier, params) do
identifier
|> cast(params, [:type, :user])
|> validate_required([:type, :user])
end
end

31
lib/architex_web/client/request/messages.ex
View file

@ -1,31 +0,0 @@
defmodule ArchitexWeb.Client.Request.Messages do
use ArchitexWeb.Request
@type t :: %__MODULE__{
from: String.t(),
to: String.t() | nil,
dir: String.t(),
limit: integer() | nil,
filter: String.t() | nil
}
@primary_key false
embedded_schema do
field :from, :string
field :to, :string
field :dir, :string
field :limit, :integer, default: 10
field :filter, :string
end
def changeset(data, params) do
data
|> cast(params, [:from, :to, :dir, :limit, :filter], empty_values: [])
|> validate_required([:dir])
|> Architex.validate_not_nil([:from])
|> validate_inclusion(:dir, ["b", "f"])
|> validate_number(:limit, greater_than: 0)
|> validate_format(:from, ~r/^[0-9]*$/)
|> validate_format(:to, ~r/^[0-9]+$/)
end
end

41
lib/architex_web/client/request/register.ex
View file

@ -1,41 +0,0 @@
defmodule ArchitexWeb.Client.Request.Register do
use Ecto.Schema
import Ecto.Changeset
alias Ecto.Changeset
@type t :: %__MODULE__{
device_id: String.t(),
initial_device_display_name: String.t(),
password: String.t(),
username: String.t(),
inhibit_login: boolean()
}
@primary_key false
embedded_schema do
field :device_id, :string
field :initial_device_display_name, :string
field :password, :string
field :username, :string
field :inhibit_login, :boolean, default: false
end
def changeset(params) do
%__MODULE__{}
|> cast(params, [
:device_id,
:initial_device_display_name,
:password,
:username,
:inhibit_login
])
|> validate_required([:password])
end
def get_error(%Changeset{errors: [error | _]}), do: get_error(error)
def get_error({:localpart, {_, [{:constraint, :unique} | _]}}), do: :user_in_use
def get_error({:localpart, {_, [{:validation, _} | _]}}), do: :invalid_username
def get_error(_), do: :bad_json
end

14
lib/architex_web/client/request/sync.ex
View file

@ -1,14 +0,0 @@
defmodule ArchitexWeb.Client.Request.Sync do
use ArchitexWeb.Request
@type t :: %__MODULE__{}
@primary_key false
embedded_schema do
field :filter, :string
field :since, :string
field :full_state, :boolean, default: false
field :set_presence, :string, default: "online"
field :timeout, :integer, default: 0
end
end