Allow domains in tenants TODO: tests TODO could be mistaken for neste…

…d subdomains
consuldemocracy · Oct 9, 2022 · 02ef781 · 02ef781
1 parent 32239bc
commit 02ef781
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/tenant.rb b/app/models/tenant.rb
@@ -4,7 +4,6 @@ class Tenant < ApplicationRecord
     uniqueness: true,
     exclusion: { in: ->(*) { excluded_subdomains }},
     format: { with: URI::DEFAULT_PARSER.regexp[:HOST] }
-  validates :subdomain, format: { without: /\./ }
   validates :name, presence: true
 
   after_create :create_schema
@@ -45,6 +44,8 @@ def self.current_host
   def self.host_for(schema)
     if schema == "public"
       default_host
+    elsif schema.include?(".")
+      schema
     elsif default_host == "localhost"
       "#{schema}.lvh.me"
     else

diff --git a/spec/models/tenant_spec.rb b/spec/models/tenant_spec.rb
@@ -234,9 +234,9 @@
       end
     end
 
-    it "is not valid with nested subdomains" do
-      tenant.subdomain = "multiple.sub.domains"
-      expect(tenant).not_to be_valid
+    it "is valid with domains" do
+      tenant.subdomain = "my.domain"
+      expect(tenant).to be_valid
     end
 
     it "is not valid with an invalid subdomain" do