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

doemal or other api token added

Browse Source
This commit is contained in:
Yan
2018-04-11 17:20:17 +06:30
parent 53388248e9
commit b730c78afe
8 changed files with 26 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/api_controller.rb
View File

@@ -32,7 +32,7 @@ class Api::ApiController < ActionController::API
ActiveRecord::Base.establish_connection(website_connection(@license))
# authenticate_session_token
# logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
else8
else
# reconnect_default_db
logger.info 'License is nil'
# redirect_to root_url(:host => request.domain) + "store_error"

14
app/controllers/concerns/token_verification.rb
View File

@@ -13,16 +13,16 @@ module TokenVerification
authenticate_token || render_unauthorized
end
def authenticate_token
authenticate_with_http_token do |token, options|
def authenticate_token
authenticate_with_http_token do |token, options|
# Rails.logger.debug "token - " + token.to_s
if(!options.from.nil? && options.from == "DOEMAL"){
if(ENV["SERVER_MODE"] === "cloud"){
from = request.subdomain.downcase + "." + request.domain.downcase
if(options.length !=0 && options["from"] == "DOEMAL")
if(ENV["SERVER_MODE"] === "cloud")
from = request.subdomain.downcase + "." + request.domain.downcase
aes = MyAesCrypt.new
return aes.checkKeyForAuth(from, token)
}
}
end
end
@user = Employee.authenticate_by_token(token)
if @user