Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds "invite_only" disable_registration config option #1841

Merged
merged 7 commits into from
May 3, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions config/runtime.exs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ enable_email_verification =
disable_registration =
config_dir
|> get_var_from_path_or_env("DISABLE_REGISTRATION", "false")
|> String.to_existing_atom()

hcaptcha_sitekey = get_var_from_path_or_env(config_dir, "HCAPTCHA_SITEKEY")
hcaptcha_secret = get_var_from_path_or_env(config_dir, "HCAPTCHA_SECRET")
Expand Down Expand Up @@ -200,7 +199,7 @@ config :plausible,
config :plausible, :selfhost,
disable_authentication: disable_auth,
enable_email_verification: enable_email_verification,
disable_registration: if(!disable_auth, do: disable_registration, else: false)
disable_registration: if(!disable_auth, do: disable_registration, else: "false")

config :plausible, PlausibleWeb.Endpoint,
url: [scheme: base_url.scheme, host: base_url.host, path: base_url.path, port: base_url.port],
Expand Down
10 changes: 6 additions & 4 deletions lib/plausible_web/controllers/auth_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ defmodule PlausibleWeb.AuthController do
]

def register_form(conn, _params) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) !=
"false" do
redirect(conn, to: Routes.auth_path(conn, :login_form))
else
changeset = Plausible.Auth.User.changeset(%Plausible.Auth.User{})
Expand All @@ -38,7 +39,8 @@ defmodule PlausibleWeb.AuthController do
end

def register(conn, params) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) !=
"false" do
redirect(conn, to: Routes.auth_path(conn, :login_form))
else
user = Plausible.Auth.User.new(params["user"])
Expand Down Expand Up @@ -74,7 +76,7 @@ defmodule PlausibleWeb.AuthController do
end

def register_from_invitation_form(conn, %{"invitation_id" => invitation_id}) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) == "true" do
redirect(conn, to: Routes.auth_path(conn, :login_form))
else
invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)
Expand All @@ -97,7 +99,7 @@ defmodule PlausibleWeb.AuthController do
end

def register_from_invitation(conn, %{"invitation_id" => invitation_id} = params) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) do
if Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) == "true" do
redirect(conn, to: Routes.auth_path(conn, :login_form))
else
invitation = Repo.get_by(Plausible.Auth.Invitation, invitation_id: invitation_id)
Expand Down
2 changes: 1 addition & 1 deletion lib/plausible_web/templates/auth/login_form.html.eex
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<p class="text-gray-500 text-xs my-2">Forgot password? <a href="/password/request-reset" class="underline text-gray-800 dark:text-gray-50">Click here</a> to reset it.</p>
</div>
<%= submit "Login →", class: "button mt-4 w-full" %>
<%= if !Keyword.fetch!(Application.get_env(:plausible, :selfhost),:disable_registration) do %>
<%= if Keyword.fetch!(Application.get_env(:plausible, :selfhost),:disable_registration) == "false" do %>
<p class="text-center text-gray-500 text-xs mt-4">
Don't have an account? <%= link("Register", to: "/register", class: "text-gray-800 dark:text-gray-50 underline") %> instead.
</p>
Expand Down
2 changes: 1 addition & 1 deletion lib/plausible_web/templates/layout/_header.html.eex
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
</div>
</li>
</ul>
<% Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) -> %>
<% Keyword.fetch!(Application.get_env(:plausible, :selfhost), :disable_registration) != "false" -> %>
<ul class="flex" x-show="!document.cookie.includes('logged_in=true')">
<li>
<div class="inline-flex">
Expand Down
4 changes: 2 additions & 2 deletions test/plausible_web/controllers/admin_auth_controller_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ defmodule PlausibleWeb.AdminAuthControllerTest do
end

test "disable registration", %{conn: conn} do
set_config(disable_registration: true)
set_config(disable_registration: "true")
conn = get(conn, "/register")
assert redirected_to(conn) == "/login"
end
Expand All @@ -39,7 +39,7 @@ defmodule PlausibleWeb.AdminAuthControllerTest do
def set_config(config) do
updated_config =
Keyword.merge(
[disable_authentication: false, disable_registration: false],
[disable_authentication: false, disable_registration: "false"],
config
)

Expand Down