Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

This commit is contained in:
phyusin
2017-12-08 12:05:47 +06:30
2 changed files with 15 additions and 15 deletions

View File

@@ -55,21 +55,10 @@ class ApplicationController < ActionController::Base
end
end
def cache_license(url, lookup)
flag = ENV["AES_IV"]
@license = License.new(url, lookup)
def cache_license(url, lookup)
@license = License.new(url, lookup)
# Check Exists IV
if flag == "<%= ENV['AES_IV'] %>"
# Export for Key
aes = MyAesCrypt.new
aes_key, aes_iv = aes.export_key(lookup)
else
aes_key = ENV["AES_KEY"]
aes_iv = ENV["AES_IV"]
end
if (@license.detail_with_local_cache(lookup, aes_key, aes_iv) == true)
if (@license.detail_with_local_cache(lookup) == true)
return @license
else
return nil

View File

@@ -23,7 +23,18 @@ class License
# @params = { query: { device: "SX", token: SECRETS_CONFIG['provision_key'] } }
end
def detail_with_local_cache(lookup, key, iv)
def detail_with_local_cache(lookup)
subdomain = request.subdomain.downcase
flag = ENV["AES_IV"]
# Check Exists IV
if flag == "<%= ENV['AES_IV'] %>"
# Export for Key
aes = MyAesCrypt.new
aes_key, aes_iv = aes.export_key(lookup)
else
aes_key = ENV["AES_KEY"]
aes_iv = ENV["AES_IV"]
end
##Check from local redis - if available load local otherwise get from remote
cache_key = "#{lookup}:license:#{key}:hostname"