Move account request functionality out of platform

documentcloud · Aug 17, 2015 · 2c25efd · 2c25efd
1 parent 71e6c72
commit 2c25efd
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 629 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -24,6 +24,7 @@ PATH
   remote: ../bull_proof_china_shop
   specs:
     bull_proof_china_shop (0.0.1)
+      has_secure_token (~> 1.0.0)
       rails (~> 4.2.3)
 
 GEM
@@ -157,6 +158,8 @@ GEM
     guard-minitest (2.4.4)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
+    has_secure_token (1.0.0)
+      activerecord (>= 3.0)
     hashie (3.4.2)
     highline (1.6.21)
     http-cookie (1.0.2)

diff --git a/app/controllers/signup_controller.rb b/app/controllers/signup_controller.rb
diff --git a/app/helpers/signup_helper.rb b/app/helpers/signup_helper.rb
diff --git a/app/mailers/lifecycle_mailer.rb b/app/mailers/lifecycle_mailer.rb
@@ -69,16 +69,6 @@ def reset_request(account)
     })
   end
 
-  def verification_request_notification(verification_request)
-    @request = verification_request
-    mail({
-        :subject  => "New DocumentCloud account request from #{verification_request.requester_full_name} (#{verification_request.organization_name}) in #{Rails.env}",
-        :from     => NO_REPLY,
-        :reply_to => verification_request.requester_email,
-        :to       => INFO
-      })
-  end
-
   # When someone sends a message through the "Contact Us" form, deliver it to
   # us via email.
   def contact_us(account, params)

diff --git a/app/models/verification_request.rb b/app/models/verification_request.rb
diff --git a/app/views/lifecycle_mailer/verification_request_notification.text.erb b/app/views/lifecycle_mailer/verification_request_notification.text.erb
diff --git a/app/views/signup/index.html.erb b/app/views/signup/index.html.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -130,9 +130,8 @@
   match '/accounts/enable/:key' => 'accounts#enable', :via => [:get, :post], :as => :enable_account
   match '/reset_password' => 'accounts#reset', :via => [:get, :post], :as => :reset_password
 
-  get  '/signup' => 'redirect#index', :url => '/apply'
-  get  '/apply' => 'signup#index', :as => :apply
-  post '/apply' => 'signup#create', :as => :apply_create
+  get  '/signup' => 'redirect#index', :url => '/plans/apply'
+  get  '/apply'  => 'redirect#index', :url => '/plans/apply'
 
   # Organizations management
   resources :organizations, :only=>:update