| <%= tenant.name %> |
<%= tenant.schema %> |
+ <%= tenant.host %> |
<%= render Admin::TableActionsComponent.new(tenant, actions: [:edit]) do |actions| %>
<%= actions.action(:show, text: t("admin.shared.view"), path: root_url(host: tenant.host)) %>
diff --git a/app/controllers/admin/tenants_controller.rb b/app/controllers/admin/tenants_controller.rb
index 020118ebf..a43e88166 100644
--- a/app/controllers/admin/tenants_controller.rb
+++ b/app/controllers/admin/tenants_controller.rb
@@ -30,6 +30,6 @@ class Admin::TenantsController < Admin::BaseController
private
def tenant_params
- params.require(:tenant).permit(:name, :schema)
+ params.require(:tenant).permit(:name, :schema, :schema_type)
end
end
diff --git a/app/models/tenant.rb b/app/models/tenant.rb
index d01f610ba..54a254c39 100644
--- a/app/models/tenant.rb
+++ b/app/models/tenant.rb
@@ -1,4 +1,6 @@
class Tenant < ApplicationRecord
+ enum schema_type: %w[subdomain domain]
+
validates :schema,
presence: true,
uniqueness: true,
@@ -10,12 +12,26 @@ class Tenant < ApplicationRecord
after_update :rename_schema
after_destroy :destroy_schema
+ def self.find_by_domain(host)
+ domain.find_by(schema: host)
+ end
+
def self.resolve_host(host)
return nil unless Rails.application.config.multitenancy.present?
return nil if host.blank? || host.match?(Resolv::AddressRegex)
- host_domain = allowed_domains.find { |domain| host == domain || host.ends_with?(".#{domain}") }
- host.delete_prefix("www.").sub(/\.?#{host_domain}\Z/, "").presence
+ host_without_www = host.delete_prefix("www.")
+
+ if find_by_domain(host)
+ host
+ elsif find_by_domain(host_without_www)
+ host_without_www
+ else
+ host_domain = allowed_domains.find { |domain| host == domain || host.ends_with?(".#{domain}") }
+ schema = host_without_www.sub(/\.?#{host_domain}\Z/, "").presence
+
+ schema unless find_by_domain(schema)
+ end
end
def self.allowed_domains
@@ -35,6 +51,14 @@ class Tenant < ApplicationRecord
default_url_options[:host]
end
+ def self.default_domain
+ if default_host == "localhost"
+ "lvh.me"
+ else
+ default_host
+ end
+ end
+
def self.current_url_options
default_url_options.merge(host: current_host)
end
@@ -46,10 +70,10 @@ class Tenant < ApplicationRecord
def self.host_for(schema)
if schema == "public"
default_host
- elsif default_host == "localhost"
- "#{schema}.lvh.me"
+ elsif find_by_domain(schema)
+ schema
else
- "#{schema}.#{default_host}"
+ "#{schema}.#{default_domain}"
end
end
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index c3800181f..d6563e507 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -382,7 +382,10 @@ en:
tag:
name: "Type the name of the topic"
tenant:
- schema: "Subdomain"
+ domain: "Domain"
+ schema: "Domain / Subdomain"
+ subdomain: "Subdomain"
+ url: "URL"
topic:
title: "Title"
description: "Initial text"
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 68cbbd3d5..4f59150ad 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1632,6 +1632,9 @@ en:
tenants:
create:
notice: Tenant created successfully
+ form:
+ use_subdomain: "Use a subdomain in the %{domain} domain to access this tenant"
+ use_domain: "Use a different domain to access this tenant"
index:
create: Create tenant
new:
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 102beb8f4..ed149e75b 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -382,7 +382,10 @@ es:
tag:
name: "Escribe el nombre del tema"
tenant:
- schema: "Subdominio"
+ domain: "Dominio"
+ schema: "Dominio / Subdominio"
+ subdomain: "Subdominio"
+ url: "URL"
topic:
title: "TÃtulo"
description: "Texto inicial"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index cca53ce34..948c6cf5c 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1631,6 +1631,9 @@ es:
tenants:
create:
notice: Entidad creada correctamente
+ form:
+ use_subdomain: "Utiliza un subdominio en el dominio %{domain} para acceder a esta entidad"
+ use_domain: "Utiliza un dominio distinto para acceder a esta entidad"
index:
create: Crear entidad
new:
diff --git a/db/migrate/20221120123254_add_schema_type_to_tenants.rb b/db/migrate/20221120123254_add_schema_type_to_tenants.rb
new file mode 100644
index 000000000..322aabe17
--- /dev/null
+++ b/db/migrate/20221120123254_add_schema_type_to_tenants.rb
@@ -0,0 +1,5 @@
+class AddSchemaTypeToTenants < ActiveRecord::Migration[6.0]
+ def change
+ add_column :tenants, :schema_type, :integer, null: false, default: 0
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5ff1ee3d6..f12f53061 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 2022_09_15_154808) do
+ActiveRecord::Schema.define(version: 2022_11_20_123254) do
# These are extensions that must be enabled in order to support this database
enable_extension "pg_trgm"
@@ -1561,6 +1561,7 @@ ActiveRecord::Schema.define(version: 2022_09_15_154808) do
t.string "schema"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
+ t.integer "schema_type", default: 0, null: false
t.index ["name"], name: "index_tenants_on_name", unique: true
t.index ["schema"], name: "index_tenants_on_schema", unique: true
end
diff --git a/spec/controllers/concerns/tenant_variants_spec.rb b/spec/controllers/concerns/tenant_variants_spec.rb
index 46e949254..58a9742d4 100644
--- a/spec/controllers/concerns/tenant_variants_spec.rb
+++ b/spec/controllers/concerns/tenant_variants_spec.rb
@@ -20,4 +20,11 @@ describe TenantVariants do
get :index
expect(response.body).to eq '[:"random-name"]'
end
+
+ it "keeps dots in the variant names" do
+ allow(Tenant).to receive(:current_schema).and_return("random.domain")
+
+ get :index
+ expect(response.body).to eq '[:"random.domain"]'
+ end
end
diff --git a/spec/factories/administration.rb b/spec/factories/administration.rb
index de6df90be..d366cb3a3 100644
--- a/spec/factories/administration.rb
+++ b/spec/factories/administration.rb
@@ -102,5 +102,9 @@ FactoryBot.define do
factory :tenant do
sequence(:name) { |n| "Tenant #{n}" }
sequence(:schema) { |n| "subdomain#{n}" }
+
+ trait :domain do
+ schema_type { :domain }
+ end
end
end
diff --git a/spec/models/tenant_spec.rb b/spec/models/tenant_spec.rb
index f4e7e32c5..e6d4bae67 100644
--- a/spec/models/tenant_spec.rb
+++ b/spec/models/tenant_spec.rb
@@ -74,6 +74,49 @@ describe Tenant do
expect(Tenant.resolve_host("www.mercury.anotherconsul.dev")).to eq "mercury.anotherconsul.dev"
end
+ it "returns full domains when there's a tenant with a domain including the host" do
+ insert(:tenant, :domain, schema: "saturn.consul.dev")
+
+ expect(Tenant.resolve_host("saturn.consul.dev")).to eq "saturn.consul.dev"
+ end
+
+ it "returns subdomains when there's a subdomain-type tenant with that domain" do
+ insert(:tenant, schema: "saturn.consul.dev")
+
+ expect(Tenant.resolve_host("saturn.consul.dev")).to eq "saturn"
+ end
+
+ it "returns nil when a domain is accessed as a subdomain" do
+ insert(:tenant, :domain, schema: "saturn.dev")
+
+ expect(Tenant.resolve_host("saturn.dev.consul.dev")).to be nil
+ end
+
+ it "returns nested subdomains when there's a subdomain-type tenant with nested subdomains" do
+ insert(:tenant, schema: "saturn.dev")
+
+ expect(Tenant.resolve_host("saturn.dev.consul.dev")).to eq "saturn.dev"
+ end
+
+ it "returns domains when there are two tenants resolving to the same domain" do
+ insert(:tenant, schema: "saturn")
+ insert(:tenant, :domain, schema: "saturn.consul.dev")
+
+ expect(Tenant.resolve_host("saturn.consul.dev")).to eq "saturn.consul.dev"
+ end
+
+ it "returns domains when there's a tenant using the default host" do
+ insert(:tenant, :domain, schema: "consul.dev")
+
+ expect(Tenant.resolve_host("consul.dev")).to eq "consul.dev"
+ end
+
+ it "returns domains including www when the tenant contains it" do
+ insert(:tenant, :domain, schema: "www.consul.dev")
+
+ expect(Tenant.resolve_host("www.consul.dev")).to eq "www.consul.dev"
+ end
+
context "multitenancy disabled" do
before { allow(Rails.application.config).to receive(:multitenancy).and_return(false) }
@@ -151,6 +194,18 @@ describe Tenant do
expect(Tenant.host_for("uranus")).to eq "uranus.lvh.me"
end
+
+ it "ignores the default host when given a full domain" do
+ insert(:tenant, :domain, schema: "whole.galaxy")
+
+ expect(Tenant.host_for("whole.galaxy")).to eq "whole.galaxy"
+ end
+
+ it "uses the default host when given nested subdomains" do
+ insert(:tenant, schema: "whole.galaxy")
+
+ expect(Tenant.host_for("whole.galaxy")).to eq "whole.galaxy.consul.dev"
+ end
end
describe ".current_secrets" do
@@ -230,6 +285,22 @@ describe Tenant do
end
end
+ describe "scopes" do
+ describe ".domain" do
+ it "returns tenants with domain schema type" do
+ insert(:tenant, schema_type: :domain, schema: "full.domain")
+
+ expect(Tenant.domain.pluck(:schema)).to eq ["full.domain"]
+ end
+
+ it "does not return tenants with subdomain schema type" do
+ insert(:tenant, schema_type: :subdomain, schema: "nested.subdomain")
+
+ expect(Tenant.domain).to be_empty
+ end
+ end
+ end
+
describe "validations" do
let(:tenant) { build(:tenant) }
@@ -273,6 +344,20 @@ describe Tenant do
insert(:tenant, name: "Name X")
expect(build(:tenant, name: "Name X")).not_to be_valid
end
+
+ context "Domain schema type" do
+ before { tenant.schema_type = :domain }
+
+ it "is valid with domains" do
+ tenant.schema = "my.domain"
+ expect(tenant).to be_valid
+ end
+
+ it "is valid with domains which are machine names" do
+ tenant.schema = "localmachine"
+ expect(tenant).to be_valid
+ end
+ end
end
describe "#create_schema" do
diff --git a/spec/system/admin/tenants_spec.rb b/spec/system/admin/tenants_spec.rb
index 4454fc6fc..bbc0bbf76 100644
--- a/spec/system/admin/tenants_spec.rb
+++ b/spec/system/admin/tenants_spec.rb
@@ -3,26 +3,51 @@ require "rails_helper"
describe "Tenants", :admin, :seed_tenants do
before { allow(Tenant).to receive(:default_host).and_return("localhost") }
- scenario "Create" do
- visit admin_root_path
+ describe "Create" do
+ scenario "Tenant with subdomain" do
+ visit admin_root_path
- within("#side_menu") do
- click_link "Settings"
- click_link "Multitenancy"
+ within("#side_menu") do
+ click_link "Settings"
+ click_link "Multitenancy"
+ end
+
+ click_link "Create tenant"
+ fill_in "Subdomain", with: "earth"
+ fill_in "Name", with: "Earthlings"
+ click_button "Create tenant"
+
+ expect(page).to have_content "Tenant created successfully"
+
+ within("tr", text: "earth") do
+ expect(page).to have_content "earth.lvh.me"
+
+ click_link "View"
+ end
+
+ expect(current_host).to eq "http://earth.lvh.me"
+ expect(page).to have_current_path root_path
+ expect(page).to have_link "Sign in"
end
- click_link "Create tenant"
- fill_in "Subdomain", with: "earth"
- fill_in "Name", with: "Earthlings"
- click_button "Create tenant"
+ scenario "Tenant with domain" do
+ visit new_admin_tenant_path
- expect(page).to have_content "Tenant created successfully"
+ choose "Use a different domain to access this tenant"
+ fill_in "Domain", with: "earth.lvh.me"
+ fill_in "Name", with: "Earthlings"
+ click_button "Create tenant"
- within("tr", text: "earth") { click_link "View" }
+ within("tr", text: "earth") do
+ expect(page).to have_content "earth.lvh.me"
- expect(current_host).to eq "http://earth.lvh.me"
- expect(page).to have_current_path root_path
- expect(page).to have_link "Sign in"
+ click_link "View"
+ end
+
+ expect(current_host).to eq "http://earth.lvh.me"
+ expect(page).to have_current_path root_path
+ expect(page).to have_link "Sign in"
+ end
end
scenario "Update" do
@@ -31,6 +56,10 @@ describe "Tenants", :admin, :seed_tenants do
visit admin_tenants_path
within("tr", text: "moon") { click_link "Edit" }
+ expect(page).to have_field "Use a subdomain in the lvh.me domain to access this tenant",
+ type: :radio,
+ checked: true
+
fill_in "Subdomain", with: "the-moon"
click_button "Update tenant"
|