From 4ce2f160e3aeef8e232b7fb696716cb8860ac5b2 Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 17 Mar 2025 15:18:51 -0500 Subject: [PATCH] fix(portal): Allow .local for search_domains (#8472) This apparently is explicitly used by customers. See https://firezonehq.slack.com/archives/C08FPHECLUF/p1742221580587719?thread_ts=1741639183.188459&cid=C08FPHECLUF --- .../domain/lib/domain/accounts/config/changeset.ex | 3 --- elixir/apps/domain/test/domain/accounts_test.exs | 12 ++++-------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/elixir/apps/domain/lib/domain/accounts/config/changeset.ex b/elixir/apps/domain/lib/domain/accounts/config/changeset.ex index 7273597e5..d42ac229d 100644 --- a/elixir/apps/domain/lib/domain/accounts/config/changeset.ex +++ b/elixir/apps/domain/lib/domain/accounts/config/changeset.ex @@ -31,9 +31,6 @@ defmodule Domain.Accounts.Config.Changeset do String.starts_with?(domain, ".") -> [search_domain: "must not start with a dot"] - String.ends_with?(domain, ".local") || String.ends_with?(domain, ".local.") -> - [search_domain: "must not end with .local"] - String.contains?(domain, "..") -> [search_domain: "must not contain consecutive dots"] diff --git a/elixir/apps/domain/test/domain/accounts_test.exs b/elixir/apps/domain/test/domain/accounts_test.exs index 8375344f7..241337f78 100644 --- a/elixir/apps/domain/test/domain/accounts_test.exs +++ b/elixir/apps/domain/test/domain/accounts_test.exs @@ -631,20 +631,16 @@ defmodule Domain.AccountsTest do } end - test "returns error when search_domain ends with .local", %{account: account} do + # Explicitly used by customers + test "allows search_domains that end with .local", %{account: account} do attrs = %{ config: %{ search_domain: "test.local" } } - assert {:error, changeset} = update_account_by_id(account.id, attrs) - - assert errors_on(changeset) == %{ - config: %{ - search_domain: ["must not end with .local"] - } - } + assert {:ok, account} = update_account_by_id(account.id, attrs) + assert account.config.search_domain == "test.local" end test "returns error when search_domain contains consecutive dots", %{account: account} do