Merge pull request #16112 from CartoDB/feature/ch133275/return-region-and-maps-api-endpoint-at-me

Add region & maps_api_v2_template to /me config

NEWS.md

@@ -20,6 +20,7 @@ sudo make install
 
 ### Bug fixes / enhancements
 
+- Include region & maps_api_v2_template in /me config [16112](https://github.com/CartoDB/cartodb/pull/16112)
 - Raise limit of Box files listed [16082](https://github.com/CartoDB/cartodb/pull/16082)
 - Change url Map Loads docs. in quota section [16068](https://github.com/CartoDB/cartodb/pull/16068)
 - Rake task for renaming BQ connector [16030](https://github.com/CartoDB/cartodb/pull/16030)

app/controllers/carto/api/public/user_public_presenter.rb

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

app/controllers/carto/api/users_controller.rb

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

app/helpers/application_helper.rb

@@ -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,

app/helpers/frontend_config_helper.rb

@@ -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
+

app/helpers/maps_api_v2_helper.rb

@@ -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

gears/carto_gears_api/lib/carto_gears_api/helpers/gear_controller_helper.rb

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