Merge pull request #951 from okriuchykhin/ok_SCI_1949

Allow first user seeding from env variables [SCI-1949]
This commit is contained in:
okriuchykhin 2018-01-23 14:02:54 +01:00 committed by GitHub
commit a2896031ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 16 deletions

View file

@ -23,12 +23,13 @@ module UsersGenerator
password, password,
confirmed, confirmed,
private_team_name, private_team_name,
team_ids) team_ids,
nu = User.new(full_name: full_name, options = {})
initials: get_user_initials(full_name), nu = User.new({ full_name: full_name,
email: email, initials: get_user_initials(full_name),
password: password, email: email,
password_confirmation: password) password: password,
password_confirmation: password }.merge(options))
nu.confirmed_at = Time.now if confirmed nu.confirmed_at = Time.now if confirmed
nu.save! nu.save!

View file

@ -50,4 +50,6 @@ class Extends
API_PLUGABLE_AUTH_METHODS = [] API_PLUGABLE_AUTH_METHODS = []
OMNIAUTH_PROVIDERS = [] OMNIAUTH_PROVIDERS = []
INITIAL_USER_OPTIONS = {}
end end

View file

@ -1,12 +1,26 @@
include UsersGenerator include UsersGenerator
# Create admin user if User.count.zero?
admin_password = 'inHisHouseAtRlyehDeadCthulhuWaitsDreaming' if ENV['ADMIN_NAME'].present? &&
create_user( ENV['ADMIN_EMAIL'].present? &&
'Admin', ENV['ADMIN_PASSWORD'].present?
'admin@scinote.net', admin_name = ENV['ADMIN_NAME']
admin_password, admin_email = ENV['ADMIN_EMAIL']
true, admin_password = ENV['ADMIN_PASSWORD']
Constants::DEFAULT_PRIVATE_TEAM_NAME, else
[] admin_name = 'Admin'
) admin_email = 'admin@scinote.net'
admin_password = 'inHisHouseAtRlyehDeadCthulhuWaitsDreaming'
end
# Create admin user
create_user(
admin_name,
admin_email,
admin_password,
true,
Constants::DEFAULT_PRIVATE_TEAM_NAME,
[],
Extends::INITIAL_USER_OPTIONS
)
end