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,
confirmed,
private_team_name,
team_ids)
nu = User.new(full_name: full_name,
initials: get_user_initials(full_name),
email: email,
password: password,
password_confirmation: password)
team_ids,
options = {})
nu = User.new({ full_name: full_name,
initials: get_user_initials(full_name),
email: email,
password: password,
password_confirmation: password }.merge(options))
nu.confirmed_at = Time.now if confirmed
nu.save!

View file

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

View file

@ -1,12 +1,26 @@
include UsersGenerator
# Create admin user
admin_password = 'inHisHouseAtRlyehDeadCthulhuWaitsDreaming'
create_user(
'Admin',
'admin@scinote.net',
admin_password,
true,
Constants::DEFAULT_PRIVATE_TEAM_NAME,
[]
)
if User.count.zero?
if ENV['ADMIN_NAME'].present? &&
ENV['ADMIN_EMAIL'].present? &&
ENV['ADMIN_PASSWORD'].present?
admin_name = ENV['ADMIN_NAME']
admin_email = ENV['ADMIN_EMAIL']
admin_password = ENV['ADMIN_PASSWORD']
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