Add remote request capability

test/birdy_chat_web/api/messages_test.exs

@@ -1,8 +1,6 @@
 defmodule BirdyChatWeb.Api.MessagesTest do
   use BirdyChatWeb.ConnCase, async: true
 
-  import Phoenix.ChannelTest
-
   setup %{conn: conn} do
     url = ~p"/api/messages"
 
@@ -17,18 +15,6 @@ defmodule BirdyChatWeb.Api.MessagesTest do
   end
 
   describe "POST /api/messages to other server" do
-    setup do
-      server_id = "test2"
-      token = Phoenix.Token.sign(BirdyChatWeb.Endpoint, "serverAuth", server_id)
-
-      {:ok, _, socket} =
-        BirdyChatWeb.ServerSocket
-        |> socket("server_socket", %{server_id: server_id})
-        |> subscribe_and_join(BirdyChatWeb.ServerChannel, "server:#{server_id}", %{token: token})
-
-      %{socket: socket}
-    end
-
     test "returns error when a peer is unknown", %{conn: conn, url: url} do
       message = %{from: "test1-user", to: "fake-user", message: "123"}
 
@@ -41,7 +27,7 @@ defmodule BirdyChatWeb.Api.MessagesTest do
       assert result == expected_result
     end
 
-    test "broadcasts message to websocket", %{conn: conn, url: url} do
+    test "send message to the other server via HTTP", %{conn: conn, url: url} do
       message = %{from: "test1-user", to: "test2-user", message: "123"}
 
       string_message = %{
@@ -52,6 +38,26 @@ defmodule BirdyChatWeb.Api.MessagesTest do
         "server" => "test2"
       }
 
+      Req.Test.expect(BirdyChat.Dispatcher, fn conn ->
+        expected_body_params = %{
+          "from" => "test1-user",
+          "message" => "123",
+          "routing" => "remote",
+          "server" => "test2",
+          "to" => "test2-user"
+        }
+
+        {"authorization", token} =
+          Enum.find(conn.req_headers, fn {key, _v} -> key == "authorization" end)
+
+        {:ok, "test2-user"} =
+          Phoenix.Token.verify(BirdyChatWeb.Endpoint, "serverAuth", token, max_age: 1200)
+
+        assert conn.body_params == expected_body_params
+        resp = Jason.encode!(expected_body_params)
+        Plug.Conn.send_resp(conn, :created, resp)
+      end)
+
       payload = Jason.encode!(message)
       conn = post(conn, url, payload)
       assert result = json_response(conn, :created)

test/birdy_chat_web/channels/server_channel_test.exs

@@ -1,81 +0,0 @@
-defmodule BirdyChatWeb.ServerChannelTest do
-  use BirdyChatWeb.ChannelCase, async: true
-
-  setup do
-    server_id = "test2"
-    token = Phoenix.Token.sign(BirdyChatWeb.Endpoint, "serverAuth", server_id)
-
-    path = Application.app_dir(:birdy_chat, ["priv", "messages", "test-user.txt"])
-    on_exit(fn -> File.rm(path) end)
-
-    {:ok, _, socket} =
-      BirdyChatWeb.ServerSocket
-      |> socket("server_socket", %{server_id: server_id})
-      |> subscribe_and_join(BirdyChatWeb.ServerChannel, "server:#{server_id}", %{token: token})
-
-    %{socket: socket}
-  end
-
-  describe "authorization" do
-    test "requires a signed token to join a channel" do
-      server_id = "test2"
-      token = Phoenix.Token.sign(BirdyChatWeb.Endpoint, "fakeAuth", server_id)
-
-      result =
-        BirdyChatWeb.ServerSocket
-        |> socket("server_socket", %{server_id: server_id})
-        |> subscribe_and_join(BirdyChatWeb.ServerChannel, "server:#{server_id}", %{token: token})
-
-      assert result == {:error, %{reason: "unauthorised"}}
-    end
-
-    test "requires server id in token and in channel to match" do
-      server_id = "test2"
-      token = Phoenix.Token.sign(BirdyChatWeb.Endpoint, "serverAuth", server_id)
-
-      result =
-        BirdyChatWeb.ServerSocket
-        |> socket("server_socket", %{server_id: server_id})
-        |> subscribe_and_join(BirdyChatWeb.ServerChannel, "server:fake", %{token: token})
-
-      assert result == {:error, %{reason: "unauthorised"}}
-    end
-  end
-
-  describe "new_message" do
-    test "receives message from other server and saves it locally", %{socket: socket} do
-      message = %{from: "test2-user", to: "test-user", message: "123"}
-      bin = :erlang.term_to_binary(message)
-      ref = push(socket, "new_message", {:binary, bin})
-      assert_reply ref, :ok, {:binary, ^bin}
-
-      path = Application.app_dir(:birdy_chat, ["priv", "messages", "test-user.txt"])
-      contents = File.read!(path)
-      assert contents == "test2-user: 123\n"
-    end
-
-    test "blows up when sent payload is not safe to decode", %{socket: socket} do
-      # This unsafe binary is taken from erlang docs directly:
-      bin = <<131, 119, 8, "tjenixen">>
-      Process.flag(:trap_exit, true)
-      push(socket, "new_message", {:binary, bin})
-
-      assert_receive {:EXIT, _pid,
-                      {:badarg,
-                       [
-                         {:erlang, :binary_to_term,
-                          [<<131, 119, 8, 116, 106, 101, 110, 105, 120, 101, 110>>, [:safe]],
-                          [error_info: %{module: :erl_erts_errors}]},
-                         {BirdyChatWeb.ServerChannel, :handle_in, 3,
-                          [file: ~c"lib/birdy_chat_web/channels/server_channel.ex", line: 15]},
-                         {Phoenix.Channel.Server, :handle_info, 2,
-                          [file: ~c"lib/phoenix/channel/server.ex", line: 332]},
-                         {:gen_server, :try_handle_info, 3,
-                          [file: ~c"gen_server.erl", line: 2434]},
-                         {:gen_server, :handle_msg, 3, [file: ~c"gen_server.erl", line: 2420]},
-                         {:proc_lib, :init_p_do_apply, 3, [file: ~c"proc_lib.erl", line: 333]}
-                       ]}},
-                     100
-    end
-  end
-end