aaron_nad/cannery
1
0
Fork 0
forked from shibao/cannery
Code Pull Requests Activity

fix bug with public registration being disabled

Browse Source
This commit is contained in:
shibao 2023-02-04 09:55:38 -05:00 committed by oliviasculley
parent 1fbed50b0f
commit f19d024d8a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.exs
View File

@ -11,6 +11,8 @@ config :lokal,
ecto_repos: [Lokal.Repo], ecto_repos: [Lokal.Repo],
generators: [binary_id: true] generators: [binary_id: true]
config :lokal, Lokal.Accounts, registration: System.get_env("REGISTRATION", "invite")
# Configures the endpoint # Configures the endpoint
config :lokal, LokalWeb.Endpoint, config :lokal, LokalWeb.Endpoint,
url: [scheme: "https", host: System.get_env("HOST") || "localhost", port: "443"], url: [scheme: "https", host: System.get_env("HOST") || "localhost", port: "443"],
@ -18,8 +20,7 @@ config :lokal, LokalWeb.Endpoint,
secret_key_base: "KH59P0iZixX5gP/u+zkxxG8vAAj6vgt0YqnwEB5JP5K+E567SsqkCz69uWShjE7I", secret_key_base: "KH59P0iZixX5gP/u+zkxxG8vAAj6vgt0YqnwEB5JP5K+E567SsqkCz69uWShjE7I",
render_errors: [view: LokalWeb.ErrorView, accepts: ~w(html json), layout: false], render_errors: [view: LokalWeb.ErrorView, accepts: ~w(html json), layout: false],
pubsub_server: Lokal.PubSub, pubsub_server: Lokal.PubSub,
live_view: [signing_salt: "zOLgd3lr"], live_view: [signing_salt: "zOLgd3lr"]
registration: System.get_env("REGISTRATION") || "invite"
config :lokal, Lokal.Application, automigrate: false config :lokal, Lokal.Application, automigrate: false

5
config/runtime.exs
View File

@ -42,6 +42,8 @@ config :lokal, Lokal.Repo,
pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")), pool_size: String.to_integer(System.get_env("POOL_SIZE", "10")),
socket_options: maybe_ipv6 socket_options: maybe_ipv6
config :lokal, Lokal.Accounts, registration: System.get_env("REGISTRATION", "invite")
config :lokal, LokalWeb.Endpoint, config :lokal, LokalWeb.Endpoint,
url: [scheme: "https", host: host, port: 443], url: [scheme: "https", host: host, port: 443],
http: [ http: [
@ -50,8 +52,7 @@ config :lokal, LokalWeb.Endpoint,
ip: interface, ip: interface,
port: String.to_integer(System.get_env("PORT", "4000")) port: String.to_integer(System.get_env("PORT", "4000"))
], ],
server: true, server: true
registration: System.get_env("REGISTRATION", "invite")
if config_env() == :prod do if config_env() == :prod do
# The secret key base is used to sign/encrypt cookies and other secrets. # The secret key base is used to sign/encrypt cookies and other secrets.

2
lib/lokal/accounts.ex
View File

@ -384,7 +384,7 @@ defmodule Lokal.Accounts do
""" """
@spec allow_registration?() :: boolean() @spec allow_registration?() :: boolean()
def allow_registration? do def allow_registration? do
Application.get_env(:Lokal, LokalWeb.Endpoint)[:registration] == "public" or Application.get_env(:lokal, Lokal.Accounts)[:registration] == "public" or
list_users_by_role(:admin) |> Enum.empty?() list_users_by_role(:admin) |> Enum.empty?()
end end