Infrastructure connection updates

config/application.rb

@@ -298,7 +298,7 @@ module Qwaiter
 
     config.middleware.insert_before 0, Rack::Cors do
       allow do
-        origins '*'
+        origins 'localhost', 'supplier.mozo.local', 'user.mozo.local'
         #resource '/user/*', :headers => '*', :methods => '*' #[:get, :post, :options]
         resource '*', headers: :any, methods: [:get, :post, :put, :patch, :delete, :options]
       end

config/initializers/devise.rb

@@ -252,11 +252,13 @@ Devise.setup do |config|
     # config.omniauth :facebook, "505160086210072", "fcc474a3fb13c6bcc0f7c83a92ad1b17",
     #   scope: 'email,user_birthday,publish_actions'
     config.omniauth :facebook, "653729178057509", "d4cea86f70803f1b75ed03c506a4d78e",
-      scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location'
+      scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location',
+      provider_ignores_state: true
     config.omniauth :instagram, "cd7bdfbee825499b94fb3783d1bc143b", "6b4f9ecf251c462993a696eebc0189be"
   else
     config.omniauth :facebook, "168928633304849", "22bc53e1a390c1e62d004195c55fe336",
-      scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location'
+      scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location',
+      provider_ignores_state: true
     config.omniauth :instagram, "81c78b969a7046d6b6b5b5fe3f30929c", "3697c16762ad4f1ca088e829efbaddde"
   end
 

config/initializers/mozo_settings.rb

@@ -1,4 +1,9 @@
-Qwaiter.event_host = "http://#{(Rails.env.development? or Rails.env.test?) ? ENV['MOZO_LOCAL_IP'] || 'localhost' : 'events.mozo.bar'}:9296/faye"
+if Rails.env.development?
+  Qwaiter.event_host = "https://events.mozo.local:9296/faye"
+else
+  Qwaiter.event_host = "https://events.mozo.bar:9296/faye"
+end
+
 Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new
 
 # use the connection from couchbase-structures/documents

config/routes.rb

@@ -108,7 +108,7 @@ Qwaiter::Application.routes.draw do
   end
 
 
-  #get '/s' => 'dashboard#scan', as: :scan
+  get '/s' => 'dashboard#scan', as: :scan
 
   # DEVELOPMENT ONLY
   get '/qr' => 'dashboard#qr'
@@ -203,13 +203,16 @@ Qwaiter::Application.routes.draw do
 
   mount Cmtool::Engine => '/cmtool'
 
+  # NOTE: tried to do the following 2 matchers in 1 like get '/supplier*other', but did not work, so better safe then sorry and use 2
+  get '/supplier' => 'supplier#home', as: :supplier_root
+  get '/supplier/*other' => 'supplier#home'
+
   # /nl is not matched to pages#home with locale => nl
   get '/:locale' => 'pages#home', constraints: {locale: ALLOWED_LOCALES}, as: :go_to_locale
   get '/sitemap(.:format)' => 'pages#sitemap'
   #devise_scope :supplier do
     #get '/:locale/suppliers/sign_up' => 'registrations#new', constraints: {locale: ALLOWED_LOCALES}
   #end
-  get '/supplier*other' => 'supplier#home', as: :supplier_root
   scope '(/:locale)', constraints: {locale: ALLOWED_LOCALES}, defaults: { locale: Rails.application.config.i18n.default_locale.to_s } do
     root to: 'pages#home'
     resources :contact_forms, only: [:create]