Take org name instead of user name

config/initializers/carto_db.rb

@@ -184,7 +184,7 @@ module CartoDB
   end
 
   def self.base_domain_from_request(request)
-    subdomainless_urls? ? domainless_base_domain : subdomain_based_base_url(extract_subdomain(request))
+    subdomainless_urls? ? domainless_base_domain : subdomain_based_base_url(subdomain_from_request(request))
   end
 
   def self.ip?(string)

spec/helpers/application_helper_spec.rb

@@ -26,6 +26,7 @@ describe ApplicationHelper do
         Cartodb.stubs(:get_config).with(:app_assets, 'asset_host').returns('')
         request = mock
         request.stubs(:params).returns(user_domain: 'pepe')
+        request.stubs(:host).returns('org.localhost.lan')
 
         ApplicationHelper.stubs(:request).returns(request)
       end
@@ -34,7 +35,7 @@ describe ApplicationHelper do
         CartoDB.stubs(:subdomainless_urls?).returns(false)
         CartoDB.stubs(:session_domain).returns('.localhost.lan')
 
-        ApplicationHelper.app_assets_base_url.should eq 'http://pepe.localhost.lan/assets'
+        ApplicationHelper.app_assets_base_url.should eq 'http://org.localhost.lan/assets'
       end
 
       it 'with subdomainless urls (onpremise) returns the domain' do

spec/lib/initializers/carto_db_spec.rb

@@ -196,11 +196,11 @@ describe CartoDB do
       CartoDB.stubs(:protocol).returns('http')
 
       CartoDB.base_domain_from_request(
-        OpenStruct.new(host: 'auser.localhost.lan', params: { user_domain: 'auser' })
+        OpenStruct.new(host: 'auser.localhost.lan', params: { user_domain: 'buser' })
       ).should == "http://auser.localhost.lan#{CartoDB.http_port}"
       CartoDB.base_domain_from_request(
-        OpenStruct.new(host: 'localhost.lan', params: { user_domain: 'auser' })
-      ).should == "http://auser.localhost.lan#{CartoDB.http_port}"
+        OpenStruct.new(host: 'org.localhost.lan', params: { user_domain: 'auser' })
+      ).should == "http://org.localhost.lan#{CartoDB.http_port}"
     end
 
     it 'extracts subdomain with subdomainless urls' do