From 1e67b3287f7b338adff00d157bfb6ab2fcaaf54e Mon Sep 17 00:00:00 2001 From: Pat Walls Date: Mon, 21 Jan 2019 03:09:59 +0700 Subject: [PATCH] this should work --- app/controllers/i/posts_controller.rb | 2 ++ app/models/user.rb | 3 ++- app/services/subdomain.rb | 1 - config/routes.rb | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/i/posts_controller.rb b/app/controllers/i/posts_controller.rb index 66dd0f8..96082f6 100644 --- a/app/controllers/i/posts_controller.rb +++ b/app/controllers/i/posts_controller.rb @@ -5,7 +5,9 @@ def index logger.debug request.host logger.debug "---------" logger.debug "---------" + redirect_to google_drive_authorize_path if current_user && current_user.google_auth_token.nil? + @user = User.find_by(username: host_or_param) return redirect_to root_path unless @user diff --git a/app/models/user.rb b/app/models/user.rb index 4532569..faeaa85 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,7 @@ class User < ApplicationRecord DOMAIN_MAPPING = { - "patwalls.co" => "patwalls" + "patwalls.co" => "patwalls", + "leeronisrael.com" => "leeronisrael" } # Include default devise modules. Others available are: # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable diff --git a/app/services/subdomain.rb b/app/services/subdomain.rb index e2622ee..315722f 100644 --- a/app/services/subdomain.rb +++ b/app/services/subdomain.rb @@ -4,7 +4,6 @@ def initialize end def matches?(request) - byebug if request.subdomain.present? && request.subdomain != 'www' @users.find(request.subdomain) end diff --git a/config/routes.rb b/config/routes.rb index 312999c..2679fbf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,12 +1,12 @@ Rails.application.routes.draw do devise_for :users - constraints(subdomain: 'patwalls') do + constraints(subdomain: ['patwalls', 'leeronisrael']) do root "i/posts#index", as: 'subdomain_blog_index' get '/:post_id', to: 'i/posts#show', as: 'subdomain_blog_show' end - constraints(host: 'patwalls.co') do + constraints(host: ['patwalls.co', 'leeronisrael.com']) do root "i/posts#index", as: 'host_blog_index' get '/:post_id', to: 'i/posts#show', as: 'host_blog_show' end