Merge pull request #146 from TechforgoodCAST/develop

Force SSL and JS on preview page
TechforgoodCAST · Apr 12, 2017 · 50d4354 · 50d4354
2 parents 99965b9 + 3107ef6
commit 50d4354
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,4 +1,6 @@
 class ApplicationController < ActionController::Base
+  force_ssl if: :ssl_configured?
+
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
@@ -18,6 +20,10 @@ def logged_in?
 
     include StrongParameters
 
+    def ssl_configured?
+      ENV['RACK_ENV'] == 'production'
+    end
+
     def error?
       params[:controller] == 'errors'
     end

diff --git a/app/views/pages/preview.html.haml b/app/views/pages/preview.html.haml
@@ -1,3 +1,5 @@
+= javascript_include_tag 'signup'
+
 = content_for :title, "Find grant funding for #{@tag}"
 
 - content_for :public do