Implement logout and logout/all endpoints

lib/matrix_server_web/controllers/account_controller.ex

@@ -4,7 +4,7 @@ defmodule MatrixServerWeb.AccountController do
   import MatrixServer
   import MatrixServerWeb.Plug.Error
 
-  alias MatrixServer.Account
+  alias MatrixServer.{Account, Repo}
   alias Plug.Conn
 
   def available(conn, params) do
@@ -28,4 +28,24 @@ defmodule MatrixServerWeb.AccountController do
     |> put_status(200)
     |> json(data)
   end
+
+  def logout(%Conn{assigns: %{device: device}} = conn, _params) do
+    case Repo.delete(device) do
+      {:ok, _} ->
+        conn
+        |> put_status(200)
+        |> json(%{})
+
+      {:error, _} ->
+        put_error(conn, :unknown)
+    end
+  end
+
+  def logout_all(%Conn{assigns: %{account: account}} = conn, _params) do
+    Repo.delete_all(Ecto.assoc(account, :devices))
+
+    conn
+    |> put_status(200)
+    |> json(%{})
+  end
 end

lib/matrix_server_web/controllers/auth_controller.ex

@@ -130,30 +130,9 @@ defmodule MatrixServerWeb.AuthController do
             device_id = Map.get(params, :device_id, Device.generate_device_id(localpart))
             access_token = Device.generate_access_token(localpart, device_id)
 
-            update_query =
-              from(d in Device)
-              |> update(set: [access_token: ^access_token, device_id: ^device_id])
-
-            update_query =
-              if params[:display_name] != nil do
-                update(update_query, set: [display_name: ^params.display_name])
-              else
-                update_query
-              end
-
-            result =
-              Ecto.build_assoc(account, :devices)
-              |> Map.put(:device_id, device_id)
-              |> Map.put(:access_token, access_token)
-              |> Device.changeset(params)
-              |> repo.insert(on_conflict: update_query, conflict_target: [:localpart, :device_id])
-
-            case result do
-              {:ok, device} ->
-                device
-
-              {:error, _cs} ->
-                repo.rollback(:forbidden)
+            case Device.login(account, device_id, access_token, params) do
+              {:ok, device} -> device
+              {:error, _cs} -> repo.rollback(:forbidden)
             end
           else
             repo.rollback(:forbidden)