Add region & maps_api_v2_template to /me config

pull/16112/head
Javier Goizueta 4 years ago
parent 8f14d0d2f9
commit 7645498c58

@ -4,6 +4,7 @@ module Carto
class UserPublicPresenter
include SqlApiHelper
include MapsApiHelper
include MapsApiV2Helper
def initialize(user)
@user = user

@ -7,6 +7,7 @@ module Carto
include OrganizationUsersHelper
include AppAssetsHelper
include MapsApiHelper
include MapsApiV2Helper
include SqlApiHelper
include CartoDB::ConfigUtils
include FrontendConfigHelper

@ -10,6 +10,7 @@ module ApplicationHelper
include FrontendConfigHelper
include AppAssetsHelper
include MapsApiHelper
include MapsApiV2Helper
include SqlApiHelper
include Carto::HtmlSafe
include CartoGearsApi::Helpers::PagesHelper
@ -64,6 +65,7 @@ module ApplicationHelper
end
module_function :maps_api_template, :maps_api_url
module_function :maps_api_v2_template, :maps_api_v2_url
module_function :sql_api_template, :sql_api_url
module_function :app_assets_base_url
@ -71,7 +73,11 @@ module ApplicationHelper
api_type = (options[:https_apis].present? && options[:https_apis]) ? 'private' : 'public'
config = {
# region: Cartodb.get_config(:bigquery_region),
# FIXME: debug
region: 'US',
maps_api_template: maps_api_template(api_type),
maps_api_v2_template: maps_api_v2_template,
user_name: CartoDB.extract_subdomain(request),
cartodb_com_hosted: Cartodb.get_config(:cartodb_com_hosted),
account_host: CartoDB.account_host,

@ -6,8 +6,10 @@ module FrontendConfigHelper
def frontend_config_hash(user = current_user)
config = {
region: Cartodb.get_config(:bigquery_region),
app_assets_base_url: app_assets_base_url,
maps_api_template: maps_api_template,
maps_api_v2_template: maps_api_v2_template,
sql_api_template: sql_api_template,
user_name: CartoDB.extract_subdomain(request),
cartodb_com_hosted: Cartodb.get_config(:cartodb_com_hosted),
@ -91,3 +93,4 @@ module FrontendConfigHelper
frontend_config_hash.to_json
end
end

@ -0,0 +1,10 @@
module MapsApiV2Helper
def maps_api_v2_template
maps_api_v2_url('{user}')
end
def maps_api_v2_url(username)
maps_api_v2_url = Cartodb.get_config(:maps_api_v2, 'url')
"#{maps_api_v2_url}/user/{user}" if maps_api_v2_url.present?
end
end

@ -12,6 +12,7 @@ module CartoGearsApi
include FrontendConfigHelper
include AppAssetsHelper
include MapsApiHelper
include MapsApiV2Helper
include SqlApiHelper
include CartoGearsApi::Helpers::UrlHelper
include CartoGearsApi::Helpers::PagesHelper

Loading…
Cancel
Save