misc fixes

CaptainFact · Jan 23, 2025 · 02ce7e2 · 02ce7e2
1 parent 401b211
commit 02ce7e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/apps/cf_jobs/lib/application.ex b/apps/cf_jobs/lib/application.ex
@@ -23,7 +23,7 @@ defmodule CF.Jobs.Application do
 
     # Do not start scheduler in tests
     children =
-      if env == :test,
+      if env == :test or Application.get_env(:cf, :disable_scheduler),
         do: children,
         else: children ++ [worker(CF.Jobs.Scheduler, [])]
 

diff --git a/apps/db/lib/db_schema/user.ex b/apps/db/lib/db_schema/user.ex
@@ -86,6 +86,15 @@ defmodule DB.Schema.User do
     |> common_changeset(params)
     |> validate_length(:password, min: 6, max: 256)
     |> put_encrypted_pw
+    |> set_unconfirmed_if_new_email(model, params)
+  end
+
+  defp set_unconfirmed_if_new_email(changeset, model, %{"email" => email}) do
+    if model && !is_nil(email) && email != model.email do
+      put_change(changeset, :email_confirmed, false)
+    else
+      changeset
+    end
   end
 
   @doc """