documentcloud · knowtheory · Oct 27, 2016 · Nov 29, 2016 · Nov 30, 2016 · Oct 27, 2016
diff --git a/.gitignore b/.gitignore
@@ -24,8 +24,13 @@ cloud_crowd.db
 .DS_Store
 public/search
 vendor/solr-4.0.0/solr-webapp/webapp/*
+vendor/cache/*
 .bundle
 public/javascripts/vendor/*/
 .vagrant
 .tm_properties
 Vagrantfile
+*.sublime-*
+.byebug_history
+doc
+
diff --git a/Gemfile b/Gemfile
@@ -27,10 +27,16 @@ gem 'sunspot_rails',          '2.2.0'
 gem 'sunspot_solr',           '2.2.0'
 gem 'progress_bar' # Optional, used by sunspot to show progress while re-indexing
 
-gem 'omniauth',               '~> 1.2.1'
-gem 'omniauth-twitter',       '~> 1.0'
-gem 'omniauth-facebook',      '~> 1.6'
-gem 'omniauth-google-oauth2', '~> 0.2'
+# TODO: omniauth cleanup remove me
+# gem 'omniauth',               
+# gem 'omniauth-twitter',       '~> 1.0'
+# gem 'omniauth-facebook',      '~> 1.6'
+# gem 'omniauth-google-oauth2', '~> 0.2'
+
+# Auth
+gem 'omniauth', '~> 1.3.1'
+gem 'omniauth-oauth2'
+
 gem 'sanitize',               '~> 2.0.6'
 gem 'rdiscount',              '~> 2.1.6'
 gem 'rake'
@@ -58,6 +64,7 @@ group :development, :test do
   gem 'byebug' # Debugger
   gem 'factory_girl_rails' # Mocking out objects
   gem 'ruby-debug-passenger'
+
 end
 
 group :development do
@@ -66,6 +73,9 @@ group :development do
   # by a developer on their local machine before committing the compiled strings
   gem 'google_drive',         '~> 1.0.0'
   gem 'highline'
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  # gem 'railroady'
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -83,7 +83,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
-    arel (6.0.3)
+    arel (6.0.4)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -94,6 +94,12 @@ GEM
       json (~> 1.4)
       nokogiri (>= 1.4.4)
     bcrypt (3.1.11)
+    better_errors (2.1.1)
+      coderay (>= 1.0.0)
+      erubis (>= 2.6.6)
+      rack (>= 0.9.0)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     builder (3.2.2)
     byebug (9.0.6)
     closure-compiler (1.1.12)
@@ -106,7 +112,7 @@ GEM
       sinatra
       thin (>= 1.2.4)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.4)
     countries (0.11.5)
       currencies (~> 0.4.2)
       i18n_data (~> 0.7.0)
@@ -119,19 +125,20 @@ GEM
     curb (0.8.8)
     currencies (0.4.2)
     daemons (1.2.4)
+    debug_inspector (0.0.2)
     docsplit (0.8.0.alpha1)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     eventmachine (1.2.1)
     excon (0.54.0)
     extlib (0.9.16)
-    factory_girl (4.7.0)
+    factory_girl (4.8.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.7.0)
-      factory_girl (~> 4.7.0)
+    factory_girl_rails (4.8.0)
+      factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faraday (0.9.2)
+    faraday (0.10.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.1)
       faraday (>= 0.7.4, < 1.0)
@@ -183,7 +190,7 @@ GEM
       minitest (>= 3.0)
     has_secure_token (1.0.0)
       activerecord (>= 3.0)
-    hashdiff (0.3.1)
+    hashdiff (0.3.2)
     hashie (3.4.6)
     highline (1.7.8)
     http-cookie (1.0.3)
@@ -231,34 +238,21 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     oauth (0.5.1)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.2.2)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-facebook (1.6.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-google-oauth2 (0.4.1)
-      jwt (~> 1.5.2)
-      multi_json (~> 1.3)
-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.3.1)
-    omniauth-oauth (1.1.0)
-      oauth
-      omniauth (~> 1.0)
+      rack (>= 1.0, < 3)
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
-      omniauth-oauth (~> 1.1)
     options (2.3.2)
     os (0.9.6)
-    passenger (5.0.30)
+    passenger (5.1.1)
       rack
       rake (>= 0.8.1)
     pdfshaver (0.0.3)
@@ -275,7 +269,7 @@ GEM
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    public_suffix (2.0.4)
+    public_suffix (2.0.5)
     rack (1.6.5)
     rack-protection (1.5.3)
       rack
@@ -294,9 +288,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -338,7 +332,7 @@ GEM
       unicode_utils (>= 1.2.2)
     spring (2.0.0)
       activesupport (>= 4.2)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
@@ -372,7 +366,7 @@ GEM
     unf_ext (0.0.7.2)
     unicode_utils (1.4.0)
     vcr (3.0.3)
-    webmock (2.3.1)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -385,6 +379,8 @@ DEPENDENCIES
   active_model_serializers (~> 0.9.0)
   aws-sdk (~> 1.30)
   bcrypt (~> 3.1.1)
+  better_errors
+  binding_of_caller
   bootstrap_form!
   bull_proof_china_shop!
   byebug
@@ -405,10 +401,8 @@ DEPENDENCIES
   minitest-spec-rails
   net-ssh-shell
   nokogiri (~> 1.6.0)
-  omniauth (~> 1.2.1)
-  omniauth-facebook (~> 1.6)
-  omniauth-google-oauth2 (~> 0.2)
-  omniauth-twitter (~> 1.0)
+  omniauth (~> 1.3.1)
+  omniauth-oauth2
   open_calais!
   passenger
   pdfshaver (>= 0.0.2)
@@ -433,4 +427,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.12.5
+   1.13.7
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
@@ -7,9 +7,8 @@ class AccountsController < ApplicationController
   before_action :login_required, except: [:enable, :reset, :logged_in]
   before_action :bouncer,        only: [:enable, :reset] if exclusive_access?
 
-  READONLY_ACTIONS = [
-    :index, :logged_in, :resend_welcome
-  ]
+  READONLY_ACTIONS = [:index, :logged_in, :resend_welcome].freeze
+
   before_action :read_only_error, except: READONLY_ACTIONS if read_only?
 
   # Enabling an account continues the second half of the signup process,
@@ -44,19 +43,10 @@ def reset
     end
   end
 
-  # Requesting /accounts returns the list of accounts in your logged-in organization.
-  # consider extracting the HTML info into a single method in common w/ workspace
   def index
     respond_to do |format|
       format.html do
-        if logged_in? and current_account.real?
-          @projects = Project.load_for(current_account)
-          @current_organization = current_account.organization
-          @organizations = Organization.all_slugs
-          @has_documents = Document.owned_by(current_account).exists?
-          return render template: 'workspace/index', layout: 'workspace'
-        end
-        redirect_to public_search_url(query: params[:query])
+        redirect_to File.join(DC::SECRETS['omniauth']['documentcloud']['site'], '/organizations/')
       end
       format.json do
         json current_organization.accounts.active
@@ -140,15 +130,15 @@ def resend_welcome
     LifecycleMailer.login_instructions(account, current_organization, current_account).deliver_now
     json nil
   end
-  
+
   def mailboxes
     # TODO: Filter by status, once that exists
     @mailboxes = UploadMailbox.where(membership_id: current_account.memberships.pluck(:id))
     set_minimal_nav text:    'Back to the workspace',
                     xs_text: 'Workspace',
                     link:    '/search/'
   end
-  
+
   def create_mailbox
     @mailbox = UploadMailbox.create(membership: current_account.memberships.default.first, sender: params[:email])
     if @mailbox.valid?
@@ -158,7 +148,7 @@ def create_mailbox
     end
     redirect_to :mailboxes
   end
-  
+
   def revoke_mailbox
     @mailbox = UploadMailbox.find(params[:id])
     return forbidden unless @mailbox.membership.account == current_account

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -82,7 +82,7 @@ def all_accounts
       'public_per_account'  => DC::Statistics.public_documents_per_account,
       'private_per_account' => DC::Statistics.private_documents_per_account,
       'pages_per_account'   => DC::Statistics.pages_per_account,
-      'accounts'            => Account.all.map {|a| a.canonical(:include_organization => true) }
+      'accounts'            => Account.all.map {|a| a.canonical(include_organizations: true) }
     })
   end
 

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -41,7 +41,7 @@ def embeddable?
   def cachable?
     request.get? and not logged_in?
   end
-  
+
   def make_oembeddable(resource)
     # Resource should have both an `oembed_url` and a `title`
     @oembeddable_resource = resource
@@ -170,6 +170,7 @@ def validate_session
 
   def logged_in?
     !!current_account
+    # return true if current_account
   end
 
   def clear_login_state
@@ -233,6 +234,12 @@ def current_organization
       session['organization_id'] ? Organization.find_by_id(session['organization_id']) : nil
   end
 
+  def current_membership
+    return nil unless request.ssl?
+    @current_membership ||=
+      session['membership_id'] ? Membership.find(session['membership_id']) : nil
+  end
+
   def handle_unverified_request
     error = RuntimeError.new "CSRF Verification Failed"
     LifecycleMailer.exception_notification(error, params).deliver_now
@@ -346,8 +353,63 @@ def set_minimal_nav(text: 'Go to home', xs_text: false, link: '/')
     @minimal_back_link = link
   end
 
+  # helper_method :current_account
+  # helper_method :account_signed_in?
+  helper_method :correct_account?
+
+  ## Feature Flags
+  # Dynamically get a list of all implemented feature flags
+  feature_flags = FeatureFlags.public_instance_methods
+  # Delegate all feature flag methods to current_account
+  delegate *feature_flags, to: :current_account, allow_nil: true
+  # Make feature flag methods available in views
+  helper_method feature_flags
+
+  ## OAuth2 Client
+  def documentcloud_oauth_client
+    unless DC::Application.config.you_are_documentcloud
+      @client ||= OAuth2::Client.new(DC::SECRETS['omniauth']['documentcloud']['key'],
+                                     DC::SECRETS['omniauth']['documentcloud']['secret'],
+                                     site: DC::SECRETS['omniauth']['documentcloud']['site'],
+                                     callback_url: DC::SECRETS['omniauth']['documentcloud']['callback_url'],
+                                     client_options: { ssl: { verify: !Rails.env.development? } })
+    end
+  end
+
+  def documentcloud_access_token
+    unless DC::Application.config.you_are_documentcloud
+      @token ||= OAuth2::AccessToken.new(documentcloud_oauth_client,
+                                         current_account.access_token) if current_account
+    end
+  end
+
   private
-
+
+  # def current_account use current_account
+  #   begin
+  #     @current_account ||= Account.find(session[:account_id]) if session[:account_id]
+  #   rescue Exception => e
+  #     nil
+  #   end
+  # end
+
+  # def account_signed_in?   use logged_in?
+  #   return true if current_account
+  # end
+
+  def correct_account?
+    @account = Account.find(params[:id])
+    unless current_account == @account
+      redirect_to root_url, alert: 'Access denied'
+    end
+  end
+
+  def authenticate_user!
+    unless current_account
+      redirect_to root_url, alert: 'Please log in or sign up for access to this page.'
+    end
+  end
+
   # Generic error response helper. Defaults to 200 because never called directly
   def error_response(status=200, options={})
     options = {
@@ -366,5 +428,4 @@ def error_response(status=200, options={})
 
     false
   end
-
 end