Remove .make_first_user_admin setting

GrottoPress · Feb 16, 2025 · d839c96 · d839c96
1 parent 693bc98
commit d839c96
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 16 deletions.
diff --git a/.github/workflows/deploy.staging.yml b/.github/workflows/deploy.staging.yml
@@ -116,7 +116,6 @@ jobs:
           LOGIN_EXPIRY: '86400' # 1 day
           LOGIN_IDLE_TIMEOUT: '1800' # 30 minutes
           LOGO_URL: /logo.png
-          MAKE_FIRST_USER_ADMIN: 'true'
           NAME: penny
           PASSWORD_MIN_LENGTH: '4'
           PASSWORD_REQUIRE_LOWERCASE: 'false'

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -108,7 +108,6 @@ jobs:
           LOGIN_EXPIRY: '86400' # 1 day
           LOGIN_IDLE_TIMEOUT: '1800' # 30 minutes
           LOGO_URL: /logo.png
-          MAKE_FIRST_USER_ADMIN: 'true'
           NAME: penny
           PASSWORD_MIN_LENGTH: '4'
           PASSWORD_REQUIRE_LOWERCASE: 'false'

diff --git a/config/app.cr b/config/app.cr
@@ -12,9 +12,6 @@ App.configure do |settings|
   settings.email_from = ENV["EMAIL_FROM"]
   settings.email_reply_to = ENV["EMAIL_REPLY_TO"]
 
-  settings.make_first_user_admin = Bool.adapter
-    .parse!(ENV["MAKE_FIRST_USER_ADMIN"])
-
   settings.keep_bearer_logins_for = Time::Span.new(
     days: ENV["KEEP_BEARER_LOGINS_DAYS"].to_i
   )

diff --git a/fly.staging.toml b/fly.staging.toml
@@ -37,7 +37,6 @@ swap_size_mb = 256
   LOGIN_EXPIRY = '86400' # 1 day
   LOGIN_IDLE_TIMEOUT = '1800' # 30 minutes
   LOGO_URL = '/logo.png'
-  MAKE_FIRST_USER_ADMIN = 'false'
   NAME = 'Penny (staging)'
   PASSWORD_MIN_LENGTH = '4'
   PASSWORD_REQUIRE_LOWERCASE = 'false'

diff --git a/fly.toml b/fly.toml
@@ -37,7 +37,6 @@ swap_size_mb = 256
   LOGIN_EXPIRY = '86400' # 1 day
   LOGIN_IDLE_TIMEOUT = '1800' # 30 minutes
   LOGO_URL = '/logo.png'
-  MAKE_FIRST_USER_ADMIN = 'false'
   NAME = 'Penny'
   PASSWORD_MIN_LENGTH = '12'
   PASSWORD_REQUIRE_LOWERCASE = 'true'

diff --git a/sample.env.yml b/sample.env.yml
@@ -12,13 +12,6 @@
 
 lucky_env: development # Set to `production` in production
 
-# Set this to `"true"` to make the first user
-# to register an "admin"
-#
-# After the first user is registered, set this
-# back to `"false"` and restart the app process
-make_first_user_admin: 'false'
-
 name: My App
 url: http://localhost:5000
 

diff --git a/src/app_settings.cr b/src/app_settings.cr
@@ -8,7 +8,6 @@ module App
     setting keep_logins_for : Time::Span
     setting keep_password_resets_for : Time::Span
     setting logo_url : String
-    setting make_first_user_admin : Bool
     setting name : String
     setting timezone : Time::Location?
     setting url : String

diff --git a/src/operations/register_current_user.cr b/src/operations/register_current_user.cr
@@ -9,8 +9,9 @@ class RegisterCurrentUser < User::SaveOperation
   include Mixins::ValidateNotPwned
   include Shield::SendWelcomeEmail
 
+  # Makes first user admin
   private def set_level
-    if App.settings.make_first_user_admin && UserQuery.new.none?
+    if UserQuery.new.none?
       level.value = UserLevel.new(:admin)
     else
       level.value = UserLevel.new(:author)