fix: use gen_rpc on Authorization remote calls(#1465)

edgurgel · web-flow · commit 07c06aa449e1 · 2025-07-17T16:47:57.000+12:00
diff --git a/lib/realtime/tenants/authorization.ex b/lib/realtime/tenants/authorization.ex
@@ -9,14 +9,13 @@ defmodule Realtime.Tenants.Authorization do
 
   Check more information at Realtime.Tenants.Authorization.Policies
   """
-  require Logger
   import Ecto.Query
 
   alias DBConnection.ConnectionError
   alias Realtime.Api.Message
   alias Realtime.Database
   alias Realtime.Repo
-  alias Realtime.Rpc
+  alias Realtime.GenRpc
   alias Realtime.Tenants.Authorization.Policies
 
   defstruct [:tenant_id, :topic, :headers, :jwt, :claims, :role]
@@ -70,12 +69,13 @@ defmodule Realtime.Tenants.Authorization do
 
   # Remote call
   def get_read_authorizations(policies, db_conn, authorization_context) do
-    case Rpc.enhanced_call(
+    case GenRpc.call(
            node(db_conn),
            __MODULE__,
            :get_read_authorizations,
            [policies, db_conn, authorization_context],
-           tenant_id: authorization_context.tenant_id
+           tenant_id: authorization_context.tenant_id,
+           key: authorization_context.tenant_id
          ) do
       {:error, :rpc_error, reason} -> {:error, reason}
       response -> response
@@ -100,12 +100,13 @@ defmodule Realtime.Tenants.Authorization do
 
   # Remote call
   def get_write_authorizations(policies, db_conn, authorization_context) do
-    case Rpc.enhanced_call(
+    case GenRpc.call(
            node(db_conn),
            __MODULE__,
            :get_write_authorizations,
            [policies, db_conn, authorization_context],
-           tenant_id: authorization_context.tenant_id
+           tenant_id: authorization_context.tenant_id,
+           key: authorization_context.tenant_id
          ) do
       {:error, :rpc_error, reason} -> {:error, reason}
       response -> response
diff --git a/mix.exs b/mix.exs
@@ -4,7 +4,7 @@ defmodule Realtime.MixProject do
   def project do
     [
       app: :realtime,
-      version: "2.41.1",
+      version: "2.41.2",
       elixir: "~> 1.17.3",
       elixirc_paths: elixirc_paths(Mix.env()),
       start_permanent: Mix.env() == :prod,
diff --git a/test/realtime/tenants/authorization_remote_test.exs b/test/realtime/tenants/authorization_remote_test.exs
@@ -93,36 +93,29 @@ defmodule Realtime.Tenants.AuthorizationRemoteTest do
 
       Process.sleep(100)
 
-      log =
-        capture_log(fn ->
-          t1 =
-            Task.async(fn ->
-              assert {:error, :increase_connection_pool} =
-                       Authorization.get_read_authorizations(
-                         %Policies{},
-                         context.db_conn,
-                         context.authorization_context
-                       )
-            end)
-
-          t2 =
-            Task.async(fn ->
-              assert {:error, :increase_connection_pool} =
-                       Authorization.get_write_authorizations(
-                         %Policies{},
-                         context.db_conn,
-                         context.authorization_context
-                       )
-            end)
-
-          Task.await_many([t1, t2], 20_000)
-          # Wait for logs to arrive from remote node
-          Process.sleep(200)
+      t1 =
+        Task.async(fn ->
+          assert {:error, :increase_connection_pool} =
+                   Authorization.get_read_authorizations(
+                     %Policies{},
+                     context.db_conn,
+                     context.authorization_context
+                   )
         end)
 
-      external_id = context.tenant.external_id
-      assert log =~ "project=#{external_id} external_id=#{external_id} [error] ErrorExecutingTransaction"
+      t2 =
+        Task.async(fn ->
+          assert {:error, :increase_connection_pool} =
+                   Authorization.get_write_authorizations(
+                     %Policies{},
+                     context.db_conn,
+                     context.authorization_context
+                   )
+        end)
 
+      Task.await_many([t1, t2], 20_000)
+      # Wait for logs to arrive from remote node
+      Process.sleep(200)
       Task.await(task, :timer.seconds(30))
     end
 
@@ -170,12 +163,12 @@ defmodule Realtime.Tenants.AuthorizationRemoteTest do
     @describetag role: "anon", policies: []
 
     test "get_read_authorizations", context do
-      # Grab a remote pid that will not exist in the near future. :erpc uses a new process to perform the call.
+      # Grab a remote pid that will not exist in the near future. :gen_rpc uses a new process to perform the call.
       # Once it has returned the process is not alive anymore
       db_conn = :erpc.call(context.node, :erlang, :self, [])
 
       assert capture_log(fn ->
-               {:error, {:noproc, {DBConnection.Holder, :checkout, [^db_conn, _]}}} =
+               {:error, {:EXIT, {:noproc, {DBConnection.Holder, :checkout, [^db_conn, _]}}}} =
                  Authorization.get_read_authorizations(
                    %Policies{},
                    db_conn,
@@ -185,12 +178,12 @@ defmodule Realtime.Tenants.AuthorizationRemoteTest do
     end
 
     test "get_write_authorizations", context do
-      # Grab a remote pid that will not exist in the near future. :erpc uses a new process to perform the call.
+      # Grab a remote pid that will not exist in the near future. :gen_rpc uses a new process to perform the call.
       # Once it has returned the process is not alive anymore
       db_conn = :erpc.call(context.node, :erlang, :self, [])
 
       assert capture_log(fn ->
-               {:error, {:noproc, {DBConnection.Holder, :checkout, [^db_conn, _]}}} =
+               {:error, {:EXIT, {:noproc, {DBConnection.Holder, :checkout, [^db_conn, _]}}}} =
                  Authorization.get_write_authorizations(
                    %Policies{},
                    db_conn,

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ defmodule Realtime.MixProject do`
`4`	`4`	`def project do`
`5`	`5`	`[`
`6`	`6`	`app: :realtime,`
`7`		`- version: "2.41.1",`
	`7`	`+ version: "2.41.2",`
`8`	`8`	`elixir: "~> 1.17.3",`
`9`	`9`	`elixirc_paths: elixirc_paths(Mix.env()),`
`10`	`10`	`start_permanent: Mix.env() == :prod,`