From b7827fee6aeac26e47d856b5a0df1b26e3f280ab Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 22 Dec 2020 15:50:08 +0200 Subject: [PATCH] Increase postmark timeout --- config/config.exs | 1 + config/releases.exs | 1 + lib/plausible_web/controllers/auth_controller.ex | 2 +- lib/plausible_web/plugs/require_account.ex | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/config.exs b/config/config.exs index edddcbc64..91c91649f 100644 --- a/config/config.exs +++ b/config/config.exs @@ -156,6 +156,7 @@ case mailer_adapter do "Bamboo.PostmarkAdapter" -> config :plausible, Plausible.Mailer, adapter: :"Elixir.#{mailer_adapter}", + request_options: [recv_timeout: 10_000], api_key: System.get_env("POSTMARK_API_KEY") "Bamboo.SMTPAdapter" -> diff --git a/config/releases.exs b/config/releases.exs index 78fa2f57c..d3752d635 100644 --- a/config/releases.exs +++ b/config/releases.exs @@ -106,6 +106,7 @@ case mailer_adapter do "Bamboo.PostmarkAdapter" -> config :plausible, Plausible.Mailer, adapter: :"Elixir.#{mailer_adapter}", + request_options: [recv_timeout: 10_000], api_key: System.get_env("POSTMARK_API_KEY") "Bamboo.SMTPAdapter" -> diff --git a/lib/plausible_web/controllers/auth_controller.ex b/lib/plausible_web/controllers/auth_controller.ex index 915e46b0d..2408c6224 100644 --- a/lib/plausible_web/controllers/auth_controller.ex +++ b/lib/plausible_web/controllers/auth_controller.ex @@ -8,7 +8,7 @@ defmodule PlausibleWeb.AuthController do when action in [:register_form, :register, :login_form, :login] plug PlausibleWeb.RequireAccountPlug - when action in [:user_settings, :save_settings, :delete_me, :password_form, :set_password] + when action in [:user_settings, :save_settings, :delete_me, :password_form, :set_password, :activate_form] def register_form(conn, _params) do if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do diff --git a/lib/plausible_web/plugs/require_account.ex b/lib/plausible_web/plugs/require_account.ex index 250bcce8d..ee0c6ebdb 100644 --- a/lib/plausible_web/plugs/require_account.ex +++ b/lib/plausible_web/plugs/require_account.ex @@ -14,7 +14,7 @@ defmodule PlausibleWeb.RequireAccountPlug do |> Phoenix.Controller.redirect(to: "/login") |> halt - not user.email_verified -> + not user.email_verified and conn.path_info != ["activate"] -> conn |> Phoenix.Controller.redirect(to: "/activate") |> halt