Merge pull request #302 from rubyforgood/subdomain-parse

fixed subdomain parsing

Author: ycchen

.gitignore

@@ -35,5 +35,3 @@ db/.DS_Store
 
 # Ignore coverage files from simplecov
 /coverage
-
-/deploy/deploy_hash

app/controllers/application_controller.rb

@@ -3,15 +3,15 @@
 require "modal_responder"
 
 class ApplicationController < ActionController::Base
-  set_current_tenant_by_subdomain(:organization, :subdomain)
+  # set_current_tenant_by_subdomain(:organization, :subdomain)
 
   include Authentication
   include Pundit
 
   rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
 
-  before_action :redirect_wrong_tenant, :redirect_notenant, :set_version, :set_admin_org
+  before_action :set_tenant_by_subdomain, :redirect_notenant, :redirect_wrong_tenant, :set_version, :set_admin_org
 
   # See `lib/modal_responder.rb` for deatils.
   def respond_modal_with(*args, &blk)
@@ -27,6 +27,10 @@ def render_not_found
 
   private
 
+  def current_tenant
+    ActsAsTenant.current_tenant
+  end
+
   def redirect_notenant
     redirect_to home_index_path if ActsAsTenant.current_tenant.nil?
   end
@@ -41,6 +45,14 @@ def set_admin_org
     @admin_org = ActsAsTenant.current_tenant&.admin?
   end
 
+  def set_tenant_by_subdomain
+    subdomain = request.subdomains.first
+    return if subdomain.nil?
+
+    tenant = Organization.find_by(subdomain: subdomain)
+    ActsAsTenant.current_tenant = tenant
+  end
+
   def set_version
     @version = ""
     fn = File.join(Rails.root, "deploy", "deploy_hash")

config/environments/development.rb

@@ -63,5 +63,5 @@
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.smtp_settings = { address: 'mailcatcher', port: 1025 }
 
-  config.hosts << "midatlantic.lvh.me" << "acme.lvh.me" << "admin.lvh.me" << "lvh.me"
+  config.hosts << "midatlantic.lvh.me" << "acme.lvh.me" << "admin.lvh.me" << "lvh.me" << "midatlantic.stage.lvh.me"
 end

deploy/deploy_hash

@@ -0,0 +1 @@
+placeholder