Allow any binary string that is parsed successfully by UUID.info() as a UUID

Author: tvanderpol

lib/sequin/accounts/impersonate.ex

@@ -64,7 +64,7 @@ defmodule Sequin.Accounts.Impersonate do
   end
 
   defp find_user(user_id) do
-    if Sequin.String.uuid?(user_id) do
+    if Sequin.String.sequin_uuid?(user_id) do
       Accounts.get_user(user_id)
     else
       Accounts.get_user(email: user_id)

lib/sequin/consumers/function.ex

@@ -85,7 +85,7 @@ defmodule Sequin.Consumers.Function do
   end
 
   def where_id_or_name(query \\ base_query(), id_or_name) do
-    if Sequin.String.uuid?(id_or_name) do
+    if Sequin.String.sequin_uuid?(id_or_name) do
       where_id(query, id_or_name)
     else
       where_name(query, id_or_name)

lib/sequin/consumers/http_endpoint.ex

@@ -137,7 +137,7 @@ defmodule Sequin.Consumers.HttpEndpoint do
   end
 
   def where_id_or_name(query \\ base_query(), id_or_name) do
-    if Sequin.String.uuid?(id_or_name) do
+    if Sequin.String.sequin_uuid?(id_or_name) do
       where_id(query, id_or_name)
     else
       where_name(query, id_or_name)

lib/sequin/consumers/sink_consumer.ex

@@ -395,7 +395,7 @@ defmodule Sequin.Consumers.SinkConsumer do
   end
 
   def where_id_or_name(query \\ base_query(), id_or_name) do
-    if Sequin.String.uuid?(id_or_name) do
+    if Sequin.String.sequin_uuid?(id_or_name) do
       where_id(query, id_or_name)
     else
       where_name(query, id_or_name)

lib/sequin/databases/postgres_database.ex

@@ -141,7 +141,7 @@ defmodule Sequin.Databases.PostgresDatabase do
   end
 
   def where_id_or_name(query \\ base_query(), id_or_name) do
-    if Sequin.String.uuid?(id_or_name) do
+    if Sequin.String.sequin_uuid?(id_or_name) do
       where_id(query, id_or_name)
     else
       where_name(query, id_or_name)

lib/sequin/replication/wal_pipeline.ex

@@ -55,7 +55,7 @@ defmodule Sequin.Replication.WalPipeline do
   end
 
   def where_id_or_name(query \\ base_query(), id_or_name) do
-    if Sequin.String.uuid?(id_or_name) do
+    if Sequin.String.sequin_uuid?(id_or_name) do
       where_id(query, id_or_name)
     else
       where_name(query, id_or_name)

lib/sequin/string.ex

@@ -40,11 +40,19 @@ defmodule Sequin.String do
     end
   end
 
+  @doc """
+  Returns true if the string parses as a valid UUID format.
+  """
   def uuid?(str) when is_binary(str) do
-    str
-    |> UUID.info()
-    |> case do
-      {:ok, info} -> info[:version] in [7, 4] and info[:variant] == :rfc4122
+    match?({:ok, _}, UUID.info(str))
+  end
+
+  @doc """
+  Returns true if the string is a valid Sequin-generated UUID (v4, RFC4122 variant).
+  """
+  def sequin_uuid?(str) when is_binary(str) do
+    case UUID.info(str) do
+      {:ok, info} -> info[:version] == 4 and info[:variant] == :rfc4122
       _ -> false
     end
   end