git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update install controller skip set current tenant

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-01-21 09:56:51 +06:30
parent 0a5aff4c94
commit d054776357
2 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/controllers/install_controller.rb
View File

@@ -1,7 +1,6 @@
class InstallController < BaseController class InstallController < BaseController
skip_before_action :lookup_domain skip_before_action :set_current_tenant_by_subdomain_or_first
skip_before_action :verify_authenticity_token skip_before_action :verify_authenticity_token
# before_action :check_license
def index def index
end end
@@ -9,7 +8,7 @@ class InstallController < BaseController
def activate def activate
flag = "<%= ENV['AES_IV'] %>" flag = "<%= ENV['AES_IV'] %>"
key_base = "<%= ENV['secret_key_base'] %>" key_base = "<%= ENV['secret_key_base'] %>"
restaurant = params[:restaurant_name] restaurant = params[:restaurant_name]
license_key = params[:license_key] license_key = params[:license_key]
# admin_user = params[:admin_user] # admin_user = params[:admin_user]
@@ -18,20 +17,20 @@ class InstallController < BaseController
db_schema = params[:db_schema] db_schema = params[:db_schema]
db_user = params[:db_user] db_user = params[:db_user]
db_password = params[:db_password] db_password = params[:db_password]
phrase = license_key phrase = license_key
# Check Exists IV # Check Exists IV
# if flag == "<%= ENV['AES_IV'] %>" # if flag == "<%= ENV['AES_IV'] %>"
# # Export for Key # # Export for Key
# aes = MyAesCrypt.new # aes = MyAesCrypt.new
# aes_key, aes_iv = aes.export_key(phrase) # aes_key, aes_iv = aes.export_key(phrase)
# else # else
# aes_key = ENV["AES_KEY"] # aes_key = ENV["AES_KEY"]
# aes_iv = ENV["AES_IV"] # aes_iv = ENV["AES_IV"]
# end # end
@license = License.new(ENV["SX_PROVISION_URL"]) @license = License.new(ENV["SX_PROVISION_URL"])
response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password) response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password)
if response[:status] if response[:status]
redirect_to root_url, notice: response["message"] redirect_to root_url, notice: response["message"]
else else
@@ -39,28 +38,17 @@ class InstallController < BaseController
end end
end end
def check_license def lookup_domain
if License.check_license_file if (ENV["SERVER_MODE"] == "application") ||
redirect_to root_url (request.subdomain.present? && request.subdomain != "www" && ENV["SERVER_MODE"] != "cloud")
if check_license(request.host)
redirect_to root_url
end
else
not_found
end end
end end
# def lookup_domain
# if request.subdomain.present? && request.subdomain != "www"
# @license = current_license(ENV["SX_PROVISION_URL"], request.subdomain.downcase)
# if (!@license.nil?)
# # logger.info "Location - " + @license.name
# ActiveRecord::Base.establish_connection(website_connection(@license))
# # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
# else
# # reconnect_default_db
# logger.info 'License is nil'
# # redirect_to root_url(:host => request.domain) + "store_error"
# render :json => [{ status: false, message: 'Invalid Access!'}]
# end
# end
# end
# def current_license(url, key) # def current_license(url, key)
# @license = License.new(url, key) # @license = License.new(url, key)

4
config/initializers/action_controller.rb
View File

@@ -26,11 +26,11 @@ class ActionController::Base
redirect_to activate_path redirect_to activate_path
end end
else else
render_not_found not_found
end end
end end
def render_not_found def not_found
respond_to do |format| respond_to do |format|
format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found } format.html { render :file => "#{Rails.root}/public/404", :layout => false, :status => :not_found }
format.json { head :not_found } format.json { head :not_found }