From e8032fd9027435c57572fd0d8bab411841859cbc Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 23 Dec 2013 16:44:18 -0800
Subject: Initial start to messages API.

---
 users/app/controllers/v1/messages_controller.rb | 25 +++++++++++++++++++++++++
 users/app/models/message.rb                     | 10 ++++++++++
 users/app/models/user_message.rb                | 22 ++++++++++++++++++++++
 users/config/routes.rb                          |  2 ++
 4 files changed, 59 insertions(+)
 create mode 100644 users/app/controllers/v1/messages_controller.rb
 create mode 100644 users/app/models/message.rb
 create mode 100644 users/app/models/user_message.rb

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
new file mode 100644
index 0000000..e67e2a3
--- /dev/null
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -0,0 +1,25 @@
+module V1
+  class MessagesController < ApplicationController
+
+    # TODO need to add authentication
+    respond_to :json
+
+    def user_messages(unseen = true)
+      user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [params[:user_id], false]).all : UserMessage.by_user_id(:key => params[:user_id]).all
+
+      messages = []
+      user_messages.each do |um|
+        messages << Message.find(um.message.id)
+      end
+
+      render json: messages
+    end
+
+
+    # only for PUT
+    def mark_read
+      # params[:user_id] params[:message_id]
+    end
+
+  end
+end
diff --git a/users/app/models/message.rb b/users/app/models/message.rb
new file mode 100644
index 0000000..38fa71e
--- /dev/null
+++ b/users/app/models/message.rb
@@ -0,0 +1,10 @@
+class Message < CouchRest::Model::Base
+
+  use_database :messages
+
+  property :text, String
+
+  design do
+  end
+
+end
diff --git a/users/app/models/user_message.rb b/users/app/models/user_message.rb
new file mode 100644
index 0000000..0b2ce17
--- /dev/null
+++ b/users/app/models/user_message.rb
@@ -0,0 +1,22 @@
+class UserMessage < CouchRest::Model::Base
+
+  use_database :user_messages
+  belongs_to :user
+  belongs_to :message
+
+  validates :user_id, presence: true
+  validates :message_id, presence: true
+
+
+  property :seen, TrueClass, :default => false
+
+  design do
+    view :by_user_id
+    view :by_message_id
+    view :by_user_id_and_seen
+    own_path = Pathname.new(File.dirname(__FILE__))
+    load_views(own_path.join('..', 'designs', 'user_message'))
+
+  end
+
+end
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 736b283..9a7c531 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -6,6 +6,8 @@ Rails.application.routes.draw do
     resources :sessions, :only => [:new, :create, :update]
     delete "logout" => "sessions#destroy", :as => "logout"
     resources :users, :only => [:create, :update, :destroy, :index]
+    get "user_messages/:user_id" => "messages#user_messages"
+    put "mark_read/:user_id/:message_id" => "messages#mark_read"
   end
 
   scope "(:locale)", :locale => MATCH_LOCALE do
-- 
cgit v1.2.3


From a9ff52501e9c04edacd250dd94ee3f3ad28cd73d Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 24 Dec 2013 11:13:28 -0800
Subject: API method to mark a user's message as read (will refactor)

---
 users/app/controllers/v1/messages_controller.rb | 13 +++++++++++--
 users/app/models/user_message.rb                |  3 +++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index e67e2a3..a4e9aec 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -4,6 +4,7 @@ module V1
     # TODO need to add authentication
     respond_to :json
 
+    # for now, will not pass unseen, so unseen will always be true
     def user_messages(unseen = true)
       user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [params[:user_id], false]).all : UserMessage.by_user_id(:key => params[:user_id]).all
 
@@ -16,9 +17,17 @@ module V1
     end
 
 
-    # only for PUT
+    # routes ensure this is only for PUT
     def mark_read
-      # params[:user_id] params[:message_id]
+      user_message = UserMessage.find_by_user_id_and_message_id([params[:user_id], params[:message_id]])
+      user_message.seen = true
+
+      # TODO what to return?
+      if user_message.save
+        render json: true
+      else
+        render json: false
+      end
     end
 
   end
diff --git a/users/app/models/user_message.rb b/users/app/models/user_message.rb
index 0b2ce17..37aae0b 100644
--- a/users/app/models/user_message.rb
+++ b/users/app/models/user_message.rb
@@ -7,6 +7,8 @@ class UserMessage < CouchRest::Model::Base
   validates :user_id, presence: true
   validates :message_id, presence: true
 
+  # should not have multiple rows connecting one user to particular message:
+  validates_uniqueness_of :user_id, :scope => [:message_id]
 
   property :seen, TrueClass, :default => false
 
@@ -14,6 +16,7 @@ class UserMessage < CouchRest::Model::Base
     view :by_user_id
     view :by_message_id
     view :by_user_id_and_seen
+    view :by_user_id_and_message_id
     own_path = Pathname.new(File.dirname(__FILE__))
     load_views(own_path.join('..', 'designs', 'user_message'))
 
-- 
cgit v1.2.3


From e4390e2ee5b2df20038f12865db462cf1e208ee6 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 24 Dec 2013 12:23:04 -0800
Subject: Add API tests and some refactoring of messages so we can get a user's
 messages within the webapp.

---
 users/app/controllers/v1/messages_controller.rb    | 10 +----
 users/app/models/user.rb                           | 12 ++++++
 .../test/functional/v1/messages_controller_test.rb | 44 ++++++++++++++++++++++
 3 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 users/test/functional/v1/messages_controller_test.rb

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index a4e9aec..fa98042 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -6,14 +6,8 @@ module V1
 
     # for now, will not pass unseen, so unseen will always be true
     def user_messages(unseen = true)
-      user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [params[:user_id], false]).all : UserMessage.by_user_id(:key => params[:user_id]).all
-
-      messages = []
-      user_messages.each do |um|
-        messages << Message.find(um.message.id)
-      end
-
-      render json: messages
+      user = User.find(params[:user_id])
+      render json: (user ? user.messages : [] )
     end
 
 
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 720f5a9..fe3a127 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -72,6 +72,18 @@ class User < CouchRest::Model::Base
     Ticket.for_user(self).limit(count).all #defaults to having most recent updated first
   end
 
+  def messages(unseen = true)
+
+    user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [self.id, false]).all : UserMessage.by_user_id(:key => self.id).all
+
+    messages = []
+    user_messages.each do |um|
+      messages << Message.find(um.message.id)
+    end
+    messages
+
+  end
+
   # DEPRECATED
   #
   # Please set the key on the identity directly
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
new file mode 100644
index 0000000..de2182b
--- /dev/null
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -0,0 +1,44 @@
+require 'test_helper'
+
+
+class V1::MessagesControllerTest < ActionController::TestCase
+  
+  #TODO ensure authentication for all tests here
+
+  setup do
+    @user = FactoryGirl.build(:user)
+    @user.save
+    @message = Message.new(:text => 'a test message')
+    @message.save
+    @user_message = UserMessage.new(:message_id => @message.id, :user_id => @user.id)
+    @user_message.save
+  end
+
+  teardown do
+    @user_message.destroy
+    @user.destroy
+    @message.destroy
+  end
+
+  test "get messages for user" do
+    get :user_messages, :user_id => @user.id
+    assert response.body.include? @message.text
+    assert response.body.include? @message.id
+  end
+
+  test "mark message read for user" do
+    assert !@user_message.seen
+    put :mark_read, :user_id => @user.id, :message_id => @message.id
+    @user_message.reload
+    assert @user_message.seen
+  end
+
+  test "do not get seen messages" do
+    @user_message.seen = true
+    @user_message.save
+    get :user_messages, :user_id => @user.id
+    assert !(response.body.include? @message.text)
+    assert !(response.body.include? @message.id)
+  end
+
+end
-- 
cgit v1.2.3


From 7f12c795207ac818bffac42aa581bf1165f9e424 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 24 Dec 2013 13:27:22 -0800
Subject: Catching some corner cases & new tests.

---
 users/app/controllers/v1/messages_controller.rb      |  5 ++---
 users/test/functional/v1/messages_controller_test.rb | 12 +++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index fa98042..d49b161 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -10,14 +10,13 @@ module V1
       render json: (user ? user.messages : [] )
     end
 
-
     # routes ensure this is only for PUT
     def mark_read
       user_message = UserMessage.find_by_user_id_and_message_id([params[:user_id], params[:message_id]])
-      user_message.seen = true
+      user_message.seen = true if user_message
 
       # TODO what to return?
-      if user_message.save
+      if user_message and user_message.save
         render json: true
       else
         render json: false
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
index de2182b..7bffa8f 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -1,6 +1,5 @@
 require 'test_helper'
 
-
 class V1::MessagesControllerTest < ActionController::TestCase
   
   #TODO ensure authentication for all tests here
@@ -31,6 +30,7 @@ class V1::MessagesControllerTest < ActionController::TestCase
     put :mark_read, :user_id => @user.id, :message_id => @message.id
     @user_message.reload
     assert @user_message.seen
+    assert_json_response true
   end
 
   test "do not get seen messages" do
@@ -41,4 +41,14 @@ class V1::MessagesControllerTest < ActionController::TestCase
     assert !(response.body.include? @message.id)
   end
 
+  test "empty messages for non-existing user" do
+    get :user_messages, :user_id => 'some random string'
+    assert_json_response []
+  end
+
+  test "mark read responds even with bad inputs" do
+    put :mark_read, :user_id => 'nonsense', :message_id => 'more nonsense'
+    assert_json_response false
+ end
+
 end
-- 
cgit v1.2.3


From fac34e1fb21d9310227c4cfc28c3ef03806ba465 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Thu, 26 Dec 2013 12:37:26 -0800
Subject: Very very rough start to having messages for payment automatically
 created.

---
 users/app/models/user.rb           | 20 ++++++++++++++++++++
 users/config/locales/en.yml        |  1 +
 users/config/schedule.rb           | 24 ++++++++++++++++++++++++
 users/leap_web_users.gemspec       |  1 +
 users/lib/leap_web_users/engine.rb |  1 +
 5 files changed, 47 insertions(+)
 create mode 100644 users/config/schedule.rb

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index fe3a127..28adc54 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -122,6 +122,26 @@ class User < CouchRest::Model::Base
     ServiceLevel.new({id: code})
   end
 
+  def one_month_warning_to_pay
+    # get all users who are not customers with active subscription and have existed for exactly a month (take account of months having difft amount of days. Maybe jsut those who signed up 30 days ago?)
+    #users_to_warn = User.find_by_created_at(Time.now-1.month).all #NO, this will require time to be right
+    #users_1_month_old = User.by_created_at.startkey(Time.now-1.month-1.day).endkey(Time.now-1.month).al
+    users_30_days_old = User.by_created_at.startkey(Time.now-31.days).endkey(Time.now-30.days).all
+    # TODO, now, limit users to those who do not have a braintree customer, or have a braintree customer without an active subscription. This might have to happen when we are looping through anyway.
+    #users_to_warn =
+
+    # TODO: only create message if any messages are going to be created.
+    # create a message for today's date
+    message = Message.new(:text => t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
+    message.save
+
+    # for each such user, create a user message for that user and the message
+    users_to_warn.each do |user_to_warn|
+      user_message = UserMessage.new(:message_id => message.id, :user_id => user_to_warn.id)
+      user_message.save
+    end
+  end
+
   protected
 
   ##
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
index 934fcee..0db63eb 100644
--- a/users/config/locales/en.yml
+++ b/users/config/locales/en.yml
@@ -38,6 +38,7 @@ en:
   deactivate_account: "Deactivate the account %{username}"
   deactivate_description: "This will temporarily deactivate some account functionality." #todo detail exact functionality. can receive email but not send or renew client certificate?
 
+  payment_one_month_warning: "We hope you have been enjoying this service this past month. Please sign up to pay within the next month, by %{date_in_one_month}. Directions for payment are available at INSERT_URL"
 
   #
   # overview
diff --git a/users/config/schedule.rb b/users/config/schedule.rb
new file mode 100644
index 0000000..1b2b171
--- /dev/null
+++ b/users/config/schedule.rb
@@ -0,0 +1,24 @@
+# Use this file to easily define all of your cron jobs.
+#
+# It's helpful, but not entirely necessary to understand cron before proceeding.
+# http://en.wikipedia.org/wiki/Cron
+
+# Example:
+#
+# set :output, "/path/to/my/cron_log.log"
+#
+# every 2.hours do
+#   command "/usr/bin/some_great_command"
+#   runner "MyModel.some_method"
+#   rake "some:great:rake:task"
+# end
+#
+# every 4.days do
+#   runner "AnotherModel.prune_old_records"
+# end
+
+# Learn more: http://github.com/javan/whenever
+
+every 1.day, :at => '1am' do
+  runner "User.one_month_warning_to_pay"
+end
diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
index 7d1f220..06965a7 100644
--- a/users/leap_web_users.gemspec
+++ b/users/leap_web_users.gemspec
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ruby-srp", "~> 0.2.1"
   s.add_dependency "rails_warden"
+  s.add_dependency "whenever"
 end
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb
index f8ed71c..61131ef 100644
--- a/users/lib/leap_web_users/engine.rb
+++ b/users/lib/leap_web_users/engine.rb
@@ -8,6 +8,7 @@ require "warden/session_serializer"
 require "warden/strategies/secure_remote_password"
 
 require "webfinger"
+require "whenever"
 
 module LeapWebUsers
   class Engine < ::Rails::Engine
-- 
cgit v1.2.3


From 7d1a25c2477b9607475f6b4c56f94d392c46950a Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 30 Dec 2013 11:41:51 -0800
Subject: Not actually how we want to do this, but at least finish outlined
 part, that will later be replaced.

---
 users/app/models/user.rb | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 28adc54..bf48185 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -123,22 +123,30 @@ class User < CouchRest::Model::Base
   end
 
   def one_month_warning_to_pay
-    # get all users who are not customers with active subscription and have existed for exactly a month (take account of months having difft amount of days. Maybe jsut those who signed up 30 days ago?)
+    # get all users who are not customers with active subscription and have existed for exactly a month (take account of months having difft amount of days. Maybe just those who signed up 30 days ago?)
     #users_to_warn = User.find_by_created_at(Time.now-1.month).all #NO, this will require time to be right
     #users_1_month_old = User.by_created_at.startkey(Time.now-1.month-1.day).endkey(Time.now-1.month).al
     users_30_days_old = User.by_created_at.startkey(Time.now-31.days).endkey(Time.now-30.days).all
-    # TODO, now, limit users to those who do not have a braintree customer, or have a braintree customer without an active subscription. This might have to happen when we are looping through anyway.
-    #users_to_warn =
-
-    # TODO: only create message if any messages are going to be created.
-    # create a message for today's date
-    message = Message.new(:text => t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
-    message.save
-
-    # for each such user, create a user message for that user and the message
-    users_to_warn.each do |user_to_warn|
-      user_message = UserMessage.new(:message_id => message.id, :user_id => user_to_warn.id)
-      user_message.save
+    # TODO, above really is quite problematic, in that if the cron job fails to run on 1 day, say, the warning will not get created.
+
+    users_30_days_old.each do |user|
+
+      # create a user message for each user that does not has a braintree customer, or
+      # has a braintree customer w/out an active subscription.
+      unless ((customer = Customer.find_by_user(user.id)) && customer.subscriptions)
+
+        if !@message
+          # create a message for today's date
+          # only want to create once, and only if it will be used.
+          @message = Message.new(:text => t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
+          @message.save
+        end
+
+        user_message = UserMessage.new(:message_id => @message.id, :user_id => user.id)
+        # is following preferred??
+        # user_message = UserMessage.new(:message => @message, :user => user)
+        user_message.save
+      end
     end
   end
 
-- 
cgit v1.2.3


From 16b28882aa7659fb89e1661ed8af0c0db72642c8 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 30 Dec 2013 15:22:44 -0800
Subject: Change structure to be more no-sql-y, rather than relational.

---
 users/app/controllers/v1/messages_controller.rb    | 12 ++++++++
 users/app/models/user.rb                           | 13 +++++++++
 users/app/models/user_message.rb                   |  3 +-
 .../test/functional/v1/messages_controller_test.rb | 33 ++++++++++++++--------
 4 files changed, 49 insertions(+), 12 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index d49b161..18f9f46 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -12,6 +12,7 @@ module V1
 
     # routes ensure this is only for PUT
     def mark_read
+=begin
       user_message = UserMessage.find_by_user_id_and_message_id([params[:user_id], params[:message_id]])
       user_message.seen = true if user_message
 
@@ -22,6 +23,17 @@ module V1
         render json: false
       end
     end
+=end
+      if (user = User.find(params[:user_id])) && Message.find(params[:message_id])
+        user.message_ids_seen << params[:message_id] if !user.message_ids_seen.include?(params[:message_id]) #is it quicker to instead run uniq after adding?
+        user.message_ids_to_see.delete(params[:message_id])
+        user.save
+        render json: true
+        return
+      else
+        render json: false
+      end
 
+    end
   end
 end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index fe3a127..fc63ae9 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -13,6 +13,9 @@ class User < CouchRest::Model::Base
   property :desired_service_level_code, Integer, :accessible => true
   property :effective_service_level_code, Integer, :accessible => true
 
+  property :message_ids_to_see, [String]
+  property :message_ids_seen, [String]
+
   before_save :update_effective_service_level
 
   validates :login, :password_salt, :password_verifier,
@@ -74,6 +77,7 @@ class User < CouchRest::Model::Base
 
   def messages(unseen = true)
 
+=begin
     user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [self.id, false]).all : UserMessage.by_user_id(:key => self.id).all
 
     messages = []
@@ -81,6 +85,15 @@ class User < CouchRest::Model::Base
       messages << Message.find(um.message.id)
     end
     messages
+=end
+
+    message_ids = unseen ? self.message_ids_to_see : self.message_ids_to_see + self.message_ids_seen # TODO check unique?
+
+    messages = []
+    message_ids.each do |message_id|
+      messages << Message.find(message_id)
+    end
+    messages
 
   end
 
diff --git a/users/app/models/user_message.rb b/users/app/models/user_message.rb
index 37aae0b..51ca46c 100644
--- a/users/app/models/user_message.rb
+++ b/users/app/models/user_message.rb
@@ -1,4 +1,5 @@
-class UserMessage < CouchRest::Model::Base
+# TODO WOULD NOT USE anymore, in proposed alternate, so delete file.
+class XXXXUserMessage < CouchRest::Model::Base
 
   use_database :user_messages
   belongs_to :user
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
index 7bffa8f..d7ada82 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -1,20 +1,23 @@
 require 'test_helper'
 
 class V1::MessagesControllerTest < ActionController::TestCase
-  
+
   #TODO ensure authentication for all tests here
 
   setup do
-    @user = FactoryGirl.build(:user)
-    @user.save
     @message = Message.new(:text => 'a test message')
     @message.save
-    @user_message = UserMessage.new(:message_id => @message.id, :user_id => @user.id)
-    @user_message.save
+    @user = FactoryGirl.build(:user)
+    @user.message_ids_to_see << @message.id
+    @user.save
+
+    # @user_message = UserMessage.new(:message_id => @message.id, :user_id => @user.id)
+    # @user_message.save
+
   end
 
   teardown do
-    @user_message.destroy
+    # @user_message.destroy
     @user.destroy
     @message.destroy
   end
@@ -26,16 +29,24 @@ class V1::MessagesControllerTest < ActionController::TestCase
   end
 
   test "mark message read for user" do
-    assert !@user_message.seen
+    #assert !@user_message.seen
+    assert @user.message_ids_to_see.include?(@message.id)
+    assert !@user.message_ids_seen.include?(@message.id)
+
     put :mark_read, :user_id => @user.id, :message_id => @message.id
-    @user_message.reload
-    assert @user_message.seen
+    #@user_message.reload
+    #assert @user_message.seen
+    @user.reload
+    assert !@user.message_ids_to_see.include?(@message.id)
+    assert @user.message_ids_seen.include?(@message.id)
     assert_json_response true
   end
 
   test "do not get seen messages" do
-    @user_message.seen = true
-    @user_message.save
+    # @user_message.seen = true
+    # @user_message.save
+    put :mark_read, :user_id => @user.id, :message_id => @message.id
+    @user.reload
     get :user_messages, :user_id => @user.id
     assert !(response.body.include? @message.text)
     assert !(response.body.include? @message.id)
-- 
cgit v1.2.3


From 4dae5eaa1bdb211d9d3ff29d5a9e9a86424e9748 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 30 Dec 2013 16:22:38 -0800
Subject: Fixes to initial go at job to send one month warnings.

---
 ...by_created_at_and_one_month_warning_not_sent.js |  5 +++++
 users/app/models/user.rb                           | 23 +++++++++++++++++++++-
 users/config/schedule.rb                           |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js

(limited to 'users')

diff --git a/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js b/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
new file mode 100644
index 0000000..53a95de
--- /dev/null
+++ b/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
@@ -0,0 +1,5 @@
+function (doc) {
+  if ((doc['type'] == 'User') && (doc['created_at'] != null) && (doc['one_month_warning_sent'] == null)) {
+    emit(doc['created_at'], 1);
+  }    
+}
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index d9b03ec..30b9ee7 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -15,6 +15,7 @@ class User < CouchRest::Model::Base
 
   property :message_ids_to_see, [String]
   property :message_ids_seen, [String]
+  property :one_month_warning_sent, TrueClass
 
   before_save :update_effective_service_level
 
@@ -135,7 +136,10 @@ class User < CouchRest::Model::Base
     ServiceLevel.new({id: code})
   end
 
-  def one_month_warning_to_pay
+
+  def self.send_one_month_warnings # class not instance method
+
+=begin
     # get all users who are not customers with active subscription and have existed for exactly a month (take account of months having difft amount of days. Maybe just those who signed up 30 days ago?)
     #users_to_warn = User.find_by_created_at(Time.now-1.month).all #NO, this will require time to be right
     #users_1_month_old = User.by_created_at.startkey(Time.now-1.month-1.day).endkey(Time.now-1.month).al
@@ -161,6 +165,23 @@ class User < CouchRest::Model::Base
         user_message.save
       end
     end
+=end
+
+    #to determine warnings to send, need to get all users where one_month_warning_sent is not set, and where it was created greater than or equal to 1 month ago. this will likely be custom js view/design
+    users_to_warn = User.by_created_at_and_one_month_warning_not_sent.endkey(Time.now-1.month)
+    users_to_warn.each do |user|
+      if !@message
+        # create a message for today's date
+        # only want to create once, and only if it will be used.
+        @message = Message.new(:text => t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
+        @message.save
+      end
+
+      user.message_ids_to_see << @message.id
+      user.one_month_warning_sent = true
+      user.save #??
+    end
+
   end
 
   protected
diff --git a/users/config/schedule.rb b/users/config/schedule.rb
index 1b2b171..9ddcf2f 100644
--- a/users/config/schedule.rb
+++ b/users/config/schedule.rb
@@ -20,5 +20,5 @@
 # Learn more: http://github.com/javan/whenever
 
 every 1.day, :at => '1am' do
-  runner "User.one_month_warning_to_pay"
+  runner "User.send_one_month_warnings
 end
-- 
cgit v1.2.3


From f9c96f8844205afe3c310b5b914752068728d38f Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 31 Dec 2013 11:48:18 -0800
Subject: Cleanup of code for messages API and cron job for 1 month payment
 warning. Authentication still remaining piece.

---
 users/app/controllers/v1/messages_controller.rb    | 15 ++-----
 users/app/models/user.rb                           | 47 +++-------------------
 users/config/schedule.rb                           |  2 +-
 .../test/functional/v1/messages_controller_test.rb | 10 -----
 4 files changed, 9 insertions(+), 65 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index 18f9f46..42a88f7 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -12,20 +12,11 @@ module V1
 
     # routes ensure this is only for PUT
     def mark_read
-=begin
-      user_message = UserMessage.find_by_user_id_and_message_id([params[:user_id], params[:message_id]])
-      user_message.seen = true if user_message
 
-      # TODO what to return?
-      if user_message and user_message.save
-        render json: true
-      else
-        render json: false
-      end
-    end
-=end
+      # make sure user and message exist
       if (user = User.find(params[:user_id])) && Message.find(params[:message_id])
-        user.message_ids_seen << params[:message_id] if !user.message_ids_seen.include?(params[:message_id]) #is it quicker to instead run uniq after adding?
+
+        user.message_ids_seen << params[:message_id] if !user.message_ids_seen.include?(params[:message_id]) #TODO: is it quicker to instead call uniq! after adding?
         user.message_ids_to_see.delete(params[:message_id])
         user.save
         render json: true
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 30b9ee7..6e445be 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -78,16 +78,6 @@ class User < CouchRest::Model::Base
 
   def messages(unseen = true)
 
-=begin
-    user_messages = unseen ? UserMessage.by_user_id_and_seen(:key => [self.id, false]).all : UserMessage.by_user_id(:key => self.id).all
-
-    messages = []
-    user_messages.each do |um|
-      messages << Message.find(um.message.id)
-    end
-    messages
-=end
-
     message_ids = unseen ? self.message_ids_to_see : self.message_ids_to_see + self.message_ids_seen # TODO check unique?
 
     messages = []
@@ -137,49 +127,22 @@ class User < CouchRest::Model::Base
   end
 
 
-  def self.send_one_month_warnings # class not instance method
-
-=begin
-    # get all users who are not customers with active subscription and have existed for exactly a month (take account of months having difft amount of days. Maybe just those who signed up 30 days ago?)
-    #users_to_warn = User.find_by_created_at(Time.now-1.month).all #NO, this will require time to be right
-    #users_1_month_old = User.by_created_at.startkey(Time.now-1.month-1.day).endkey(Time.now-1.month).al
-    users_30_days_old = User.by_created_at.startkey(Time.now-31.days).endkey(Time.now-30.days).all
-    # TODO, above really is quite problematic, in that if the cron job fails to run on 1 day, say, the warning will not get created.
-
-    users_30_days_old.each do |user|
-
-      # create a user message for each user that does not has a braintree customer, or
-      # has a braintree customer w/out an active subscription.
-      unless ((customer = Customer.find_by_user(user.id)) && customer.subscriptions)
-
-        if !@message
-          # create a message for today's date
-          # only want to create once, and only if it will be used.
-          @message = Message.new(:text => t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
-          @message.save
-        end
-
-        user_message = UserMessage.new(:message_id => @message.id, :user_id => user.id)
-        # is following preferred??
-        # user_message = UserMessage.new(:message => @message, :user => user)
-        user_message.save
-      end
-    end
-=end
+  def self.send_one_month_warnings
 
-    #to determine warnings to send, need to get all users where one_month_warning_sent is not set, and where it was created greater than or equal to 1 month ago. this will likely be custom js view/design
+    # To determine warnings to send, need to get all users where one_month_warning_sent is not set, and where it was created greater than or equal to 1 month ago.
+    # TODO: might want to further limit to enabled accounts, and, based on provider's service level configuration, for particular service levels.
     users_to_warn = User.by_created_at_and_one_month_warning_not_sent.endkey(Time.now-1.month)
     users_to_warn.each do |user|
       if !@message
         # create a message for today's date
         # only want to create once, and only if it will be used.
-        @message = Message.new(:text => t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
+        @message = Message.new(:text => I18n.t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
         @message.save
       end
 
       user.message_ids_to_see << @message.id
       user.one_month_warning_sent = true
-      user.save #??
+      user.save
     end
 
   end
diff --git a/users/config/schedule.rb b/users/config/schedule.rb
index 9ddcf2f..4ecbe7c 100644
--- a/users/config/schedule.rb
+++ b/users/config/schedule.rb
@@ -20,5 +20,5 @@
 # Learn more: http://github.com/javan/whenever
 
 every 1.day, :at => '1am' do
-  runner "User.send_one_month_warnings
+  runner "User.send_one_month_warnings"
 end
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
index d7ada82..7666ba3 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -10,14 +10,9 @@ class V1::MessagesControllerTest < ActionController::TestCase
     @user = FactoryGirl.build(:user)
     @user.message_ids_to_see << @message.id
     @user.save
-
-    # @user_message = UserMessage.new(:message_id => @message.id, :user_id => @user.id)
-    # @user_message.save
-
   end
 
   teardown do
-    # @user_message.destroy
     @user.destroy
     @message.destroy
   end
@@ -29,13 +24,10 @@ class V1::MessagesControllerTest < ActionController::TestCase
   end
 
   test "mark message read for user" do
-    #assert !@user_message.seen
     assert @user.message_ids_to_see.include?(@message.id)
     assert !@user.message_ids_seen.include?(@message.id)
 
     put :mark_read, :user_id => @user.id, :message_id => @message.id
-    #@user_message.reload
-    #assert @user_message.seen
     @user.reload
     assert !@user.message_ids_to_see.include?(@message.id)
     assert @user.message_ids_seen.include?(@message.id)
@@ -43,8 +35,6 @@ class V1::MessagesControllerTest < ActionController::TestCase
   end
 
   test "do not get seen messages" do
-    # @user_message.seen = true
-    # @user_message.save
     put :mark_read, :user_id => @user.id, :message_id => @message.id
     @user.reload
     get :user_messages, :user_id => @user.id
-- 
cgit v1.2.3


From fe3e374daa274a38723da52d929805b80f7ef383 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 31 Dec 2013 11:50:34 -0800
Subject: Removing join-model we are no longer using.

---
 users/app/models/user_message.rb | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 users/app/models/user_message.rb

(limited to 'users')

diff --git a/users/app/models/user_message.rb b/users/app/models/user_message.rb
deleted file mode 100644
index 51ca46c..0000000
--- a/users/app/models/user_message.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# TODO WOULD NOT USE anymore, in proposed alternate, so delete file.
-class XXXXUserMessage < CouchRest::Model::Base
-
-  use_database :user_messages
-  belongs_to :user
-  belongs_to :message
-
-  validates :user_id, presence: true
-  validates :message_id, presence: true
-
-  # should not have multiple rows connecting one user to particular message:
-  validates_uniqueness_of :user_id, :scope => [:message_id]
-
-  property :seen, TrueClass, :default => false
-
-  design do
-    view :by_user_id
-    view :by_message_id
-    view :by_user_id_and_seen
-    view :by_user_id_and_message_id
-    own_path = Pathname.new(File.dirname(__FILE__))
-    load_views(own_path.join('..', 'designs', 'user_message'))
-
-  end
-
-end
-- 
cgit v1.2.3


From 47d9b62913789358aefe769de6b7e33da8547891 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 31 Dec 2013 12:16:43 -0800
Subject: Add authentication to API, but not sure it is best way.

---
 users/app/controllers/v1/messages_controller.rb      | 2 +-
 users/test/functional/v1/messages_controller_test.rb | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index 42a88f7..b58dfe9 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -1,7 +1,7 @@
 module V1
   class MessagesController < ApplicationController
 
-    # TODO need to add authentication
+    before_filter :authorize_admin # not sure this is best way
     respond_to :json
 
     # for now, will not pass unseen, so unseen will always be true
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
index 7666ba3..0bc09be 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -2,14 +2,13 @@ require 'test_helper'
 
 class V1::MessagesControllerTest < ActionController::TestCase
 
-  #TODO ensure authentication for all tests here
-
   setup do
     @message = Message.new(:text => 'a test message')
     @message.save
     @user = FactoryGirl.build(:user)
     @user.message_ids_to_see << @message.id
     @user.save
+    login :is_admin? => true
   end
 
   teardown do
@@ -52,4 +51,10 @@ class V1::MessagesControllerTest < ActionController::TestCase
     assert_json_response false
  end
 
+  test "fails if not admin" do
+    login :is_admin? => false
+    get :user_messages, :user_id => @user.id
+    assert_access_denied
+  end
+
 end
-- 
cgit v1.2.3


From c7e66852324714a166dd35dc3d5873a0053dcb9b Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 7 Jan 2014 12:57:01 -0800
Subject: Some refactoring, to simplify user model, optimize, and allow
 messages to be sorted by date (although are not now.) Also, rather than use
 whenever gem, will have cron job created to call task.

---
 users/app/controllers/v1/messages_controller.rb    | 29 +++++++-------
 users/app/designs/message/by_user_ids_to_show.js   |  7 ++++
 .../message/by_user_ids_to_show_and_created_at.js  |  8 ++++
 users/app/models/message.rb                        |  4 ++
 users/app/models/user.rb                           | 14 +++----
 users/config/routes.rb                             |  3 +-
 users/leap_web_users.gemspec                       |  1 -
 users/lib/leap_web_users/engine.rb                 |  1 -
 users/lib/tasks/leap_web_users_tasks.rake          |  6 +++
 .../test/functional/v1/messages_controller_test.rb | 45 ++++++++++------------
 10 files changed, 66 insertions(+), 52 deletions(-)
 create mode 100644 users/app/designs/message/by_user_ids_to_show.js
 create mode 100644 users/app/designs/message/by_user_ids_to_show_and_created_at.js

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index b58dfe9..371b83e 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -1,30 +1,27 @@
 module V1
   class MessagesController < ApplicationController
 
-    before_filter :authorize_admin # not sure this is best way
+    skip_before_filter :verify_authenticity_token
+    before_filter :authorize
+
     respond_to :json
 
-    # for now, will not pass unseen, so unseen will always be true
-    def user_messages(unseen = true)
-      user = User.find(params[:user_id])
-      render json: (user ? user.messages : [] )
+    def index
+      render json: (current_user ? current_user.messages : [] )
     end
 
-    # routes ensure this is only for PUT
-    def mark_read
-
-      # make sure user and message exist
-      if (user = User.find(params[:user_id])) && Message.find(params[:message_id])
-
-        user.message_ids_seen << params[:message_id] if !user.message_ids_seen.include?(params[:message_id]) #TODO: is it quicker to instead call uniq! after adding?
-        user.message_ids_to_see.delete(params[:message_id])
-        user.save
+    def update
+      message = Message.find(params[:id])
+      if (message and current_user)
+        message.user_ids_to_show.delete(current_user.id)
+        # is it necessary to keep track of what users have already seen it?:
+        message.user_ids_have_shown << current_user.id if !message.user_ids_have_shown.include?(current_user.id) #TODO: is it quicker to instead call uniq! after adding?
+        message.save
         render json: true
-        return
       else
         render json: false
       end
-
     end
+
   end
 end
diff --git a/users/app/designs/message/by_user_ids_to_show.js b/users/app/designs/message/by_user_ids_to_show.js
new file mode 100644
index 0000000..95ccd0d
--- /dev/null
+++ b/users/app/designs/message/by_user_ids_to_show.js
@@ -0,0 +1,7 @@
+function (doc) {
+  if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
+    doc.user_ids_to_show.forEach(function (userIdsToShow) {
+      emit(userIdsToShow, 1);
+    });
+  }
+}
\ No newline at end of file
diff --git a/users/app/designs/message/by_user_ids_to_show_and_created_at.js b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
new file mode 100644
index 0000000..7bd7c2c
--- /dev/null
+++ b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
@@ -0,0 +1,8 @@
+// not using at moment
+function (doc) {
+  if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
+    doc.user_ids_to_show.forEach(function (userIdsToShow) {
+	emit([userIdsToShow, doc.created_at], 1);
+    });
+  }
+}
\ No newline at end of file
diff --git a/users/app/models/message.rb b/users/app/models/message.rb
index 38fa71e..16a19f4 100644
--- a/users/app/models/message.rb
+++ b/users/app/models/message.rb
@@ -3,8 +3,12 @@ class Message < CouchRest::Model::Base
   use_database :messages
 
   property :text, String
+  property :user_ids_to_show, [String]
+  property :user_ids_have_shown, [String] # is this necessary to store?
 
   design do
+    own_path = Pathname.new(File.dirname(__FILE__))
+    load_views(own_path.join('..', 'designs', 'message'))
   end
 
 end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 6e445be..71e57f3 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -13,8 +13,6 @@ class User < CouchRest::Model::Base
   property :desired_service_level_code, Integer, :accessible => true
   property :effective_service_level_code, Integer, :accessible => true
 
-  property :message_ids_to_see, [String]
-  property :message_ids_seen, [String]
   property :one_month_warning_sent, TrueClass
 
   before_save :update_effective_service_level
@@ -77,12 +75,11 @@ class User < CouchRest::Model::Base
   end
 
   def messages(unseen = true)
-
-    message_ids = unseen ? self.message_ids_to_see : self.message_ids_to_see + self.message_ids_seen # TODO check unique?
-
+    #TODO for now this only shows unseen messages. Will we ever want seen ones? Is it necessary to store?
+    #Message.by_user_ids_to_show.key(self.id).all # we don't want to emit all the userids associated with a message, so looping through to only emit text and id.
     messages = []
-    message_ids.each do |message_id|
-      messages << Message.find(message_id)
+    Message.by_user_ids_to_show.key(self.id).each do |message|
+      messages << [message.id, message.text]
     end
     messages
 
@@ -140,7 +137,8 @@ class User < CouchRest::Model::Base
         @message.save
       end
 
-      user.message_ids_to_see << @message.id
+      @message.user_ids_to_show << user.id
+      @message.save
       user.one_month_warning_sent = true
       user.save
     end
diff --git a/users/config/routes.rb b/users/config/routes.rb
index 9a7c531..2819fa9 100644
--- a/users/config/routes.rb
+++ b/users/config/routes.rb
@@ -6,8 +6,7 @@ Rails.application.routes.draw do
     resources :sessions, :only => [:new, :create, :update]
     delete "logout" => "sessions#destroy", :as => "logout"
     resources :users, :only => [:create, :update, :destroy, :index]
-    get "user_messages/:user_id" => "messages#user_messages"
-    put "mark_read/:user_id/:message_id" => "messages#mark_read"
+    resources :messages, :only => [:index, :update]
   end
 
   scope "(:locale)", :locale => MATCH_LOCALE do
diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
index 06965a7..7d1f220 100644
--- a/users/leap_web_users.gemspec
+++ b/users/leap_web_users.gemspec
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
 
   s.add_dependency "ruby-srp", "~> 0.2.1"
   s.add_dependency "rails_warden"
-  s.add_dependency "whenever"
 end
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb
index 61131ef..f8ed71c 100644
--- a/users/lib/leap_web_users/engine.rb
+++ b/users/lib/leap_web_users/engine.rb
@@ -8,7 +8,6 @@ require "warden/session_serializer"
 require "warden/strategies/secure_remote_password"
 
 require "webfinger"
-require "whenever"
 
 module LeapWebUsers
   class Engine < ::Rails::Engine
diff --git a/users/lib/tasks/leap_web_users_tasks.rake b/users/lib/tasks/leap_web_users_tasks.rake
index 3d0649c..62bcbe9 100644
--- a/users/lib/tasks/leap_web_users_tasks.rake
+++ b/users/lib/tasks/leap_web_users_tasks.rake
@@ -2,3 +2,9 @@
 # task :leap_web_users do
 #   # Task goes here
 # end
+
+# recommended that for our setup, we should have this triggered from a cron job in puppet rather than using whenever gem
+desc "Send one month warning messages"
+task :leap_web_users do
+  User.send_one_month_warnings
+end
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
index 0bc09be..24a5b1f 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/users/test/functional/v1/messages_controller_test.rb
@@ -3,57 +3,54 @@ require 'test_helper'
 class V1::MessagesControllerTest < ActionController::TestCase
 
   setup do
-    @message = Message.new(:text => 'a test message')
-    @message.save
     @user = FactoryGirl.build(:user)
-    @user.message_ids_to_see << @message.id
     @user.save
-    login :is_admin? => true
+    @message = Message.new(:text => 'a test message')
+    @message.user_ids_to_show << @user.id
+    @message.save
   end
 
   teardown do
-    @user.destroy
     @message.destroy
+    @user.destroy
   end
 
   test "get messages for user" do
-    get :user_messages, :user_id => @user.id
+    login @user
+    get :index
     assert response.body.include? @message.text
     assert response.body.include? @message.id
   end
 
   test "mark message read for user" do
-    assert @user.message_ids_to_see.include?(@message.id)
-    assert !@user.message_ids_seen.include?(@message.id)
-
-    put :mark_read, :user_id => @user.id, :message_id => @message.id
-    @user.reload
-    assert !@user.message_ids_to_see.include?(@message.id)
-    assert @user.message_ids_seen.include?(@message.id)
+    login @user
+    assert @message.user_ids_to_show.include?(@user.id)
+    assert !@message.user_ids_have_shown.include?(@user.id)
+    put :update, :id => @message.id
+    @message.reload
+    assert !@message.user_ids_to_show.include?(@user.id)
+    assert @message.user_ids_have_shown.include?(@user.id)
     assert_json_response true
   end
 
   test "do not get seen messages" do
-    put :mark_read, :user_id => @user.id, :message_id => @message.id
-    @user.reload
-    get :user_messages, :user_id => @user.id
+    login @user
+    put :update, :id => @message.id
+    @message.reload
+    get :index
     assert !(response.body.include? @message.text)
     assert !(response.body.include? @message.id)
   end
 
-  test "empty messages for non-existing user" do
-    get :user_messages, :user_id => 'some random string'
-    assert_json_response []
-  end
 
   test "mark read responds even with bad inputs" do
-    put :mark_read, :user_id => 'nonsense', :message_id => 'more nonsense'
+    login @user
+    put :update, :id => 'more nonsense'
     assert_json_response false
  end
 
-  test "fails if not admin" do
-    login :is_admin? => false
-    get :user_messages, :user_id => @user.id
+  test "fails if not authenticated" do
+    get :index, :format => :json
     assert_access_denied
   end
 
-- 
cgit v1.2.3


From 90243155b425a540cb357f1c84b93effe798c9a1 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 7 Jan 2014 13:00:50 -0800
Subject: Remove schedule file now that we aren't using whenever gem.

---
 users/config/schedule.rb | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 users/config/schedule.rb

(limited to 'users')

diff --git a/users/config/schedule.rb b/users/config/schedule.rb
deleted file mode 100644
index 4ecbe7c..0000000
--- a/users/config/schedule.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Use this file to easily define all of your cron jobs.
-#
-# It's helpful, but not entirely necessary to understand cron before proceeding.
-# http://en.wikipedia.org/wiki/Cron
-
-# Example:
-#
-# set :output, "/path/to/my/cron_log.log"
-#
-# every 2.hours do
-#   command "/usr/bin/some_great_command"
-#   runner "MyModel.some_method"
-#   rake "some:great:rake:task"
-# end
-#
-# every 4.days do
-#   runner "AnotherModel.prune_old_records"
-# end
-
-# Learn more: http://github.com/javan/whenever
-
-every 1.day, :at => '1am' do
-  runner "User.send_one_month_warnings"
-end
-- 
cgit v1.2.3


From 6c478c5a1634b5da9d269c938f67d2ac4d8f03df Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Thu, 9 Jan 2014 12:18:37 -0800
Subject: Some more cleanup, but still want to make sure
 by_user_ids_to_show_and_created_at view is right before issuing pull request.

---
 users/app/controllers/v1/messages_controller.rb                 | 5 +++--
 users/app/designs/message/by_user_ids_to_show_and_created_at.js | 2 +-
 users/app/models/message.rb                                     | 2 ++
 users/app/models/user.rb                                        | 9 +++------
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index 371b83e..1b994ca 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -14,8 +14,9 @@ module V1
       message = Message.find(params[:id])
       if (message and current_user)
         message.user_ids_to_show.delete(current_user.id)
-        # is it necessary to keep track of what users have already seen it?:
-        message.user_ids_have_shown << current_user.id if !message.user_ids_have_shown.include?(current_user.id) #TODO: is it quicker to instead call uniq! after adding?
+        # is it necessary to keep track of what users have already seen it?
+        message.user_ids_have_shown << current_user.id if !message.user_ids_have_shown.include?(current_user.id)
+        # TODO: is it quicker to call uniq! after adding rather than check if it is already included?
         message.save
         render json: true
       else
diff --git a/users/app/designs/message/by_user_ids_to_show_and_created_at.js b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
index 7bd7c2c..bb6412b 100644
--- a/users/app/designs/message/by_user_ids_to_show_and_created_at.js
+++ b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
@@ -2,7 +2,7 @@
 function (doc) {
   if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
     doc.user_ids_to_show.forEach(function (userIdsToShow) {
-	emit([userIdsToShow, doc.created_at], 1);
+      emit([userIdsToShow, doc.created_at], 1);
     });
   }
 }
\ No newline at end of file
diff --git a/users/app/models/message.rb b/users/app/models/message.rb
index 16a19f4..d9ccee8 100644
--- a/users/app/models/message.rb
+++ b/users/app/models/message.rb
@@ -6,6 +6,8 @@ class Message < CouchRest::Model::Base
   property :user_ids_to_show, [String]
   property :user_ids_have_shown, [String] # is this necessary to store?
 
+  timestamps!
+
   design do
     own_path = Pathname.new(File.dirname(__FILE__))
     load_views(own_path.join('..', 'designs', 'message'))
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 71e57f3..44237ff 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -76,12 +76,9 @@ class User < CouchRest::Model::Base
 
   def messages(unseen = true)
     #TODO for now this only shows unseen messages. Will we ever want seen ones? Is it necessary to store?
-    #Message.by_user_ids_to_show.key(self.id).all # we don't want to emit all the userids associated with a message, so looping through to only emit text and id.
-    messages = []
-    Message.by_user_ids_to_show.key(self.id).each do |message|
-      messages << [message.id, message.text]
-    end
-    messages
+
+    # we don't want to emit all the userids associated with a message, so only emit id and text.
+    Message.by_user_ids_to_show.key(self.id).map { |message| [message.id, message.text] }
 
   end
 
-- 
cgit v1.2.3


From a19d01313ac534bdbbd8381593f887f1f77c94d5 Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Mon, 13 Jan 2014 11:28:14 -0800
Subject: Comment for how to call view that we aren't now using.

---
 users/app/designs/message/by_user_ids_to_show_and_created_at.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'users')

diff --git a/users/app/designs/message/by_user_ids_to_show_and_created_at.js b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
index bb6412b..18969b8 100644
--- a/users/app/designs/message/by_user_ids_to_show_and_created_at.js
+++ b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
@@ -1,4 +1,5 @@
 // not using at moment
+// call with something like Message.by_user_ids_to_show_and_created_at.startkey([user_id, start_date]).endkey([user_id,end_date])
 function (doc) {
   if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
     doc.user_ids_to_show.forEach(function (userIdsToShow) {
-- 
cgit v1.2.3


From 3bfbf0ad20bb5b8e4689fda287cd47738571d10d Mon Sep 17 00:00:00 2001
From: jessib <jessib@riseup.net>
Date: Tue, 21 Jan 2014 11:26:19 -0800
Subject: Small optimization to saving message when sending one month warnings.

---
 users/app/models/user.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 44237ff..c297ac8 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -126,19 +126,23 @@ class User < CouchRest::Model::Base
     # To determine warnings to send, need to get all users where one_month_warning_sent is not set, and where it was created greater than or equal to 1 month ago.
     # TODO: might want to further limit to enabled accounts, and, based on provider's service level configuration, for particular service levels.
     users_to_warn = User.by_created_at_and_one_month_warning_not_sent.endkey(Time.now-1.month)
+
     users_to_warn.each do |user|
+      # instead of loop could use something like:
+      # message.user_ids_to_show = users_to_warn.map(&:id)
+      # but would still need to loop through users to store one_month_warning_sent
+
       if !@message
         # create a message for today's date
         # only want to create once, and only if it will be used.
         @message = Message.new(:text => I18n.t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
-        @message.save
       end
 
       @message.user_ids_to_show << user.id
-      @message.save
       user.one_month_warning_sent = true
       user.save
     end
+    @message.save if @message
 
   end
 
-- 
cgit v1.2.3


From bd867c51c4d9e3d4c6b4c55d326eb9b13b89288b Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Feb 2014 14:23:38 +0100
Subject: minor: move some logic from message controller into model

---
 users/app/controllers/v1/messages_controller.rb |  5 +----
 users/app/models/message.rb                     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index 1b994ca..55292ff 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -13,10 +13,7 @@ module V1
     def update
       message = Message.find(params[:id])
       if (message and current_user)
-        message.user_ids_to_show.delete(current_user.id)
-        # is it necessary to keep track of what users have already seen it?
-        message.user_ids_have_shown << current_user.id if !message.user_ids_have_shown.include?(current_user.id)
-        # TODO: is it quicker to call uniq! after adding rather than check if it is already included?
+        message.mark_as_read_by(current_user)
         message.save
         render json: true
       else
diff --git a/users/app/models/message.rb b/users/app/models/message.rb
index d9ccee8..7c05e06 100644
--- a/users/app/models/message.rb
+++ b/users/app/models/message.rb
@@ -13,4 +13,18 @@ class Message < CouchRest::Model::Base
     load_views(own_path.join('..', 'designs', 'message'))
   end
 
+  def mark_as_read_by(user)
+    user_ids_to_show.delete(user.id)
+    # is it necessary to keep track of what users have already seen it?
+    user_ids_have_shown << user.id unless read_by?(user)
+    # TODO: is it quicker to call uniq! after adding rather than check if it is already included?
+  end
+
+  def read_by?(user)
+    user_ids_have_shown.include?(user.id)
+  end
+
+  def unread_by?(user)
+    user_ids_to_shown.include?(user.id)
+  end
 end
-- 
cgit v1.2.3


From 2f00e2ec3c076e4910008904bc01e09df097944e Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Feb 2014 14:24:08 +0100
Subject: minor: rename var that holds a single user id to userId

---
 users/app/designs/message/by_user_ids_to_show.js                | 6 +++---
 users/app/designs/message/by_user_ids_to_show_and_created_at.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'users')

diff --git a/users/app/designs/message/by_user_ids_to_show.js b/users/app/designs/message/by_user_ids_to_show.js
index 95ccd0d..e33566b 100644
--- a/users/app/designs/message/by_user_ids_to_show.js
+++ b/users/app/designs/message/by_user_ids_to_show.js
@@ -1,7 +1,7 @@
 function (doc) {
   if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
-    doc.user_ids_to_show.forEach(function (userIdsToShow) {
-      emit(userIdsToShow, 1);
+    doc.user_ids_to_show.forEach(function (userId) {
+      emit(userId, 1);
     });
   }
-}
\ No newline at end of file
+}
diff --git a/users/app/designs/message/by_user_ids_to_show_and_created_at.js b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
index 18969b8..54e4604 100644
--- a/users/app/designs/message/by_user_ids_to_show_and_created_at.js
+++ b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
@@ -2,8 +2,8 @@
 // call with something like Message.by_user_ids_to_show_and_created_at.startkey([user_id, start_date]).endkey([user_id,end_date])
 function (doc) {
   if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
-    doc.user_ids_to_show.forEach(function (userIdsToShow) {
-      emit([userIdsToShow, doc.created_at], 1);
+    doc.user_ids_to_show.forEach(function (userId) {
+      emit([userId, doc.created_at], 1);
     });
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3


From e1243d02953b4012d6bb216efc9b0606809ab4bb Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 6 Feb 2014 09:47:37 +0100
Subject: minor: refactor token auth a bit

---
 .../controller_extension/token_authentication.rb         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/controller_extension/token_authentication.rb b/users/app/controllers/controller_extension/token_authentication.rb
index 530294a..cd5c074 100644
--- a/users/app/controllers/controller_extension/token_authentication.rb
+++ b/users/app/controllers/controller_extension/token_authentication.rb
@@ -1,11 +1,14 @@
 module ControllerExtension::TokenAuthentication
   extend ActiveSupport::Concern
 
-  def token_authenticate
-    authenticate_with_http_token do |token_id, options|
-      @token = Token.find(token_id)
+  def token
+    @token ||= authenticate_with_http_token do |token_id, options|
+      Token.find(token_id)
     end
-    @token.authenticate if @token
+  end
+
+  def token_authenticate
+    token.authenticate if token
   end
 
   def logout
@@ -14,10 +17,7 @@ module ControllerExtension::TokenAuthentication
   end
 
   def clear_token
-    authenticate_with_http_token do |token_id, options|
-      @token = Token.find(token_id)
-      @token.destroy if @token
-    end
+    token.destroy if token
   end
 end
 
-- 
cgit v1.2.3


From 3f9dc65636afb57fed441978dca4bf7d3209bd2d Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 7 Feb 2014 14:38:56 +0100
Subject: rename authorize to require_login

authorize_admin -> require_admin

also add require_token which will ensure token has been used for auth.
---
 users/app/controllers/controller_extension/authentication.rb |  4 ++--
 .../controllers/controller_extension/token_authentication.rb |  4 ++++
 users/app/controllers/users_controller.rb                    |  4 ++--
 users/app/controllers/v1/users_controller.rb                 |  4 ++--
 users/test/functional/application_controller_test.rb         | 12 ++++++------
 users/test/functional/v1/sessions_controller_test.rb         |  2 +-
 users/test/unit/unauthenticated_user_test.rb                 |  7 +++++++
 users/test/unit/unauthorized_user_test.rb                    |  7 -------
 8 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 users/test/unit/unauthenticated_user_test.rb
 delete mode 100644 users/test/unit/unauthorized_user_test.rb

(limited to 'users')

diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index d831fbe..e83d6b2 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -15,7 +15,7 @@ module ControllerExtension::Authentication
     !!current_user
   end
 
-  def authorize
+  def require_login
     access_denied unless logged_in?
   end
 
@@ -38,7 +38,7 @@ module ControllerExtension::Authentication
     current_user && current_user.is_admin?
   end
 
-  def authorize_admin
+  def require_admin
     access_denied unless admin?
   end
 
diff --git a/users/app/controllers/controller_extension/token_authentication.rb b/users/app/controllers/controller_extension/token_authentication.rb
index cd5c074..ee24f73 100644
--- a/users/app/controllers/controller_extension/token_authentication.rb
+++ b/users/app/controllers/controller_extension/token_authentication.rb
@@ -11,6 +11,10 @@ module ControllerExtension::TokenAuthentication
     token.authenticate if token
   end
 
+  def require_token
+    access_denied unless token
+  end
+
   def logout
     super
     clear_token
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index a5461cd..6b32d49 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -4,9 +4,9 @@
 
 class UsersController < UsersBaseController
 
-  before_filter :authorize, :only => [:show, :edit, :update, :destroy]
+  before_filter :require_login, :except => [:new]
+  before_filter :require_admin, :only => [:index, :deactivate, :enable]
   before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable]
-  before_filter :authorize_admin, :only => [:index, :deactivate, :enable]
 
   respond_to :html
 
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index 0903888..a16c6e9 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -3,8 +3,8 @@ module V1
 
     skip_before_filter :verify_authenticity_token
     before_filter :fetch_user, :only => [:update]
-    before_filter :authorize, :only => [:update]
-    before_filter :authorize_admin, :only => [:index]
+    before_filter :require_login, :only => [:update, :index]
+    before_filter :require_admin, :only => [:index]
 
     respond_to :json
 
diff --git a/users/test/functional/application_controller_test.rb b/users/test/functional/application_controller_test.rb
index 94b77bd..c4c922b 100644
--- a/users/test/functional/application_controller_test.rb
+++ b/users/test/functional/application_controller_test.rb
@@ -7,21 +7,21 @@ class ApplicationControllerTest < ActionController::TestCase
     @controller.response = @response
   end
 
-  def test_authorize_redirect
-    @controller.send(:authorize)
+  def test_require_login_redirect
+    @controller.send(:require_login)
     assert_access_denied(true, false)
   end
 
-  def test_authorized
+  def test_require_login
     login
-    @controller.send(:authorize)
+    @controller.send(:require_login)
     assert_access_denied(false)
   end
 
-  def test_authorize_admin
+  def test_require_admin
     login
     @current_user.expects(:is_admin?).returns(false)
-    @controller.send(:authorize_admin)
+    @controller.send(:require_admin)
     assert_access_denied
   end
 
diff --git a/users/test/functional/v1/sessions_controller_test.rb b/users/test/functional/v1/sessions_controller_test.rb
index 4200e8f..df0d681 100644
--- a/users/test/functional/v1/sessions_controller_test.rb
+++ b/users/test/functional/v1/sessions_controller_test.rb
@@ -36,7 +36,7 @@ class V1::SessionsControllerTest < ActionController::TestCase
     post :create, :login => @user.login, 'A' => @client_hex
   end
 
-  test "should authorize" do
+  test "should authenticate" do
     request.env['warden'].expects(:authenticate!)
     @controller.stubs(:current_user).returns(@user)
     handshake = stub(:to_hash => {h: "ash"})
diff --git a/users/test/unit/unauthenticated_user_test.rb b/users/test/unit/unauthenticated_user_test.rb
new file mode 100644
index 0000000..e5fafb8
--- /dev/null
+++ b/users/test/unit/unauthenticated_user_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UnauthenticatedUserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/users/test/unit/unauthorized_user_test.rb b/users/test/unit/unauthorized_user_test.rb
deleted file mode 100644
index 5b96ae1..0000000
--- a/users/test/unit/unauthorized_user_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UnauthorizedUserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
-- 
cgit v1.2.3


From 67f17e65b9e9e8ad2991b9c4002dba5203baa77f Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 8 Feb 2014 11:13:10 +0100
Subject: refactor tests to ease the testing of token only auth

---
 users/test/integration/api/account_flow_test.rb | 114 +++++-------------------
 users/test/integration/api/login_test.rb        |   3 +-
 users/test/integration/api/pgp_key_test.rb      |  35 ++++++++
 users/test/integration/api/rack_test.rb         |   9 --
 users/test/integration/api/srp_test.rb          |  83 +++++++++++++++++
 users/test/support/integration_test_helper.rb   |  12 ---
 6 files changed, 141 insertions(+), 115 deletions(-)
 create mode 100644 users/test/integration/api/pgp_key_test.rb
 delete mode 100644 users/test/integration/api/rack_test.rb
 create mode 100644 users/test/integration/api/srp_test.rb
 delete mode 100644 users/test/support/integration_test_helper.rb

(limited to 'users')

diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
index edd0859..b56d07b 100644
--- a/users/test/integration/api/account_flow_test.rb
+++ b/users/test/integration/api/account_flow_test.rb
@@ -1,50 +1,10 @@
 require 'test_helper'
-require_relative 'rack_test'
+require_relative 'srp_test'
 
-class AccountFlowTest < RackTest
+class AccountFlowTest < SrpTest
 
   setup do
-    @login = "integration_test_user"
-    Identity.find_by_address(@login + '@' + APP_CONFIG[:domain]).tap{|i| i.destroy if i}
-    User.find_by_login(@login).tap{|u| u.destroy if u}
-    @password = "srp, verify me!"
-    @srp = SRP::Client.new @login, :password => @password
-    @user_params = {
-      :login => @login,
-      :password_verifier => @srp.verifier.to_s(16),
-      :password_salt => @srp.salt.to_s(16)
-    }
-    post 'http://api.lvh.me:3000/1/users.json', :user => @user_params
-    @user = User.find_by_login(@login)
-  end
-
-  teardown do
-    if @user.reload
-      @user.identity.destroy
-      @user.destroy
-    end
-    Warden.test_reset!
-  end
-
-  # this test wraps the api and implements the interface the ruby-srp client.
-  def handshake(login, aa)
-    post "http://api.lvh.me:3000/1/sessions.json",
-      :login => login,
-      'A' => aa,
-      :format => :json
-    response = JSON.parse(last_response.body)
-    if response['errors']
-      raise RECORD_NOT_FOUND.new(response['errors'])
-    else
-      return response['B']
-    end
-  end
-
-  def validate(m)
-    put "http://api.lvh.me:3000/1/sessions/" + @login + '.json',
-      :client_auth => m,
-      :format => :json
-    return JSON.parse(last_response.body)
+    register_user
   end
 
   test "signup response" do
@@ -53,25 +13,22 @@ class AccountFlowTest < RackTest
   end
 
   test "signup and login with srp via api" do
-    server_auth = @srp.authenticate(self)
+    authenticate
     assert last_response.successful?
     assert_nil server_auth["errors"]
     assert server_auth["M2"]
   end
 
   test "signup and wrong password login attempt" do
-    srp = SRP::Client.new @login, :password => "wrong password"
-    server_auth = srp.authenticate(self)
+    authenticate password: "wrong password"
     assert_json_error "base" => "Not a valid username/password combination"
     assert !last_response.successful?
     assert_nil server_auth["M2"]
   end
 
   test "signup and wrong username login attempt" do
-    srp = SRP::Client.new "wrong_login", :password => @password
-    server_auth = nil
     assert_raises RECORD_NOT_FOUND do
-      server_auth = srp.authenticate(self)
+      authenticate login: "wrong login"
     end
     assert_json_error "base" => "Not a valid username/password combination"
     assert !last_response.successful?
@@ -79,58 +36,31 @@ class AccountFlowTest < RackTest
   end
 
   test "update password via api" do
-    @srp.authenticate(self)
-    @password = "No! Verify me instead."
-    @srp = SRP::Client.new @login, :password => @password
-    @user_params = {
-    #  :login => @login,
-      :password_verifier => @srp.verifier.to_s(16),
-      :password_salt => @srp.salt.to_s(16)
-    }
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
-      :user => @user_params,
-      :format => :json
-    server_auth = @srp.authenticate(self)
+    authenticate
+    update_user password: "No! Verify me instead."
+    authenticate
     assert last_response.successful?
     assert_nil server_auth["errors"]
     assert server_auth["M2"]
   end
 
+  test "change login with password_verifier" do
+    authenticate
+    new_login = 'zaph'
+    cleanup_user new_login
+    update_user login: new_login, password: @password
+    assert last_response.successful?
+    assert_equal new_login, @user.reload.login
+  end
+
   test "prevent changing login without changing password_verifier" do
-    server_auth = @srp.authenticate(self)
+    authenticate
     original_login = @user.login
     new_login = 'zaph'
-    User.find_by_login(new_login).try(:destroy)
-    Identity.by_address.key(new_login + '@' + APP_CONFIG[:domain]).each do |identity|
-      identity.destroy
-    end
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:login => new_login}, :format => :json
+    cleanup_user new_login
+    update_user login: new_login
     assert last_response.successful?
     # does not change login if no password_verifier is present
-    assert_equal original_login, @user.login
-  end
-
-  test "upload pgp key" do
-    server_auth = @srp.authenticate(self)
-    key = FactoryGirl.build :pgp_key
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:public_key => key}, :format => :json
-    assert_equal key, Identity.for(@user).keys[:pgp]
+    assert_equal original_login, @user.reload.login
   end
-
-  # eventually probably want to remove most of this into a non-integration
-  # functional test
-  test "prevent uploading invalid key" do
-    server_auth = @srp.authenticate(self)
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:public_key => :blah}, :format => :json
-    assert_nil Identity.for(@user).keys[:pgp]
-  end
-
-  test "prevent emptying public key" do
-    server_auth = @srp.authenticate(self)
-    key = FactoryGirl.build :pgp_key
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:public_key => key}, :format => :json
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json', :user => {:public_key => ""}, :format => :json
-    assert_equal key, Identity.for(@user).keys[:pgp]
-  end
-
 end
diff --git a/users/test/integration/api/login_test.rb b/users/test/integration/api/login_test.rb
index fb761e5..a760d38 100644
--- a/users/test/integration/api/login_test.rb
+++ b/users/test/integration/api/login_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'
-require_relative 'rack_test'
 
-class AccountFlowTest < RackTest
+class LoginTest < RackTest
 
   setup do
     @login = "integration_test_user"
diff --git a/users/test/integration/api/pgp_key_test.rb b/users/test/integration/api/pgp_key_test.rb
new file mode 100644
index 0000000..4c7fb4c
--- /dev/null
+++ b/users/test/integration/api/pgp_key_test.rb
@@ -0,0 +1,35 @@
+require 'test_helper'
+require_relative 'srp_test'
+
+class PgpKeyTest < SrpTest
+
+  setup do
+    # todo: prepare user and login without doing the srp dance
+    register_user
+    authenticate
+  end
+
+  test "upload pgp key" do
+    update_user public_key: key
+    assert_equal key, Identity.for(@user).keys[:pgp]
+  end
+
+  # eventually probably want to remove most of this into a non-integration
+  # functional test
+  test "prevent uploading invalid key" do
+    update_user public_key: "invalid key"
+    assert_nil Identity.for(@user).keys[:pgp]
+  end
+
+  test "prevent emptying public key" do
+    update_user public_key: key
+    update_user public_key: ""
+    assert_equal key, Identity.for(@user).keys[:pgp]
+  end
+
+  protected
+
+  def key
+    @key ||= FactoryGirl.build :pgp_key
+  end
+end
diff --git a/users/test/integration/api/rack_test.rb b/users/test/integration/api/rack_test.rb
deleted file mode 100644
index 9a69f52..0000000
--- a/users/test/integration/api/rack_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class RackTest < ActiveSupport::TestCase
-  include Rack::Test::Methods
-  include Warden::Test::Helpers
-  include LeapWebCore::AssertResponses
-
-  def app
-    OUTER_APP
-  end
-end
diff --git a/users/test/integration/api/srp_test.rb b/users/test/integration/api/srp_test.rb
new file mode 100644
index 0000000..b291269
--- /dev/null
+++ b/users/test/integration/api/srp_test.rb
@@ -0,0 +1,83 @@
+class SrpTest < RackTest
+
+  teardown do
+    if @user
+      cleanup_user
+    end
+    Warden.test_reset!
+  end
+
+  # this test wraps the api and implements the interface the ruby-srp client.
+  def handshake(login, aa)
+    post "http://api.lvh.me:3000/1/sessions.json",
+      :login => login,
+      'A' => aa,
+      :format => :json
+    response = JSON.parse(last_response.body)
+    if response['errors']
+      raise RECORD_NOT_FOUND.new(response['errors'])
+    else
+      return response['B']
+    end
+  end
+
+  def validate(m)
+    put "http://api.lvh.me:3000/1/sessions/" + @login + '.json',
+      :client_auth => m,
+      :format => :json
+    return JSON.parse(last_response.body)
+  end
+
+  protected
+
+  attr_reader :server_auth
+
+  def register_user(login = "integration_test_user", password = 'srp, verify me!')
+    cleanup_user(login)
+    post 'http://api.lvh.me:3000/1/users.json',
+      user: user_params(login: login, password: password),
+      format: :json
+    @user = User.find_by_login(login)
+    @login = login
+    @password = password
+  end
+
+  def update_user(params)
+    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
+      :user => user_params(params),
+      :format => :json
+  end
+
+  def authenticate(params = nil)
+    @server_auth = srp(params).authenticate(self)
+  end
+
+  def cleanup_user(login = nil)
+    login ||= @user.login
+    Identity.by_address.key(login + '@' + APP_CONFIG[:domain]).each do |identity|
+      identity.destroy
+    end
+    if user = User.find_by_login(login)
+      user.destroy
+    end
+  end
+
+  def user_params(params)
+    # if there is no srp magic needed just return the params
+    return params unless params.keys.include?(:password)
+    params.reverse_merge! login: @login, salt: @salt
+    @srp = SRP::Client.new params[:login], password: params.delete(:password)
+    @salt = srp.salt.to_s(16)
+    params.merge :password_verifier => srp.verifier.to_s(16),
+      :password_salt => @salt
+  end
+
+  def srp(params = nil)
+    if params.nil?
+      @srp
+    else
+      params.reverse_merge! password: @password
+      SRP::Client.new(params.delete(:login) || @login, params)
+    end
+  end
+end
diff --git a/users/test/support/integration_test_helper.rb b/users/test/support/integration_test_helper.rb
deleted file mode 100644
index 51e47c6..0000000
--- a/users/test/support/integration_test_helper.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-module IntegrationTestHelper
-  def submit_signup(username = nil, password = nil)
-    username ||= "test_#{SecureRandom.urlsafe_base64}".downcase
-    password ||= SecureRandom.base64
-    visit '/users/new'
-    fill_in 'Username', with: username
-    fill_in 'Password', with: password
-    fill_in 'Password confirmation', with: password
-    click_on 'Sign Up'
-    return username, password
-  end
-end
-- 
cgit v1.2.3


From 758b9a3c30a73fd985943fb7a887f0373be3a833 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 8 Feb 2014 12:29:08 +0100
Subject: split up and expand account integration test

---
 users/test/integration/api/account_flow_test.rb   | 66 -----------------------
 users/test/integration/api/login_test.rb          | 38 +++++++++++--
 users/test/integration/api/signup_test.rb         | 20 +++++++
 users/test/integration/api/srp_test.rb            |  5 ++
 users/test/integration/api/update_account_test.rb | 44 +++++++++++++++
 5 files changed, 102 insertions(+), 71 deletions(-)
 delete mode 100644 users/test/integration/api/account_flow_test.rb
 create mode 100644 users/test/integration/api/signup_test.rb
 create mode 100644 users/test/integration/api/update_account_test.rb

(limited to 'users')

diff --git a/users/test/integration/api/account_flow_test.rb b/users/test/integration/api/account_flow_test.rb
deleted file mode 100644
index b56d07b..0000000
--- a/users/test/integration/api/account_flow_test.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'test_helper'
-require_relative 'srp_test'
-
-class AccountFlowTest < SrpTest
-
-  setup do
-    register_user
-  end
-
-  test "signup response" do
-    assert_json_response :login => @login, :ok => true
-    assert last_response.successful?
-  end
-
-  test "signup and login with srp via api" do
-    authenticate
-    assert last_response.successful?
-    assert_nil server_auth["errors"]
-    assert server_auth["M2"]
-  end
-
-  test "signup and wrong password login attempt" do
-    authenticate password: "wrong password"
-    assert_json_error "base" => "Not a valid username/password combination"
-    assert !last_response.successful?
-    assert_nil server_auth["M2"]
-  end
-
-  test "signup and wrong username login attempt" do
-    assert_raises RECORD_NOT_FOUND do
-      authenticate login: "wrong login"
-    end
-    assert_json_error "base" => "Not a valid username/password combination"
-    assert !last_response.successful?
-    assert_nil server_auth
-  end
-
-  test "update password via api" do
-    authenticate
-    update_user password: "No! Verify me instead."
-    authenticate
-    assert last_response.successful?
-    assert_nil server_auth["errors"]
-    assert server_auth["M2"]
-  end
-
-  test "change login with password_verifier" do
-    authenticate
-    new_login = 'zaph'
-    cleanup_user new_login
-    update_user login: new_login, password: @password
-    assert last_response.successful?
-    assert_equal new_login, @user.reload.login
-  end
-
-  test "prevent changing login without changing password_verifier" do
-    authenticate
-    original_login = @user.login
-    new_login = 'zaph'
-    cleanup_user new_login
-    update_user login: new_login
-    assert last_response.successful?
-    # does not change login if no password_verifier is present
-    assert_equal original_login, @user.reload.login
-  end
-end
diff --git a/users/test/integration/api/login_test.rb b/users/test/integration/api/login_test.rb
index a760d38..82219d0 100644
--- a/users/test/integration/api/login_test.rb
+++ b/users/test/integration/api/login_test.rb
@@ -1,15 +1,43 @@
 require 'test_helper'
+require_relative 'srp_test'
 
-class LoginTest < RackTest
+class LoginTest < SrpTest
 
   setup do
-    @login = "integration_test_user"
+    register_user
   end
 
-  test "require json requests" do
-    put "http://api.lvh.me:3000/1/sessions/" + @login,
-      :client_auth => "This is not a valid login anyway"
+  test "requires handshake before validation" do
+    validate("bla")
     assert_json_error login: I18n.t(:all_strategies_failed)
   end
 
+  test "login with srp" do
+    authenticate
+    assert last_response.successful?
+    assert_nil server_auth["errors"]
+    assert server_auth["M2"]
+  end
+
+  test "wrong password login attempt" do
+    authenticate password: "wrong password"
+    assert_json_error "base" => "Not a valid username/password combination"
+    assert !last_response.successful?
+    assert_nil server_auth["M2"]
+  end
+
+  test "wrong username login attempt" do
+    assert_raises RECORD_NOT_FOUND do
+      authenticate login: "wrong login"
+    end
+    assert_json_error "base" => "Not a valid username/password combination"
+    assert !last_response.successful?
+    assert_nil server_auth
+  end
+
+  test "logout" do
+    authenticate
+    logout
+    assert_equal 204, last_response.status
+  end
 end
diff --git a/users/test/integration/api/signup_test.rb b/users/test/integration/api/signup_test.rb
new file mode 100644
index 0000000..236c547
--- /dev/null
+++ b/users/test/integration/api/signup_test.rb
@@ -0,0 +1,20 @@
+require 'test_helper'
+require_relative 'srp_test'
+
+class SignupTest < SrpTest
+
+  setup do
+    register_user
+  end
+
+  test "signup response" do
+    assert_json_response :login => @login, :ok => true
+    assert last_response.successful?
+  end
+
+  test "signup creates user" do
+    assert @user
+    assert_equal @login, @user.login
+  end
+end
+
diff --git a/users/test/integration/api/srp_test.rb b/users/test/integration/api/srp_test.rb
index b291269..bb24f5f 100644
--- a/users/test/integration/api/srp_test.rb
+++ b/users/test/integration/api/srp_test.rb
@@ -52,6 +52,11 @@ class SrpTest < RackTest
     @server_auth = srp(params).authenticate(self)
   end
 
+  def logout
+    delete "http://api.lvh.me:3000/1/logout.json",
+      format: :json
+  end
+
   def cleanup_user(login = nil)
     login ||= @user.login
     Identity.by_address.key(login + '@' + APP_CONFIG[:domain]).each do |identity|
diff --git a/users/test/integration/api/update_account_test.rb b/users/test/integration/api/update_account_test.rb
new file mode 100644
index 0000000..16c2357
--- /dev/null
+++ b/users/test/integration/api/update_account_test.rb
@@ -0,0 +1,44 @@
+require 'test_helper'
+require_relative 'srp_test'
+
+class UpdateAccountTest < SrpTest
+
+  setup do
+    register_user
+  end
+
+  test "require authentication" do
+    update_user password: "No! Verify me instead."
+    assert_access_denied
+  end
+
+  test "update password via api" do
+    authenticate
+    update_user password: "No! Verify me instead."
+    authenticate
+    assert last_response.successful?
+    assert_nil server_auth["errors"]
+    assert server_auth["M2"]
+  end
+
+  test "change login with password_verifier" do
+    authenticate
+    new_login = 'zaph'
+    cleanup_user new_login
+    update_user login: new_login, password: @password
+    authenticate
+    assert last_response.successful?
+    assert_equal new_login, @user.reload.login
+  end
+
+  test "prevent changing login without changing password_verifier" do
+    authenticate
+    original_login = @user.login
+    new_login = 'zaph'
+    cleanup_user new_login
+    update_user login: new_login
+    assert last_response.successful?
+    # does not change login if no password_verifier is present
+    assert_equal original_login, @user.reload.login
+  end
+end
-- 
cgit v1.2.3


From cbd757cf151cd61bfdd5637d09f43e4831fec3bb Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 8 Feb 2014 16:15:46 +0100
Subject: require token when updating user via API

---
 users/app/controllers/v1/users_controller.rb      |  2 +-
 users/test/integration/api/login_test.rb          |  1 +
 users/test/integration/api/srp_test.rb            | 29 +++++++++++++++++------
 users/test/integration/api/update_account_test.rb |  7 ++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index a16c6e9..8897d01 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -3,8 +3,8 @@ module V1
 
     skip_before_filter :verify_authenticity_token
     before_filter :fetch_user, :only => [:update]
-    before_filter :require_login, :only => [:update, :index]
     before_filter :require_admin, :only => [:index]
+    before_filter :require_token, :only => [:update]
 
     respond_to :json
 
diff --git a/users/test/integration/api/login_test.rb b/users/test/integration/api/login_test.rb
index 82219d0..d56dfd1 100644
--- a/users/test/integration/api/login_test.rb
+++ b/users/test/integration/api/login_test.rb
@@ -14,6 +14,7 @@ class LoginTest < SrpTest
 
   test "login with srp" do
     authenticate
+    assert_equal ["M2", "id", "token"], server_auth.keys
     assert last_response.successful?
     assert_nil server_auth["errors"]
     assert server_auth["M2"]
diff --git a/users/test/integration/api/srp_test.rb b/users/test/integration/api/srp_test.rb
index bb24f5f..fcda187 100644
--- a/users/test/integration/api/srp_test.rb
+++ b/users/test/integration/api/srp_test.rb
@@ -35,8 +35,7 @@ class SrpTest < RackTest
   def register_user(login = "integration_test_user", password = 'srp, verify me!')
     cleanup_user(login)
     post 'http://api.lvh.me:3000/1/users.json',
-      user: user_params(login: login, password: password),
-      format: :json
+      user_params(login: login, password: password)
     @user = User.find_by_login(login)
     @login = login
     @password = password
@@ -44,14 +43,25 @@ class SrpTest < RackTest
 
   def update_user(params)
     put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
-      :user => user_params(params),
-      :format => :json
+      user_params(params),
+      auth_headers
   end
 
   def authenticate(params = nil)
     @server_auth = srp(params).authenticate(self)
   end
 
+  def auth_headers
+    return {} if @server_auth.nil?
+    {
+      "HTTP_AUTHORIZATION" => encoded_token
+    }
+  end
+
+  def encoded_token
+    ActionController::HttpAuthentication::Token.encode_credentials(server_auth["token"])
+  end
+
   def logout
     delete "http://api.lvh.me:3000/1/logout.json",
       format: :json
@@ -68,12 +78,17 @@ class SrpTest < RackTest
   end
 
   def user_params(params)
-    # if there is no srp magic needed just return the params
-    return params unless params.keys.include?(:password)
+    if params.keys.include?(:password)
+      srp_process_password(params)
+    end
+    return { user: params, format: :json }
+  end
+
+  def srp_process_password(params)
     params.reverse_merge! login: @login, salt: @salt
     @srp = SRP::Client.new params[:login], password: params.delete(:password)
     @salt = srp.salt.to_s(16)
-    params.merge :password_verifier => srp.verifier.to_s(16),
+    params.merge! :password_verifier => srp.verifier.to_s(16),
       :password_salt => @salt
   end
 
diff --git a/users/test/integration/api/update_account_test.rb b/users/test/integration/api/update_account_test.rb
index 16c2357..63429e7 100644
--- a/users/test/integration/api/update_account_test.rb
+++ b/users/test/integration/api/update_account_test.rb
@@ -12,6 +12,13 @@ class UpdateAccountTest < SrpTest
     assert_access_denied
   end
 
+  test "require token" do
+    authenticate
+    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
+      user_params(password: "No! Verify me instead.")
+    assert_access_denied
+  end
+
   test "update password via api" do
     authenticate
     update_user password: "No! Verify me instead."
-- 
cgit v1.2.3


From c8fcd0d26c3ad5c1c3cfbaf6b57239f907925ed6 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sat, 8 Feb 2014 16:20:37 +0100
Subject: require token when logging out via API

---
 users/app/controllers/v1/sessions_controller.rb | 1 +
 users/test/integration/api/login_test.rb        | 6 ++++++
 users/test/integration/api/srp_test.rb          | 5 +++--
 3 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
index eb6c322..eae3a1e 100644
--- a/users/app/controllers/v1/sessions_controller.rb
+++ b/users/app/controllers/v1/sessions_controller.rb
@@ -2,6 +2,7 @@ module V1
   class SessionsController < ApplicationController
 
     skip_before_filter :verify_authenticity_token
+    before_filter :require_token, only: :destroy
 
     def new
       @session = Session.new
diff --git a/users/test/integration/api/login_test.rb b/users/test/integration/api/login_test.rb
index d56dfd1..92d153f 100644
--- a/users/test/integration/api/login_test.rb
+++ b/users/test/integration/api/login_test.rb
@@ -41,4 +41,10 @@ class LoginTest < SrpTest
     logout
     assert_equal 204, last_response.status
   end
+
+  test "logout requires token" do
+    authenticate
+    logout(nil, {})
+    assert_equal 422, last_response.status
+  end
 end
diff --git a/users/test/integration/api/srp_test.rb b/users/test/integration/api/srp_test.rb
index fcda187..946450e 100644
--- a/users/test/integration/api/srp_test.rb
+++ b/users/test/integration/api/srp_test.rb
@@ -62,9 +62,10 @@ class SrpTest < RackTest
     ActionController::HttpAuthentication::Token.encode_credentials(server_auth["token"])
   end
 
-  def logout
+  def logout(params=nil, headers=nil)
     delete "http://api.lvh.me:3000/1/logout.json",
-      format: :json
+      params || {format: :json},
+      headers || auth_headers
   end
 
   def cleanup_user(login = nil)
-- 
cgit v1.2.3


From 3a478804aa48b08fbeded5144677744c427c112f Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Feb 2014 14:29:34 +0100
Subject: require token in messages controller

---
 users/app/controllers/v1/messages_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
index 1b994ca..90986e2 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/users/app/controllers/v1/messages_controller.rb
@@ -2,7 +2,7 @@ module V1
   class MessagesController < ApplicationController
 
     skip_before_filter :verify_authenticity_token
-    before_filter :authorize
+    before_filter :require_token
 
     respond_to :json
 
-- 
cgit v1.2.3


From b6c8279a39f933257be11fc29f5b7d59efff743f Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Feb 2014 14:34:17 +0100
Subject: require_token now checks for token and login

---
 users/app/controllers/controller_extension/token_authentication.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/controller_extension/token_authentication.rb b/users/app/controllers/controller_extension/token_authentication.rb
index ee24f73..6e0a6ce 100644
--- a/users/app/controllers/controller_extension/token_authentication.rb
+++ b/users/app/controllers/controller_extension/token_authentication.rb
@@ -8,11 +8,11 @@ module ControllerExtension::TokenAuthentication
   end
 
   def token_authenticate
-    token.authenticate if token
+    @token_authenticated ||= token.authenticate if token
   end
 
   def require_token
-    access_denied unless token
+    access_denied unless token_authenticate
   end
 
   def logout
-- 
cgit v1.2.3


From e3577906891f9ab0edd987544e3432f354bc1721 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 10 Feb 2014 19:41:02 +0100
Subject: fix unread_by? to check user_ids_to_show, remove TODO

uniq! is probably not any faster than just checking include?
---
 users/app/models/message.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/models/message.rb b/users/app/models/message.rb
index 7c05e06..424f094 100644
--- a/users/app/models/message.rb
+++ b/users/app/models/message.rb
@@ -17,7 +17,6 @@ class Message < CouchRest::Model::Base
     user_ids_to_show.delete(user.id)
     # is it necessary to keep track of what users have already seen it?
     user_ids_have_shown << user.id unless read_by?(user)
-    # TODO: is it quicker to call uniq! after adding rather than check if it is already included?
   end
 
   def read_by?(user)
@@ -25,6 +24,6 @@ class Message < CouchRest::Model::Base
   end
 
   def unread_by?(user)
-    user_ids_to_shown.include?(user.id)
+    user_ids_to_show.include?(user.id)
   end
 end
-- 
cgit v1.2.3


From 85aabe832eb3eec10a29054ef5575618686eef33 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 4 Apr 2014 11:48:24 +0200
Subject: 5382 - prevent crash when destroying tokens

An expired token was removed (probably by automatic cleanup) while processing it. So the webapp crashed due to a couch 404.

We're preventing that by rescueing from a 404 on Token.delete by default.
---
 users/app/models/token.rb     | 8 ++++++++
 users/test/unit/token_test.rb | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/app/models/token.rb b/users/app/models/token.rb
index 001eb40..4856c31 100644
--- a/users/app/models/token.rb
+++ b/users/app/models/token.rb
@@ -40,6 +40,14 @@ class Token < CouchRest::Model::Base
     end
   end
 
+  # Tokens can be cleaned up in different ways.
+  # So let's make sure we don't crash if they disappeared
+  def destroy_with_rescue
+    destroy_without_rescue
+  rescue RestClient::ResourceNotFound
+  end
+  alias_method_chain :destroy, :rescue
+
   def touch
     self.last_seen_at = Time.now
     save
diff --git a/users/test/unit/token_test.rb b/users/test/unit/token_test.rb
index 6c9f209..a3c6cf6 100644
--- a/users/test/unit/token_test.rb
+++ b/users/test/unit/token_test.rb
@@ -78,6 +78,12 @@ class ClientCertificateTest < ActiveSupport::TestCase
   end
 
 
-
+  test "Token.destroy_all_expired does not interfere with expired.authenticate" do
+    expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago
+    with_config auth: {token_expires_after: 60} do
+      Token.destroy_all_expired
+    end
+    assert_nil expired.authenticate
+  end
 
 end
-- 
cgit v1.2.3


From aeb5d8cf8dc6329906f14bf4595a229e002691c1 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 4 Apr 2014 15:40:22 +0200
Subject: redirect home when logged in visits /signup (#5446)

---
 users/app/controllers/controller_extension/authentication.rb | 7 +++++++
 users/app/controllers/sessions_controller.rb                 | 3 ++-
 users/app/controllers/users_controller.rb                    | 1 +
 users/test/functional/users_controller_test.rb               | 8 +++++++-
 4 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'users')

diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
index e83d6b2..03d3989 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/users/app/controllers/controller_extension/authentication.rb
@@ -19,6 +19,13 @@ module ControllerExtension::Authentication
     access_denied unless logged_in?
   end
 
+  # some actions only make sense if you are not logged in yet.
+  # (login, signup). If a user tries to perform these they will
+  # be redirected to their dashboard.
+  def redirect_if_logged_in
+    redirect_to home_url if logged_in?
+  end
+
   def access_denied
     respond_to do |format|
       format.html do
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index 0195f30..8919a4d 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -1,7 +1,8 @@
 class SessionsController < ApplicationController
 
+  before_filter :redirect_if_logged_in, :only => [:new]
+
   def new
-    redirect_to home_url if logged_in?
     @session = Session.new
     if authentication_errors
       @errors = authentication_errors
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 6b32d49..c8e09b6 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -5,6 +5,7 @@
 class UsersController < UsersBaseController
 
   before_filter :require_login, :except => [:new]
+  before_filter :redirect_if_logged_in, :only => [:new]
   before_filter :require_admin, :only => [:index, :deactivate, :enable]
   before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable]
 
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 57ae94d..0713836 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -4,11 +4,17 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should get new" do
     get :new
-
     assert_equal User, assigns(:user).class
     assert_response :success
   end
 
+  test "new should redirect logged in users" do
+    login
+    get :new
+    assert_response :redirect
+    assert_redirected_to home_path
+  end
+
   test "failed show without login" do
     user = find_record :user
     get :show, :id => user.id
-- 
cgit v1.2.3


From 53808b073f539ba2b442738b6abf97228488e311 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 8 Apr 2014 09:12:37 +0200
Subject: moving all of core into toplevel, tests fail.

---
 users/leap_web_users.gemspec       | 2 --
 users/lib/leap_web_users/engine.rb | 2 --
 2 files changed, 4 deletions(-)

(limited to 'users')

diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
index 7d1f220..630c095 100644
--- a/users/leap_web_users.gemspec
+++ b/users/leap_web_users.gemspec
@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "leap_web_core", LeapWeb::VERSION
-
   s.add_dependency "ruby-srp", "~> 0.2.1"
   s.add_dependency "rails_warden"
 end
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb
index f8ed71c..a2be168 100644
--- a/users/lib/leap_web_users/engine.rb
+++ b/users/lib/leap_web_users/engine.rb
@@ -1,6 +1,4 @@
 # thou shall require all your dependencies in an engine.
-require "leap_web_core"
-require "leap_web_core/ui_dependencies"
 require "rails_warden"
 require "ruby-srp"
 
-- 
cgit v1.2.3


From 2e11e3ca2c7b02fdb5ff54f0bcd766cc5fa39975 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 8 Apr 2014 11:41:21 +0200
Subject: moving users: dependencies

---
 users/Gemfile                | 15 ---------------
 users/Rakefile               | 44 --------------------------------------------
 users/leap_web_users.gemspec | 20 --------------------
 3 files changed, 79 deletions(-)
 delete mode 100644 users/Gemfile
 delete mode 100644 users/Rakefile
 delete mode 100644 users/leap_web_users.gemspec

(limited to 'users')

diff --git a/users/Gemfile b/users/Gemfile
deleted file mode 100644
index 4101ead..0000000
--- a/users/Gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-source "https://rubygems.org"
-
-eval(File.read(File.dirname(__FILE__) + '/../common_dependencies.rb'))
-eval(File.read(File.dirname(__FILE__) + '/../ui_dependencies.rb'))
-
-# We require leap_web_core from here so we can use the path option.
-gem "leap_web_core", :path => '../core'
-
-# Declare your gem's dependencies in leap_web_users.gemspec.
-# Bundler will treat runtime dependencies like base dependencies, and
-# development dependencies will be added by default to the :development group.
-gemspec
-
-# To use debugger
-# gem 'ruby-debug'
diff --git a/users/Rakefile b/users/Rakefile
deleted file mode 100644
index 38da5fc..0000000
--- a/users/Rakefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env rake
-
-require 'rake/packagetask'
-require 'rubygems/package_task'
-
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'LeapWebUsers'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-spec = eval(File.read('leap_web_users.gemspec'))
-Gem::PackageTask.new(spec) do |p|
-    p.gem_spec = spec
-end
-
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
diff --git a/users/leap_web_users.gemspec b/users/leap_web_users.gemspec
deleted file mode 100644
index 630c095..0000000
--- a/users/leap_web_users.gemspec
+++ /dev/null
@@ -1,20 +0,0 @@
-$:.push File.expand_path("../lib", __FILE__)
-
-require File.expand_path('../../lib/leap_web/version.rb', __FILE__)
-
-# Describe your gem and declare its dependencies:
-Gem::Specification.new do |s|
-  s.name        = "leap_web_users"
-  s.version     = LeapWeb::VERSION
-  s.authors     = ["Azul"]
-  s.email       = ["azul@leap.se"]
-  s.homepage    = "http://www.leap.se"
-  s.summary     = "User registration and authorization for the leap platform"
-  s.description = "This this plugin for the leap platform provides user signup and login. It uses Secure Remote Password for the authentication."
-
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile"]
-  s.test_files = Dir["test/**/*"]
-
-  s.add_dependency "ruby-srp", "~> 0.2.1"
-  s.add_dependency "rails_warden"
-end
-- 
cgit v1.2.3


From b6d14dc19dd350a807826e3e097738a36613e083 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 8 Apr 2014 11:49:14 +0200
Subject: moving users: app and test files

---
 users/app/assets/images/leap_web_users/.gitkeep    |   0
 .../app/assets/javascripts/leap_web_users/.gitkeep |   0
 users/app/assets/javascripts/srp                   |   1 -
 users/app/assets/javascripts/users.js              | 132 ---------------
 .../app/assets/stylesheets/leap_web_users/.gitkeep |   0
 users/app/controllers/.gitkeep                     |   0
 .../app/controllers/account_settings_controller.rb |   0
 .../controller_extension/authentication.rb         |  75 ---------
 .../controller_extension/token_authentication.rb   |  27 ----
 users/app/controllers/keys_controller.rb           |  18 ---
 users/app/controllers/sessions_controller.rb       |  28 ----
 users/app/controllers/users_base_controller.rb     |  18 ---
 users/app/controllers/users_controller.rb          |  69 --------
 users/app/controllers/v1/messages_controller.rb    |  25 ---
 users/app/controllers/v1/sessions_controller.rb    |  45 ------
 users/app/controllers/v1/users_controller.rb       |  32 ----
 users/app/controllers/webfinger_controller.rb      |  19 ---
 users/app/designs/message/by_user_ids_to_show.js   |   7 -
 .../message/by_user_ids_to_show_and_created_at.js  |   9 --
 ...by_created_at_and_one_month_warning_not_sent.js |   5 -
 users/app/helpers/.gitkeep                         |   0
 users/app/helpers/email_aliases_helper.rb          |  11 --
 users/app/helpers/sessions_helper.rb               |   2 -
 users/app/helpers/users_helper.rb                  |  14 --
 users/app/mailers/.gitkeep                         |   0
 users/app/models/.gitkeep                          |   0
 users/app/models/account.rb                        |  68 --------
 users/app/models/email.rb                          |  26 ---
 users/app/models/identity.rb                       | 136 ----------------
 users/app/models/local_email.rb                    |  68 --------
 users/app/models/login_format_validation.rb        |  21 ---
 users/app/models/message.rb                        |  29 ----
 users/app/models/pgp_key.rb                        |  48 ------
 users/app/models/service_level.rb                  |  19 ---
 users/app/models/session.rb                        |  32 ----
 users/app/models/token.rb                          |  69 --------
 users/app/models/unauthenticated_user.rb           |   6 -
 users/app/models/user.rb                           | 179 ---------------------
 users/app/views/.gitkeep                           |   0
 users/app/views/emails/_email.html.haml            |   6 -
 users/app/views/sessions/new.html.haml             |  10 --
 users/app/views/sessions/new.json.erb              |   3 -
 users/app/views/users/_change_password.html.haml   |  21 ---
 users/app/views/users/_change_pgp_key.html.haml    |  13 --
 .../views/users/_change_service_level.html.haml    |  18 ---
 users/app/views/users/_destroy_account.html.haml   |  27 ----
 users/app/views/users/_edit.html.haml              |  14 --
 users/app/views/users/_user.html.haml              |   4 -
 users/app/views/users/_warnings.html.haml          |  12 --
 users/app/views/users/edit.html.haml               |   1 -
 users/app/views/users/index.html.haml              |  13 --
 users/app/views/users/new.html.haml                |  19 ---
 users/app/views/users/show.html.haml               |  25 ---
 users/app/views/v1/sessions/new.json.erb           |   3 -
 users/app/views/webfinger/host_meta.xml.erb        |  11 --
 users/app/views/webfinger/search.xml.erb           |   7 -
 users/test/factories.rb                            |  34 ----
 users/test/fixtures/.gitkeep                       |   0
 users/test/functional/.gitkeep                     |   0
 .../test/functional/application_controller_test.rb |  28 ----
 users/test/functional/helper_methods_test.rb       |  39 -----
 users/test/functional/keys_controller_test.rb      |  32 ----
 users/test/functional/sessions_controller_test.rb  |  59 -------
 users/test/functional/test_helpers_test.rb         |  38 -----
 users/test/functional/users_controller_test.rb     | 165 -------------------
 .../test/functional/v1/messages_controller_test.rb |  57 -------
 .../test/functional/v1/sessions_controller_test.rb |  62 -------
 users/test/functional/v1/users_controller_test.rb  |  74 ---------
 users/test/functional/webfinger_controller_test.rb |  33 ----
 users/test/integration/.gitkeep                    |   0
 users/test/integration/api/Readme.md               |  23 ---
 users/test/integration/api/login_test.rb           |  50 ------
 users/test/integration/api/pgp_key_test.rb         |  35 ----
 users/test/integration/api/python/flow_with_srp.py |  96 -----------
 .../integration/api/python/login_wrong_username.py |  19 ---
 users/test/integration/api/python/signup.py        |  20 ---
 .../integration/api/python/signup_and_login.py     |  44 -----
 .../api/python/signup_and_login_wrong_password.py  |  43 -----
 users/test/integration/api/python/umlauts.py       |  79 ---------
 users/test/integration/api/signup_test.rb          |  20 ---
 users/test/integration/api/srp_test.rb             | 104 ------------
 users/test/integration/api/update_account_test.rb  |  51 ------
 users/test/integration/browser/account_test.rb     | 147 -----------------
 users/test/integration/browser/session_test.rb     |  27 ----
 users/test/integration/navigation_test.rb          |   9 --
 users/test/leap_web_users_test.rb                  |   7 -
 users/test/support/auth_test_helper.rb             |  65 --------
 users/test/support/stub_record_helper.rb           |  53 ------
 users/test/support/time_test_helper.rb             |  30 ----
 users/test/test_helper.rb                          |   9 --
 users/test/unit/.gitkeep                           |   0
 users/test/unit/account_test.rb                    |  47 ------
 users/test/unit/email_test.rb                      |  19 ---
 users/test/unit/helpers/session_helper_test.rb     |   4 -
 users/test/unit/helpers/users_helper_test.rb       |   4 -
 users/test/unit/identity_test.rb                   | 133 ---------------
 users/test/unit/local_email_test.rb                |  65 --------
 users/test/unit/token_test.rb                      |  89 ----------
 users/test/unit/unauthenticated_user_test.rb       |   7 -
 users/test/unit/user_test.rb                       |  68 --------
 .../warden_strategy_secure_remote_password_test.rb |  63 --------
 .../unit/webfinger/host_meta_presenter_test.rb     |  24 ---
 users/test/unit/webfinger/user_presenter_test.rb   |  49 ------
 103 files changed, 3569 deletions(-)
 delete mode 100644 users/app/assets/images/leap_web_users/.gitkeep
 delete mode 100644 users/app/assets/javascripts/leap_web_users/.gitkeep
 delete mode 160000 users/app/assets/javascripts/srp
 delete mode 100644 users/app/assets/javascripts/users.js
 delete mode 100644 users/app/assets/stylesheets/leap_web_users/.gitkeep
 delete mode 100644 users/app/controllers/.gitkeep
 delete mode 100644 users/app/controllers/account_settings_controller.rb
 delete mode 100644 users/app/controllers/controller_extension/authentication.rb
 delete mode 100644 users/app/controllers/controller_extension/token_authentication.rb
 delete mode 100644 users/app/controllers/keys_controller.rb
 delete mode 100644 users/app/controllers/sessions_controller.rb
 delete mode 100644 users/app/controllers/users_base_controller.rb
 delete mode 100644 users/app/controllers/users_controller.rb
 delete mode 100644 users/app/controllers/v1/messages_controller.rb
 delete mode 100644 users/app/controllers/v1/sessions_controller.rb
 delete mode 100644 users/app/controllers/v1/users_controller.rb
 delete mode 100644 users/app/controllers/webfinger_controller.rb
 delete mode 100644 users/app/designs/message/by_user_ids_to_show.js
 delete mode 100644 users/app/designs/message/by_user_ids_to_show_and_created_at.js
 delete mode 100644 users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
 delete mode 100644 users/app/helpers/.gitkeep
 delete mode 100644 users/app/helpers/email_aliases_helper.rb
 delete mode 100644 users/app/helpers/sessions_helper.rb
 delete mode 100644 users/app/helpers/users_helper.rb
 delete mode 100644 users/app/mailers/.gitkeep
 delete mode 100644 users/app/models/.gitkeep
 delete mode 100644 users/app/models/account.rb
 delete mode 100644 users/app/models/email.rb
 delete mode 100644 users/app/models/identity.rb
 delete mode 100644 users/app/models/local_email.rb
 delete mode 100644 users/app/models/login_format_validation.rb
 delete mode 100644 users/app/models/message.rb
 delete mode 100644 users/app/models/pgp_key.rb
 delete mode 100644 users/app/models/service_level.rb
 delete mode 100644 users/app/models/session.rb
 delete mode 100644 users/app/models/token.rb
 delete mode 100644 users/app/models/unauthenticated_user.rb
 delete mode 100644 users/app/models/user.rb
 delete mode 100644 users/app/views/.gitkeep
 delete mode 100644 users/app/views/emails/_email.html.haml
 delete mode 100644 users/app/views/sessions/new.html.haml
 delete mode 100644 users/app/views/sessions/new.json.erb
 delete mode 100644 users/app/views/users/_change_password.html.haml
 delete mode 100644 users/app/views/users/_change_pgp_key.html.haml
 delete mode 100644 users/app/views/users/_change_service_level.html.haml
 delete mode 100644 users/app/views/users/_destroy_account.html.haml
 delete mode 100644 users/app/views/users/_edit.html.haml
 delete mode 100644 users/app/views/users/_user.html.haml
 delete mode 100644 users/app/views/users/_warnings.html.haml
 delete mode 100644 users/app/views/users/edit.html.haml
 delete mode 100644 users/app/views/users/index.html.haml
 delete mode 100644 users/app/views/users/new.html.haml
 delete mode 100644 users/app/views/users/show.html.haml
 delete mode 100644 users/app/views/v1/sessions/new.json.erb
 delete mode 100644 users/app/views/webfinger/host_meta.xml.erb
 delete mode 100644 users/app/views/webfinger/search.xml.erb
 delete mode 100644 users/test/factories.rb
 delete mode 100644 users/test/fixtures/.gitkeep
 delete mode 100644 users/test/functional/.gitkeep
 delete mode 100644 users/test/functional/application_controller_test.rb
 delete mode 100644 users/test/functional/helper_methods_test.rb
 delete mode 100644 users/test/functional/keys_controller_test.rb
 delete mode 100644 users/test/functional/sessions_controller_test.rb
 delete mode 100644 users/test/functional/test_helpers_test.rb
 delete mode 100644 users/test/functional/users_controller_test.rb
 delete mode 100644 users/test/functional/v1/messages_controller_test.rb
 delete mode 100644 users/test/functional/v1/sessions_controller_test.rb
 delete mode 100644 users/test/functional/v1/users_controller_test.rb
 delete mode 100644 users/test/functional/webfinger_controller_test.rb
 delete mode 100644 users/test/integration/.gitkeep
 delete mode 100644 users/test/integration/api/Readme.md
 delete mode 100644 users/test/integration/api/login_test.rb
 delete mode 100644 users/test/integration/api/pgp_key_test.rb
 delete mode 100755 users/test/integration/api/python/flow_with_srp.py
 delete mode 100755 users/test/integration/api/python/login_wrong_username.py
 delete mode 100755 users/test/integration/api/python/signup.py
 delete mode 100755 users/test/integration/api/python/signup_and_login.py
 delete mode 100755 users/test/integration/api/python/signup_and_login_wrong_password.py
 delete mode 100755 users/test/integration/api/python/umlauts.py
 delete mode 100644 users/test/integration/api/signup_test.rb
 delete mode 100644 users/test/integration/api/srp_test.rb
 delete mode 100644 users/test/integration/api/update_account_test.rb
 delete mode 100644 users/test/integration/browser/account_test.rb
 delete mode 100644 users/test/integration/browser/session_test.rb
 delete mode 100644 users/test/integration/navigation_test.rb
 delete mode 100644 users/test/leap_web_users_test.rb
 delete mode 100644 users/test/support/auth_test_helper.rb
 delete mode 100644 users/test/support/stub_record_helper.rb
 delete mode 100644 users/test/support/time_test_helper.rb
 delete mode 100644 users/test/test_helper.rb
 delete mode 100644 users/test/unit/.gitkeep
 delete mode 100644 users/test/unit/account_test.rb
 delete mode 100644 users/test/unit/email_test.rb
 delete mode 100644 users/test/unit/helpers/session_helper_test.rb
 delete mode 100644 users/test/unit/helpers/users_helper_test.rb
 delete mode 100644 users/test/unit/identity_test.rb
 delete mode 100644 users/test/unit/local_email_test.rb
 delete mode 100644 users/test/unit/token_test.rb
 delete mode 100644 users/test/unit/unauthenticated_user_test.rb
 delete mode 100644 users/test/unit/user_test.rb
 delete mode 100644 users/test/unit/warden_strategy_secure_remote_password_test.rb
 delete mode 100644 users/test/unit/webfinger/host_meta_presenter_test.rb
 delete mode 100644 users/test/unit/webfinger/user_presenter_test.rb

(limited to 'users')

diff --git a/users/app/assets/images/leap_web_users/.gitkeep b/users/app/assets/images/leap_web_users/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/assets/javascripts/leap_web_users/.gitkeep b/users/app/assets/javascripts/leap_web_users/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
deleted file mode 160000
index 8f33d32..0000000
--- a/users/app/assets/javascripts/srp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8f33d32d40b1e21ae7fb9a92c78a275422af4217
diff --git a/users/app/assets/javascripts/users.js b/users/app/assets/javascripts/users.js
deleted file mode 100644
index 8486756..0000000
--- a/users/app/assets/javascripts/users.js
+++ /dev/null
@@ -1,132 +0,0 @@
-(function() {
-  //
-  // LOCAL FUNCTIONS
-  //
-
-  var poll_users, 
-      prevent_default, 
-      form_failed, 
-      form_passed, 
-      clear_errors,
-      update_user;
-
-  prevent_default = function(event) {
-    return event.preventDefault();
-  };
-
-  poll_users = function(query, process) {
-    return $.get("/1/users.json", {
-      query: query
-    }).done(process);
-  };
-
-  clear_errors = function() {
-    return $('#messages').empty();
-  };
-
-  update_user = function(submitEvent) {
-    var form = submitEvent.target;
-    var token = form.dataset.token;
-    var url = form.action;
-    var req = $.ajax({
-      url: url,
-      type: 'PUT',
-      headers: { Authorization: 'Token token="' + token + '"' },
-      data: $(form).serialize()
-    });
-    req.done( function() {
-      $(form).find('input[type="submit"]').button('reset');
-    });
-  };
-
-  markAsSubmitted = function(submitEvent) {
-    var form = submitEvent.target;
-    $(form).addClass('submitted')
-    // bootstrap loading state:
-    $(form).find('input[type="submit"]').button('loading');
-  };
-
-  resetButtons = function(submitEvent) {
-    var form = $('form.submitted')
-    // bootstrap loading state:
-    $(form).find('input[type="submit"]').button('reset');
-    $(form).removeClass('submitted')
-  };
-
-  //
-  // PUBLIC FUNCTIONS
-  //
-
-  srp.session = new srp.Session();
-
-  srp.signedUp = function() {
-    return srp.login();
-  };
-
-  srp.loggedIn = function() {
-    return window.location = '/';
-  };
-
-  srp.updated = function() {
-    return window.location = '/users/' + srp.session.id();
-  };
-
-  //
-  // if a json request returns an error, this function gets called and
-  // decorates the appropriate fields with the error messages.
-  //
-  srp.error = function(message) {
-    clear_errors();
-    var errors = extractErrors(message);
-    displayErrors(errors);
-    resetButtons();
-  }
-
-  function extractErrors(message) {
-    if ($.isPlainObject(message) && message.errors) {
-      return message.errors;
-    } else {
-      return {
-        base: (message.error || JSON.stringify(message))
-      };
-    }
-  }
-
-  function displayErrors(errors) {
-    for (var field in errors) {
-      var error = errors[field];
-      if (field === 'base') {
-        alert_message(error);
-      } else {
-        displayFieldError(field, error);
-      }
-    }
-  }
-
-  function displayFieldError(field, error) {
-    var element = $('form input[name$="[' + field + ']"]');
-    if (element) {
-      element.trigger('element:validate:fail.ClientSideValidations', error).data('valid', false);
-    }
-  };
-
-  //
-  // INIT
-  //
-
-  $(document).ready(function() {
-    $('form').submit(markAsSubmitted);
-    $('#new_user').submit(prevent_default);
-    $('#new_user').submit(srp.signup);
-    $('#new_session').submit(prevent_default);
-    $('#new_session').submit(srp.login);
-    $('#update_login_and_password').submit(prevent_default);
-    $('#update_login_and_password').submit(srp.update);
-    $('#update_pgp_key').submit(prevent_default);
-    $('#update_pgp_key').submit(update_user);
-    return $('#user-typeahead').typeahead({
-      source: poll_users
-    });
-  });
-
-}).call(this);
diff --git a/users/app/assets/stylesheets/leap_web_users/.gitkeep b/users/app/assets/stylesheets/leap_web_users/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/controllers/.gitkeep b/users/app/controllers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/controllers/account_settings_controller.rb b/users/app/controllers/account_settings_controller.rb
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/controllers/controller_extension/authentication.rb b/users/app/controllers/controller_extension/authentication.rb
deleted file mode 100644
index 03d3989..0000000
--- a/users/app/controllers/controller_extension/authentication.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-module ControllerExtension::Authentication
-  extend ActiveSupport::Concern
-
-  private
-
-  included do
-    helper_method :current_user, :logged_in?, :admin?
-  end
-
-  def current_user
-    @current_user ||= token_authenticate || warden.user
-  end
-
-  def logged_in?
-    !!current_user
-  end
-
-  def require_login
-    access_denied unless logged_in?
-  end
-
-  # some actions only make sense if you are not logged in yet.
-  # (login, signup). If a user tries to perform these they will
-  # be redirected to their dashboard.
-  def redirect_if_logged_in
-    redirect_to home_url if logged_in?
-  end
-
-  def access_denied
-    respond_to do |format|
-      format.html do
-        if logged_in?
-          redirect_to home_url, :alert => t(:not_authorized)
-        else
-          redirect_to login_url, :alert => t(:not_authorized_login)
-        end
-      end
-      format.json do
-        render :json => {'error' => t(:not_authorized)}, status: :unprocessable_entity
-      end
-    end
-  end
-
-  def admin?
-    current_user && current_user.is_admin?
-  end
-
-  def require_admin
-    access_denied unless admin?
-  end
-
-  def authentication_errors
-    return unless attempted_login?
-    errors = get_warden_errors
-    errors.inject({}) do |translated,err|
-      translated[err.first] = I18n.t(err.last)
-      translated
-    end
-  end
-
-  def get_warden_errors
-    if strategy = warden.winning_strategy
-      message = strategy.message
-      # in case we get back the default message to fail!
-      message.respond_to?(:inject) ? message : { base: message }
-    else
-      { login: :all_strategies_failed }
-    end
-  end
-
-  def attempted_login?
-    request.env['warden.options'] &&
-      request.env['warden.options'][:attempted_path]
-  end
-end
diff --git a/users/app/controllers/controller_extension/token_authentication.rb b/users/app/controllers/controller_extension/token_authentication.rb
deleted file mode 100644
index 6e0a6ce..0000000
--- a/users/app/controllers/controller_extension/token_authentication.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-module ControllerExtension::TokenAuthentication
-  extend ActiveSupport::Concern
-
-  def token
-    @token ||= authenticate_with_http_token do |token_id, options|
-      Token.find(token_id)
-    end
-  end
-
-  def token_authenticate
-    @token_authenticated ||= token.authenticate if token
-  end
-
-  def require_token
-    access_denied unless token_authenticate
-  end
-
-  def logout
-    super
-    clear_token
-  end
-
-  def clear_token
-    token.destroy if token
-  end
-end
-
diff --git a/users/app/controllers/keys_controller.rb b/users/app/controllers/keys_controller.rb
deleted file mode 100644
index fb28901..0000000
--- a/users/app/controllers/keys_controller.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-class KeysController < ApplicationController
-
-  #
-  # Render the user's key as plain text, without a layout.
-  #
-  # We will show blank page if user doesn't have key (which shouldn't generally occur)
-  # and a 404 error if user doesn't exist
-  #
-  def show
-    user = User.find_by_login(params[:login])
-    if user
-      render text: user.public_key, content_type: 'text/text'
-    else
-      raise ActionController::RoutingError.new('Not Found')
-    end
-  end
-
-end
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
deleted file mode 100644
index 8919a4d..0000000
--- a/users/app/controllers/sessions_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-class SessionsController < ApplicationController
-
-  before_filter :redirect_if_logged_in, :only => [:new]
-
-  def new
-    @session = Session.new
-    if authentication_errors
-      @errors = authentication_errors
-      render :status => 422
-    end
-  end
-
-  def destroy
-    logout
-    redirect_to home_url
-  end
-
-  #
-  # this is a bad hack, but user_url(user) is not available
-  # also, this doesn't work because the redirect happens as a PUT. no idea why.
-  #
-  #Warden::Manager.after_authentication do |user, auth, opts|
-  #  response = Rack::Response.new
-  #  response.redirect "/users/#{user.id}"
-  # throw :warden, response.finish
-  #end
-
-end
diff --git a/users/app/controllers/users_base_controller.rb b/users/app/controllers/users_base_controller.rb
deleted file mode 100644
index 9becf0d..0000000
--- a/users/app/controllers/users_base_controller.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# common base class for all user related controllers
-#
-
-class UsersBaseController < ApplicationController
-
-  protected
-
-  def fetch_user
-    @user = User.find(params[:user_id] || params[:id])
-    if !@user && admin?
-      redirect_to users_url, :alert => t(:no_such_thing, :thing => 'user')
-    elsif !admin? && @user != current_user
-      access_denied
-    end
-  end
-
-end
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
deleted file mode 100644
index c8e09b6..0000000
--- a/users/app/controllers/users_controller.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# This is an HTML-only controller. For the JSON-only controller, see v1/users_controller.rb
-#
-
-class UsersController < UsersBaseController
-
-  before_filter :require_login, :except => [:new]
-  before_filter :redirect_if_logged_in, :only => [:new]
-  before_filter :require_admin, :only => [:index, :deactivate, :enable]
-  before_filter :fetch_user, :only => [:show, :edit, :update, :destroy, :deactivate, :enable]
-
-  respond_to :html
-
-  def index
-    if params[:query]
-      if @user = User.find_by_login(params[:query])
-        redirect_to @user
-        return
-      else
-        @users = User.by_login.startkey(params[:query]).endkey(params[:query].succ)
-      end
-    else
-      @users = User.by_created_at.descending
-    end
-    @users = @users.limit(100)
-  end
-
-  def new
-    @user = User.new
-  end
-
-  def show
-  end
-
-  def edit
-  end
-
-  ## added so updating service level works, but not sure we will actually want this. also not sure that this is place to prevent user from updating own effective service level, but here as placeholder:
-  def update
-    @user.update_attributes(params[:user]) unless (!admin? and params[:user][:effective_service_level])
-    respond_with @user
-  end
-
-  def deactivate
-    @user.enabled = false
-    @user.save
-    respond_with @user
-  end
-
-  def enable
-    @user.enabled = true
-    @user.save
-    respond_with @user
-  end
-
-  def destroy
-    @user.account.destroy
-    flash[:notice] = I18n.t(:account_destroyed)
-    # admins can destroy other users
-    if @user != current_user
-      redirect_to users_url
-    else
-      # let's remove the invalid session
-      logout
-      redirect_to bye_url
-    end
-  end
-
-end
diff --git a/users/app/controllers/v1/messages_controller.rb b/users/app/controllers/v1/messages_controller.rb
deleted file mode 100644
index f71d0f1..0000000
--- a/users/app/controllers/v1/messages_controller.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module V1
-  class MessagesController < ApplicationController
-
-    skip_before_filter :verify_authenticity_token
-    before_filter :require_token
-
-    respond_to :json
-
-    def index
-      render json: (current_user ? current_user.messages : [] )
-    end
-
-    def update
-      message = Message.find(params[:id])
-      if (message and current_user)
-        message.mark_as_read_by(current_user)
-        message.save
-        render json: true
-      else
-        render json: false
-      end
-    end
-
-  end
-end
diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
deleted file mode 100644
index eae3a1e..0000000
--- a/users/app/controllers/v1/sessions_controller.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-module V1
-  class SessionsController < ApplicationController
-
-    skip_before_filter :verify_authenticity_token
-    before_filter :require_token, only: :destroy
-
-    def new
-      @session = Session.new
-      if authentication_errors
-        @errors = authentication_errors
-        render :status => 422
-      end
-    end
-
-    def create
-      logout if logged_in?
-      if params['A']
-        authenticate!
-      else
-        @user = User.find_by_login(params['login'])
-        render :json => {salt: @user.salt}
-      end
-    end
-
-    def update
-      authenticate!
-      @token = Token.create(:user_id => current_user.id)
-      session[:token] = @token.id
-      render :json => login_response
-    end
-
-    def destroy
-      logout
-      head :no_content
-    end
-
-    protected
-
-    def login_response
-      handshake = session.delete(:handshake) || {}
-      handshake.to_hash.merge(:id => current_user.id, :token => @token.id)
-    end
-
-  end
-end
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
deleted file mode 100644
index 8897d01..0000000
--- a/users/app/controllers/v1/users_controller.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-module V1
-  class UsersController < UsersBaseController
-
-    skip_before_filter :verify_authenticity_token
-    before_filter :fetch_user, :only => [:update]
-    before_filter :require_admin, :only => [:index]
-    before_filter :require_token, :only => [:update]
-
-    respond_to :json
-
-    # used for autocomplete for admins in the web ui
-    def index
-      if params[:query]
-        @users = User.by_login.startkey(params[:query]).endkey(params[:query].succ)
-        respond_with @users.map(&:login).sort
-      else
-        render :json => {'error' => 'query required', 'status' => :unprocessable_entity}
-      end
-    end
-
-    def create
-      @user = Account.create(params[:user])
-      respond_with @user # return ID instead?
-    end
-
-    def update
-      @user.account.update params[:user]
-      respond_with @user
-    end
-
-  end
-end
diff --git a/users/app/controllers/webfinger_controller.rb b/users/app/controllers/webfinger_controller.rb
deleted file mode 100644
index 8872802..0000000
--- a/users/app/controllers/webfinger_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class WebfingerController < ApplicationController
-
-  respond_to :xml, :json
-  layout false
-
-  def host_meta
-    @host_meta = Webfinger::HostMetaPresenter.new(request)
-    respond_with @host_meta
-  end
-
-  def search
-    username = params[:q].split('@')[0].to_s.downcase
-    user = User.find_by_login(username)
-    raise RECORD_NOT_FOUND, 'User not found' unless user.present?
-    @presenter = Webfinger::UserPresenter.new(user, request)
-    respond_with @presenter
-  end
-
-end
diff --git a/users/app/designs/message/by_user_ids_to_show.js b/users/app/designs/message/by_user_ids_to_show.js
deleted file mode 100644
index e33566b..0000000
--- a/users/app/designs/message/by_user_ids_to_show.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function (doc) {
-  if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
-    doc.user_ids_to_show.forEach(function (userId) {
-      emit(userId, 1);
-    });
-  }
-}
diff --git a/users/app/designs/message/by_user_ids_to_show_and_created_at.js b/users/app/designs/message/by_user_ids_to_show_and_created_at.js
deleted file mode 100644
index 54e4604..0000000
--- a/users/app/designs/message/by_user_ids_to_show_and_created_at.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// not using at moment
-// call with something like Message.by_user_ids_to_show_and_created_at.startkey([user_id, start_date]).endkey([user_id,end_date])
-function (doc) {
-  if (doc.type === 'Message' && doc.user_ids_to_show && Array.isArray(doc.user_ids_to_show)) {
-    doc.user_ids_to_show.forEach(function (userId) {
-      emit([userId, doc.created_at], 1);
-    });
-  }
-}
diff --git a/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js b/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
deleted file mode 100644
index 53a95de..0000000
--- a/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function (doc) {
-  if ((doc['type'] == 'User') && (doc['created_at'] != null) && (doc['one_month_warning_sent'] == null)) {
-    emit(doc['created_at'], 1);
-  }    
-}
diff --git a/users/app/helpers/.gitkeep b/users/app/helpers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/helpers/email_aliases_helper.rb b/users/app/helpers/email_aliases_helper.rb
deleted file mode 100644
index b56b068..0000000
--- a/users/app/helpers/email_aliases_helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module EmailAliasesHelper
-
-  def email_alias_form(options = {})
-    simple_form_for [@user, EmailAlias.new()],
-      :html => {:class => "form-horizontal email-alias form"},
-      :validate => true do |f|
-      yield f
-    end
-  end
-
-end
diff --git a/users/app/helpers/sessions_helper.rb b/users/app/helpers/sessions_helper.rb
deleted file mode 100644
index 309f8b2..0000000
--- a/users/app/helpers/sessions_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module SessionsHelper
-end
diff --git a/users/app/helpers/users_helper.rb b/users/app/helpers/users_helper.rb
deleted file mode 100644
index f56faab..0000000
--- a/users/app/helpers/users_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module UsersHelper
-
-  def user_form_class(*classes)
-    (classes + ['user', 'form', (@user.new_record? ? 'new' : 'edit')]).compact.join(' ')
-  end
-
-  def wrapped(item, options = {})
-    options[:as] ||= :div
-    content_tag options[:as], :class => dom_class(item), :id => dom_id(item) do
-      yield
-    end
-  end
-
-end
diff --git a/users/app/mailers/.gitkeep b/users/app/mailers/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/models/.gitkeep b/users/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/models/account.rb b/users/app/models/account.rb
deleted file mode 100644
index cf998e4..0000000
--- a/users/app/models/account.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# The Account model takes care of the livecycle of a user.
-# It composes a User record and it's identity records.
-# It also allows for other engines to hook into the livecycle by
-# monkeypatching the create, update and destroy methods.
-# There's an ActiveSupport load_hook at the end of this file to
-# make this more easy.
-#
-class Account
-
-  attr_reader :user
-
-  def initialize(user = nil)
-    @user = user
-  end
-
-  # Returns the user record so it can be used in views.
-  def self.create(attrs)
-    @user = User.create(attrs).tap do |user|
-      Identity.create_for user
-    end
-  end
-
-  def update(attrs)
-    if attrs[:password_verifier].present?
-      update_login(attrs[:login])
-      @user.update_attributes attrs.slice(:password_verifier, :password_salt)
-    end
-    # TODO: move into identity controller
-    key = update_pgp_key(attrs[:public_key])
-    @user.errors.set :public_key, key.errors.full_messages
-    @user.save && save_identities
-    @user.refresh_identity
-  end
-
-  def destroy
-    return unless @user
-    Identity.disable_all_for(@user)
-    @user.destroy
-  end
-
-  protected
-
-  def update_login(login)
-    return unless login.present?
-    @old_identity = Identity.for(@user)
-    @user.login = login
-    @new_identity = Identity.for(@user) # based on the new login
-    @old_identity.destination = @user.email_address # alias old -> new
-  end
-
-  def update_pgp_key(key)
-    PgpKey.new(key).tap do |key|
-      if key.present? && key.valid?
-        @new_identity ||= Identity.for(@user)
-        @new_identity.set_key(:pgp, key)
-      end
-    end
-  end
-
-  def save_identities
-    @new_identity.try(:save) && @old_identity.try(:save)
-  end
-
-  # You can hook into the account lifecycle from different engines using
-  #   ActiveSupport.on_load(:account) do ...
-  ActiveSupport.run_load_hooks(:account, self)
-end
diff --git a/users/app/models/email.rb b/users/app/models/email.rb
deleted file mode 100644
index a9a503f..0000000
--- a/users/app/models/email.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-class Email < String
-  include ActiveModel::Validations
-
-  validates :email,
-    :format => {
-      :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, #local part of email is case-sensitive, so allow uppercase letter.
-      :message => "needs to be a valid email address"
-    }
-
-  def to_partial_path
-    "emails/email"
-  end
-
-  def to_param
-    to_s
-  end
-
-  def email
-    self
-  end
-
-  def handle
-    self.split('@').first
-  end
-
-end
diff --git a/users/app/models/identity.rb b/users/app/models/identity.rb
deleted file mode 100644
index 9b97b51..0000000
--- a/users/app/models/identity.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-class Identity < CouchRest::Model::Base
-  include LoginFormatValidation
-
-  use_database :identities
-
-  belongs_to :user
-
-  property :address, LocalEmail
-  property :destination, Email
-  property :keys, HashWithIndifferentAccess
-
-  validate :unique_forward
-  validate :alias_available
-  validate :address_local_email
-  validate :destination_email
-
-  design do
-    view :by_user_id
-    view :by_address_and_destination
-    view :by_address
-    view :pgp_key_by_email,
-      map: <<-EOJS
-      function(doc) {
-        if (doc.type != 'Identity') {
-          return;
-        }
-        if (typeof doc.keys === "object") {
-          emit(doc.address, doc.keys["pgp"]);
-        }
-      }
-    EOJS
-    view :disabled,
-      map: <<-EOJS
-      function(doc) {
-        if (doc.type != 'Identity') {
-          return;
-        }
-        if (typeof doc.user_id === "undefined") {
-          emit(doc._id, 1);
-        }
-      }
-    EOJS
-
-  end
-
-  def self.for(user, attributes = {})
-    find_for(user, attributes) || build_for(user, attributes)
-  end
-
-  def self.find_for(user, attributes = {})
-    attributes.reverse_merge! attributes_from_user(user)
-    find_by_address_and_destination [attributes[:address], attributes[:destination]]
-  end
-
-  def self.build_for(user, attributes = {})
-    attributes.reverse_merge! attributes_from_user(user)
-    Identity.new(attributes)
-  end
-
-  def self.create_for(user, attributes = {})
-    identity = build_for(user, attributes)
-    identity.save
-    identity
-  end
-
-  def self.disable_all_for(user)
-    Identity.by_user_id.key(user.id).each do |identity|
-      identity.disable
-      identity.save
-    end
-  end
-
-  def self.destroy_all_disabled
-    Identity.disabled.each do |identity|
-      identity.destroy
-    end
-  end
-
-  def self.attributes_from_user(user)
-    { user_id: user.id,
-      address: user.email_address,
-      destination: user.email_address
-    }
-  end
-
-  def enabled?
-    self.destination && self.user_id
-  end
-
-  def disable
-    self.destination = nil
-    self.user_id = nil
-  end
-
-  def keys
-    read_attribute('keys') || HashWithIndifferentAccess.new
-  end
-
-  def set_key(type, key)
-    return if keys[type] == key.to_s
-    write_attribute('keys', keys.merge(type => key.to_s))
-  end
-
-  # for LoginFormatValidation
-  def login
-    self.address.handle
-  end
-
-  protected
-
-  def unique_forward
-    same = Identity.find_by_address_and_destination([address, destination])
-    if same && same != self
-      errors.add :base, "This alias already exists"
-    end
-  end
-
-  def alias_available
-    same = Identity.find_by_address(address)
-    if same && same.user != self.user
-      errors.add :base, "This email has already been taken"
-    end
-  end
-
-  def address_local_email
-    return if address.valid? #this ensures it is LocalEmail
-    self.errors.add(:address, address.errors.messages[:email].first) #assumes only one error
-  end
-
-  def destination_email
-    return if destination.nil?   # this identity is disabled
-    return if destination.valid? # this ensures it is Email
-    self.errors.add(:destination, destination.errors.messages[:email].first) #assumes only one error #TODO
-  end
-
-end
diff --git a/users/app/models/local_email.rb b/users/app/models/local_email.rb
deleted file mode 100644
index 2b4c65e..0000000
--- a/users/app/models/local_email.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-class LocalEmail < Email
-
-  BLACKLIST_FROM_RFC2142 = [
-    'postmaster', 'hostmaster', 'domainadmin', 'webmaster', 'www',
-    'abuse', 'noc', 'security', 'usenet', 'news', 'uucp',
-    'ftp', 'sales', 'marketing', 'support', 'info'
-  ]
-
-  def self.domain
-    APP_CONFIG[:domain]
-  end
-
-  validates :email,
-    :format => {
-      :with => /@#{domain}\Z/i,
-      :message => "needs to end in @#{domain}"
-    }
-
-  validate :handle_allowed
-
-  def initialize(s)
-    super
-    append_domain_if_needed
-  end
-
-  def to_key
-    [handle]
-  end
-
-  def domain
-    LocalEmail.domain
-  end
-
-  protected
-
-  def append_domain_if_needed
-    unless self.index('@')
-      self << '@' + domain
-    end
-  end
-
-  def handle_allowed
-    errors.add(:handle, "is reserved.") if handle_reserved?
-  end
-
-  def handle_reserved?
-    # *ARRAY in a case statement tests if ARRAY includes the handle.
-    case handle
-    when *APP_CONFIG[:handle_blacklist]
-      true
-    when *APP_CONFIG[:handle_whitelist]
-      false
-    when *BLACKLIST_FROM_RFC2142
-      true
-    else
-      handle_in_passwd?
-    end
-  end
-
-  def handle_in_passwd?
-    begin
-      !!Etc.getpwnam(handle)
-    rescue ArgumentError
-      # handle was not found
-      return false
-    end
-  end
-end
diff --git a/users/app/models/login_format_validation.rb b/users/app/models/login_format_validation.rb
deleted file mode 100644
index c1fcf70..0000000
--- a/users/app/models/login_format_validation.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module LoginFormatValidation
-  extend ActiveSupport::Concern
-
-  #TODO: Probably will replace this. Playing with using it for aliases too, but won't want it connected to login field.
-
-  included do
-    # Have multiple regular expression validations so we can get specific error messages:
-    validates :login,
-      :format => { :with => /\A.{2,}\z/,
-        :message => "Must have at least two characters"}
-    validates :login,
-      :format => { :with => /\A[a-z\d_\.-]+\z/,
-        :message => "Only lowercase letters, digits, . - and _ allowed."}
-    validates :login,
-      :format => { :with => /\A[a-z].*\z/,
-        :message => "Must begin with a lowercase letter"}
-    validates :login,
-      :format => { :with => /\A.*[a-z\d]\z/,
-        :message => "Must end with a letter or digit"}
-  end
-end
diff --git a/users/app/models/message.rb b/users/app/models/message.rb
deleted file mode 100644
index 424f094..0000000
--- a/users/app/models/message.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class Message < CouchRest::Model::Base
-
-  use_database :messages
-
-  property :text, String
-  property :user_ids_to_show, [String]
-  property :user_ids_have_shown, [String] # is this necessary to store?
-
-  timestamps!
-
-  design do
-    own_path = Pathname.new(File.dirname(__FILE__))
-    load_views(own_path.join('..', 'designs', 'message'))
-  end
-
-  def mark_as_read_by(user)
-    user_ids_to_show.delete(user.id)
-    # is it necessary to keep track of what users have already seen it?
-    user_ids_have_shown << user.id unless read_by?(user)
-  end
-
-  def read_by?(user)
-    user_ids_have_shown.include?(user.id)
-  end
-
-  def unread_by?(user)
-    user_ids_to_show.include?(user.id)
-  end
-end
diff --git a/users/app/models/pgp_key.rb b/users/app/models/pgp_key.rb
deleted file mode 100644
index 66f8660..0000000
--- a/users/app/models/pgp_key.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-class PgpKey
-  include ActiveModel::Validations
-
-  KEYBLOCK_IDENTIFIERS = [
-    '-----BEGIN PGP PUBLIC KEY BLOCK-----',
-    '-----END PGP PUBLIC KEY BLOCK-----',
-  ]
-
-  # mostly for testing.
-  attr_accessor :keyblock
-
-  validate :validate_keyblock_format
-
-  def initialize(keyblock = nil)
-    @keyblock = keyblock
-  end
-
-  def to_s
-    @keyblock
-  end
-
-  def present?
-    @keyblock.present?
-  end
-
-  # allow comparison with plain keyblock strings.
-  def ==(other)
-    self.equal?(other) or
-    # relax the comparison on line ends.
-    self.to_s.tr_s("\n\r", '') == other.tr_s("\r\n", '')
-  end
-
-  protected
-
-  def validate_keyblock_format
-    if keyblock_identifier_missing?
-      errors.add :public_key_block,
-        "does not look like an armored pgp public key block"
-    end
-  end
-
-  def keyblock_identifier_missing?
-    KEYBLOCK_IDENTIFIERS.find do |identify|
-      !@keyblock.include?(identify)
-    end
-  end
-
-end
diff --git a/users/app/models/service_level.rb b/users/app/models/service_level.rb
deleted file mode 100644
index 299aaf1..0000000
--- a/users/app/models/service_level.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-class ServiceLevel
-
-  def initialize(attributes = {})
-    @id = attributes[:id] || APP_CONFIG[:default_service_level]
-  end
-
-  def self.authenticated_select_options
-    APP_CONFIG[:service_levels].map { |id,config_hash| [config_hash[:description], id] if config_hash[:name] != 'anonymous'}.compact
-  end
-
-  def id
-    @id
-  end
-
-  def config_hash
-    APP_CONFIG[:service_levels][@id]
-  end
-
-end
diff --git a/users/app/models/session.rb b/users/app/models/session.rb
deleted file mode 100644
index 0d7e10e..0000000
--- a/users/app/models/session.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-class Session < SRP::Session
-  include ActiveModel::Validations
-  include LoginFormatValidation
-
-  attr_accessor :login
-
-  validates :login, :presence => true
-
-  def initialize(user = nil, aa = nil)
-    super(user, aa) if user
-  end
-
-  def persisted?
-    false
-  end
-
-  def new_record?
-    true
-  end
-
-  def to_model
-    self
-  end
-
-  def to_key
-    [object_id]
-  end
-
-  def to_param
-    nil
-  end
-end
diff --git a/users/app/models/token.rb b/users/app/models/token.rb
deleted file mode 100644
index 4856c31..0000000
--- a/users/app/models/token.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-class Token < CouchRest::Model::Base
-
-  use_database :tokens
-
-  belongs_to :user
-
-  # timestamps! does not create setters and only sets updated_at
-  # if the object has changed and been saved. Instead of triggering
-  # that we rather use our own property we have control over:
-  property :last_seen_at, Time, accessible: false
-
-  validates :user_id, presence: true
-
-  design do
-    view :by_last_seen_at
-  end
-
-  def self.expires_after
-    APP_CONFIG[:auth] && APP_CONFIG[:auth][:token_expires_after]
-  end
-
-  def self.expired
-    return [] unless expires_after
-    by_last_seen_at.endkey(expires_after.minutes.ago)
-  end
-
-  def self.destroy_all_expired
-    self.expired.each do |token|
-      token.destroy
-    end
-  end
-
-  def authenticate
-    if expired?
-      destroy
-      return nil
-    else
-      touch
-      return user
-    end
-  end
-
-  # Tokens can be cleaned up in different ways.
-  # So let's make sure we don't crash if they disappeared
-  def destroy_with_rescue
-    destroy_without_rescue
-  rescue RestClient::ResourceNotFound
-  end
-  alias_method_chain :destroy, :rescue
-
-  def touch
-    self.last_seen_at = Time.now
-    save
-  end
-
-  def expired?
-    Token.expires_after and
-    last_seen_at < Token.expires_after.minutes.ago
-  end
-
-  def initialize(*args)
-    super
-    if new_record?
-      self.id = SecureRandom.urlsafe_base64(32).gsub(/^_*/, '')
-      self.last_seen_at = Time.now
-    end
-  end
-end
-
diff --git a/users/app/models/unauthenticated_user.rb b/users/app/models/unauthenticated_user.rb
deleted file mode 100644
index 0fc17d2..0000000
--- a/users/app/models/unauthenticated_user.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# The nil object for the user class
-class UnauthenticatedUser < Object
-
-  # will probably want something here to return service level as  APP_CONFIG[:service_levels][0] but not sure how will be accessing.
-
-end
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
deleted file mode 100644
index c297ac8..0000000
--- a/users/app/models/user.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-class User < CouchRest::Model::Base
-  include LoginFormatValidation
-
-  use_database :users
-
-  property :login, String, :accessible => true
-  property :password_verifier, String, :accessible => true
-  property :password_salt, String, :accessible => true
-
-  property :enabled, TrueClass, :default => true
-
-  # these will be null by default but we shouldn't ever pull them directly, but only via the methods that will return the full ServiceLevel
-  property :desired_service_level_code, Integer, :accessible => true
-  property :effective_service_level_code, Integer, :accessible => true
-
-  property :one_month_warning_sent, TrueClass
-
-  before_save :update_effective_service_level
-
-  validates :login, :password_salt, :password_verifier,
-    :presence => true
-
-  validates :login,
-    :uniqueness => true,
-    :if => :serverside?
-
-  validate :login_is_unique_alias
-
-  validates :password_salt, :password_verifier,
-    :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" }
-
-  validates :password, :presence => true,
-    :confirmation => true,
-    :format => { :with => /.{8}.*/, :message => "needs to be at least 8 characters long" }
-
-  timestamps!
-
-  design do
-    own_path = Pathname.new(File.dirname(__FILE__))
-    load_views(own_path.join('..', 'designs', 'user'))
-    view :by_login
-    view :by_created_at
-  end # end of design
-
-  def to_json(options={})
-    {
-      :login => login,
-      :ok => valid?
-    }.to_json(options)
-  end
-
-  def salt
-    password_salt.hex
-  end
-
-  def verifier
-    password_verifier.hex
-  end
-
-  def username
-    login
-  end
-
-  def email_address
-    LocalEmail.new(login)
-  end
-
-  # Since we are storing admins by login, we cannot allow admins to change their login.
-  def is_admin?
-    APP_CONFIG['admins'].include? self.login
-  end
-
-  def most_recent_tickets(count=3)
-    Ticket.for_user(self).limit(count).all #defaults to having most recent updated first
-  end
-
-  def messages(unseen = true)
-    #TODO for now this only shows unseen messages. Will we ever want seen ones? Is it necessary to store?
-
-    # we don't want to emit all the userids associated with a message, so only emit id and text.
-    Message.by_user_ids_to_show.key(self.id).map { |message| [message.id, message.text] }
-
-  end
-
-  # DEPRECATED
-  #
-  # Please set the key on the identity directly
-  # WARNING: This will not be serialized with the user record!
-  # It is only a workaround for the key form.
-  def public_key=(value)
-    identity.set_key(:pgp, value)
-  end
-
-  # DEPRECATED
-  #
-  # Please access identity.keys[:pgp] directly
-  def public_key
-    identity.keys[:pgp]
-  end
-
-  def account
-    Account.new(self)
-  end
-
-  def identity
-    @identity ||= Identity.for(self)
-  end
-
-  def refresh_identity
-    @identity = Identity.for(self)
-  end
-
-  def desired_service_level
-    code = self.desired_service_level_code || APP_CONFIG[:default_service_level]
-    ServiceLevel.new({id: code})
-  end
-
-  def effective_service_level
-    code = self.effective_service_level_code || self.desired_service_level.id
-    ServiceLevel.new({id: code})
-  end
-
-
-  def self.send_one_month_warnings
-
-    # To determine warnings to send, need to get all users where one_month_warning_sent is not set, and where it was created greater than or equal to 1 month ago.
-    # TODO: might want to further limit to enabled accounts, and, based on provider's service level configuration, for particular service levels.
-    users_to_warn = User.by_created_at_and_one_month_warning_not_sent.endkey(Time.now-1.month)
-
-    users_to_warn.each do |user|
-      # instead of loop could use something like:
-      # message.user_ids_to_show = users_to_warn.map(&:id)
-      # but would still need to loop through users to store one_month_warning_sent
-
-      if !@message
-        # create a message for today's date
-        # only want to create once, and only if it will be used.
-        @message = Message.new(:text => I18n.t(:payment_one_month_warning, :date_in_one_month => (Time.now+1.month).strftime("%Y-%d-%m")))
-      end
-
-      @message.user_ids_to_show << user.id
-      user.one_month_warning_sent = true
-      user.save
-    end
-    @message.save if @message
-
-  end
-
-  protected
-
-  ##
-  #  Validation Functions
-  ##
-
-  def login_is_unique_alias
-    alias_identity = Identity.find_by_address(self.email_address)
-    return if alias_identity.blank?
-    if alias_identity.user != self
-      errors.add(:login, "has already been taken")
-    end
-  end
-
-  def password
-    password_verifier
-  end
-
-  # used as a condition for validations that are server side only
-  def serverside?
-    true
-  end
-
-  def update_effective_service_level
-    # TODO: Is this always the case? Might there be a situation where the admin has set the effective service level and we don't want it changed to match the desired one?
-    if self.desired_service_level_code_changed?
-      self.effective_service_level_code = self.desired_service_level_code
-    end
-  end
-
-end
diff --git a/users/app/views/.gitkeep b/users/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/app/views/emails/_email.html.haml b/users/app/views/emails/_email.html.haml
deleted file mode 100644
index ea59cec..0000000
--- a/users/app/views/emails/_email.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-= wrapped(email, local_assigns) do
-  = email
-  - if local_assigns[:with].try(:include?, :delete)
-    = link_to(user_email_alias_path(@user, email), :method => :delete) do
-      %i.icon-remove
-
diff --git a/users/app/views/sessions/new.html.haml b/users/app/views/sessions/new.html.haml
deleted file mode 100644
index 771dc97..0000000
--- a/users/app/views/sessions/new.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-.span1
-.span9
-  = render :partial => 'users/warnings'
-  %h2=t :login
-  = simple_form_for [:api, @session], :validate => true, :html => { :id => :new_session, :class => 'form-horizontal' } do |f|
-    = f.input :login, :required => false, :label => t(:username), :input_html => { :id => :srp_username }
-    = f.input :password, :required => false, :input_html => { :id => :srp_password }
-    .form-actions
-      = f.button :submit, :value => t(:login), :class => 'btn-primary'
-      = link_to t(:cancel), home_path, :class => 'btn'
diff --git a/users/app/views/sessions/new.json.erb b/users/app/views/sessions/new.json.erb
deleted file mode 100644
index 36154b8..0000000
--- a/users/app/views/sessions/new.json.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-"errors": <%= raw @errors.to_json %>
-}
diff --git a/users/app/views/users/_change_password.html.haml b/users/app/views/users/_change_password.html.haml
deleted file mode 100644
index 425e3ee..0000000
--- a/users/app/views/users/_change_password.html.haml
+++ /dev/null
@@ -1,21 +0,0 @@
--#
--# CHANGE PASSWORD
--#
--# * everything about this form is handled with javascript. So take care when changing any ids.
--# * the login is required when changing the password because it is used as part of the salt when calculating the password verifier.
--#   however, we don't want the user to change their login without generating a new key, so we hide the ui for this
--#   (although it works perfectly fine to change username if the field was visible).
--#
-
-- form_options = {:url => '/not-used', :html => {:class => user_form_class('form-horizontal'), :id =>  'update_login_and_password', :data => {token: session[:token]}}, :validate => true}
-= simple_form_for @user, form_options do |f|
-  %legend= t(:change_password)
-  = hidden_field_tag 'user_param', @user.to_param
-  .hidden
-    = f.input :login, :label => t(:username), :required => false, :input_html => {:id => :srp_username}
-  = f.input :password, :required => false, :validate => true, :input_html => { :id => :srp_password }
-  = f.input :password_confirmation, :required => false, :input_html => { :id => :srp_password_confirmation }
-  .control-group
-    .controls
-      = f.submit t(:save), :class => 'btn btn-primary'
-
diff --git a/users/app/views/users/_change_pgp_key.html.haml b/users/app/views/users/_change_pgp_key.html.haml
deleted file mode 100644
index e465125..0000000
--- a/users/app/views/users/_change_pgp_key.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
--#
--# CHANGE PGP KEY
--#
--# this will be replaced by a identities controller/view at some point
--#
-
-- form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_pgp_key', :data => {token: session[:token]}}, :validate => true}
-= simple_form_for [:api, @user], form_options do |f|
-  %legend= t(:advanced_options)
-  = f.input :public_key, :as => :text, :hint => t(:use_ascii_key), :input_html => {:class => "full-width", :rows => 4}
-  .control-group
-    .controls
-      = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/users/app/views/users/_change_service_level.html.haml b/users/app/views/users/_change_service_level.html.haml
deleted file mode 100644
index 61e67d9..0000000
--- a/users/app/views/users/_change_service_level.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
--# TODO: probably won't want here, but here for now. Also, we will need way to ensure payment if they pick a non-free plan.
--#
--# SERVICE LEVEL
--#
-- if APP_CONFIG[:service_levels]
-  - form_options = {:html => {:class => user_form_class('form-horizontal'), :id => 'update_service_level', :data => {token: session[:token]}}, :validate => true}
-  = simple_form_for @user, form_options do |f|
-    %legend= t(:service_level)
-    - if @user != current_user
-      = t(:desired_service_level)
-    = f.select :desired_service_level_code, ServiceLevel.authenticated_select_options, :selected => @user.desired_service_level.id
-    - if @user != current_user
-      %p
-      = t(:effective_service_level)
-      = f.select :effective_service_level_code, ServiceLevel.authenticated_select_options, :selected => @user.effective_service_level.id
-    .control-group
-      .controls
-        = f.submit t(:save), :class => 'btn', :data => {"loading-text" => "Saving..."}
diff --git a/users/app/views/users/_destroy_account.html.haml b/users/app/views/users/_destroy_account.html.haml
deleted file mode 100644
index 445f3c4..0000000
--- a/users/app/views/users/_destroy_account.html.haml
+++ /dev/null
@@ -1,27 +0,0 @@
--#
--# DESTROY ACCOUNT
--#
-
-%legend
-  - if @user == current_user
-    = t(:destroy_my_account)
-  - else
-    = t(:admin_destroy_account, :username => @user.login)
-%p= t(:destroy_account_info)
-= link_to user_path(@user), :method => :delete, :confirm => t(:are_you_sure), :class => "btn btn-danger" do
-  %i.icon-remove.icon-white
-  = t(:destroy_my_account)
-- if @user != current_user and @user.enabled?
-  %legend
-    = t(:deactivate_account, :username => @user.login)
-  %p= t(:deactivate_description)
-  = link_to deactivate_user_path(@user), :method => :post, :class => "btn btn-warning"  do
-    %i.icon-pause.icon-white
-    = t(:deactivate)
-- elsif @user != current_user and !@user.enabled?
-  %legend
-    = t(:enable_account, :username => @user.login)
-  %p= t(:enable_description)
-  = link_to enable_user_path(@user), :method => :post, :class => "btn btn-warning"  do
-    %i.icon-ok.icon-white
-    = t(:enable)
diff --git a/users/app/views/users/_edit.html.haml b/users/app/views/users/_edit.html.haml
deleted file mode 100644
index 1d2b68a..0000000
--- a/users/app/views/users/_edit.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
--#
--# edit user form, used by both show and edit actions.
--#
--# We render a bunch of forms here. Which we use depends upon config settings
--# user_actions and admin_actions. They both include an array of actions 
--# allowed to users and admins.
--# Possible forms are:
--#  'change_password'
--#  'change_pgp_key'
--#  'change_service_level'
--#  'destroy_account'
-- actions = APP_CONFIG[admin? ? :admin_actions : :user_actions] || []
-- actions.each do |action|
-  = render action
diff --git a/users/app/views/users/_user.html.haml b/users/app/views/users/_user.html.haml
deleted file mode 100644
index 583d22f..0000000
--- a/users/app/views/users/_user.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%tr
-  %td= link_to user.login, user
-  %td= l(user.created_at, :format => :short)
-  %td= l(user.updated_at, :format => :short)
diff --git a/users/app/views/users/_warnings.html.haml b/users/app/views/users/_warnings.html.haml
deleted file mode 100644
index 79ab103..0000000
--- a/users/app/views/users/_warnings.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%noscript
-  %div.alert.alert-error=t :js_required_html
-#cookie_warning.alert.alert-error{:style => "display:none"}
-  =t :cookie_disabled_warning
-:javascript
-  document.cookie = "testing=cookies_enabled; path=/";
-  if(document.cookie.indexOf("testing=cookies_enabled") < 0)
-  {
-    document.getElementById('cookie_warning').style.display = 'block';
-  } else {
-    document.getElementById('cookie_warning').style.display = 'none';
-  }
\ No newline at end of file
diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml
deleted file mode 100644
index 434c025..0000000
--- a/users/app/views/users/edit.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-= render 'edit'
diff --git a/users/app/views/users/index.html.haml b/users/app/views/users/index.html.haml
deleted file mode 100644
index fc1001e..0000000
--- a/users/app/views/users/index.html.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-- @show_navigation = false
-
-= form_tag users_path, :method => :get, :class => "form-search" do
-  .input-append
-    = text_field_tag :query, params[:query], :id => 'user-typeahead', :class => "search-query", :autocomplete => :off
-    %button.btn{:type => :submit}= t(:search)
-
-%table.table.table-striped
-  %tr
-    %th= t(:username)
-    %th= t(:created)
-    %th= t(:updated)
-  = render @users.all
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
deleted file mode 100644
index aecf831..0000000
--- a/users/app/views/users/new.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
--#
--# This form is handled entirely by javascript, so take care when changing element ids.
--#
-
-- form_options = {:url => '/not-used', :html => {:id =>  'new_user', :class => user_form_class('form-horizontal')}, :validate => true}
-
-.span1
-.span9
-  = render :partial => 'warnings'
-  %h2=t :signup
-  = simple_form_for(@user, form_options) do |f|
-    %legend= t(:signup_message)
-    = f.input :login, :label => t(:username), :required => false, :input_html => { :id => :srp_username }
-    = f.input :password,              :required => false, :validate => true, :input_html => { :id => :srp_password }
-    = f.input :password_confirmation, :required => false, :validate => true, :input_html => { :id => :srp_password_confirmation }
-    .form-actions
-      = f.button :submit, :value => t(:signup), :class => 'btn btn-primary'
-      = link_to t(:cancel), home_path, :class => 'btn'
-
diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml
deleted file mode 100644
index c587017..0000000
--- a/users/app/views/users/show.html.haml
+++ /dev/null
@@ -1,25 +0,0 @@
-.overview
-
-  %h2.first= t(:overview_welcome, :username => @user.login)
-
-  - if admin?
-    %p
-      = t(:created)
-      = @user.created_at
-      %br
-      = t(:updated)
-      = @user.updated_at
-      %br
-      = t(:enabled)
-      = @user.enabled?
-
-  %p= t(:overview_intro)
-
-  %ul.unstyled
-    %li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
-    - # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly}
-    %li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user))
-    %li= icon('shopping-cart') + link_to(t(:overview_billing), billing_top_link(@user)) if APP_CONFIG[:billing]
-  .container-fluid
-    .row-fluid
-      = home_page_buttons(true)
\ No newline at end of file
diff --git a/users/app/views/v1/sessions/new.json.erb b/users/app/views/v1/sessions/new.json.erb
deleted file mode 100644
index 36154b8..0000000
--- a/users/app/views/v1/sessions/new.json.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-"errors": <%= raw @errors.to_json %>
-}
diff --git a/users/app/views/webfinger/host_meta.xml.erb b/users/app/views/webfinger/host_meta.xml.erb
deleted file mode 100644
index cfcbcc0..0000000
--- a/users/app/views/webfinger/host_meta.xml.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-  <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
-
-    <Subject><%= @host_meta.subject %></Subject>
-
-  <%- @host_meta.links.each do |rel, link| %>
-    <Link rel='<%= rel %>'
-      type='<%= link[:type] %>'
-      template='<%= link[:template] %>' />
-  <%- end %>
-  </XRD>
diff --git a/users/app/views/webfinger/search.xml.erb b/users/app/views/webfinger/search.xml.erb
deleted file mode 100644
index 7328552..0000000
--- a/users/app/views/webfinger/search.xml.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Subject><%= @presenter.subject %></Subject>
-  <%- @presenter.links.each do |rel, link| %>
-    <Link rel=<%=rel%> type=<%=link[:type]%> href="<%= link[:key] %>"/>
-  <% end %>
-</XRD>
diff --git a/users/test/factories.rb b/users/test/factories.rb
deleted file mode 100644
index ae00d43..0000000
--- a/users/test/factories.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-FactoryGirl.define do
-
-  factory :user do
-    login { Faker::Internet.user_name }
-    password_verifier "1234ABCD"
-    password_salt "4321AB"
-
-    factory :user_with_settings do
-      email_forward { Faker::Internet.email }
-      email_aliases_attributes do
-        {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
-      end
-    end
-
-    factory :admin_user do
-      after(:build) do |admin|
-        admin.stubs(:is_admin?).returns(true)
-      end
-    end
-  end
-
-  factory :token do
-    user
-  end
-
-  factory :pgp_key do
-    keyblock <<-EOPGP
------BEGIN PGP PUBLIC KEY BLOCK-----
-+Dummy+PGP+KEY+++Dummy+PGP+KEY+++Dummy+PGP+KEY+++Dummy+PGP+KEY+
-#{SecureRandom.base64(4032)}
------END PGP PUBLIC KEY BLOCK-----
-    EOPGP
-  end
-end
diff --git a/users/test/fixtures/.gitkeep b/users/test/fixtures/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/test/functional/.gitkeep b/users/test/functional/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/test/functional/application_controller_test.rb b/users/test/functional/application_controller_test.rb
deleted file mode 100644
index c4c922b..0000000
--- a/users/test/functional/application_controller_test.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'test_helper'
-
-class ApplicationControllerTest < ActionController::TestCase
-
-  def setup
-    # so we can test the effect on the response
-    @controller.response = @response
-  end
-
-  def test_require_login_redirect
-    @controller.send(:require_login)
-    assert_access_denied(true, false)
-  end
-
-  def test_require_login
-    login
-    @controller.send(:require_login)
-    assert_access_denied(false)
-  end
-
-  def test_require_admin
-    login
-    @current_user.expects(:is_admin?).returns(false)
-    @controller.send(:require_admin)
-    assert_access_denied
-  end
-
-end
diff --git a/users/test/functional/helper_methods_test.rb b/users/test/functional/helper_methods_test.rb
deleted file mode 100644
index 44226ae..0000000
--- a/users/test/functional/helper_methods_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Testing and documenting the helper methods available from
-# ApplicationController
-#
-
-require 'test_helper'
-
-class HelperMethodsTest < ActionController::TestCase
-  tests ApplicationController
-
-  # we test them right in here...
-  include ApplicationController._helpers
-
-  # the helpers all reference the controller.
-  def controller
-    @controller
-  end
-
-  def test_current_user
-    login
-    assert_equal @current_user, current_user
-  end
-
-  def test_logged_in
-    login
-    assert logged_in?
-  end
-
-  def test_logged_out
-    assert !logged_in?
-  end
-
-  def test_admin
-    login
-    @current_user.expects(:is_admin?).returns(bool = stub)
-    assert_equal bool, admin?
-  end
-
-end
diff --git a/users/test/functional/keys_controller_test.rb b/users/test/functional/keys_controller_test.rb
deleted file mode 100644
index 863be93..0000000
--- a/users/test/functional/keys_controller_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class KeysControllerTest < ActionController::TestCase
-
-  test "get existing public key" do
-    public_key = 'my public key'
-    @user = stub_record :user, :public_key => public_key
-    User.stubs(:find_by_login).with(@user.login).returns(@user)
-    get :show, :login => @user.login
-    assert_response :success
-    assert_equal "text/text", response.content_type
-    assert_equal public_key, response.body
-  end
-
-  test "get non-existing public key for user" do
-    # this isn't a scenerio that should generally occur.
-    @user = stub_record :user
-    User.stubs(:find_by_login).with(@user.login).returns(@user)
-    get :show, :login => @user.login
-    assert_response :success
-    assert_equal "text/text", response.content_type
-    assert_equal '', response.body.strip
-  end
-
-  test "get public key for non-existing user" do
-    # raise 404 error if user doesn't exist (doesn't need to be this routing error, but seems fine to assume for now):
-    assert_raise(ActionController::RoutingError) {
-      get :show, :login => 'asdkljslksjfdlskfj'
-    }
-  end
-
-end
diff --git a/users/test/functional/sessions_controller_test.rb b/users/test/functional/sessions_controller_test.rb
deleted file mode 100644
index fe7903f..0000000
--- a/users/test/functional/sessions_controller_test.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'test_helper'
-
-# This is a simple controller unit test.
-# We're stubbing out both warden and srp.
-# There's an integration test testing the full rack stack and srp
-class SessionsControllerTest < ActionController::TestCase
-
-  setup do
-    @user = stub :login => "me", :id => 123
-    @client_hex = 'a123'
-  end
-
-  test "should get login screen" do
-    get :new
-    assert_response :success
-    assert_equal "text/html", response.content_type
-    assert_template "sessions/new"
-  end
-
-  test "redirect to home_url if logged in" do
-    login
-    get :new
-    assert_response :redirect
-    assert_redirected_to home_url
-  end
-
-  test "renders json" do
-    get :new, :format => :json
-    assert_response :success
-    assert_json_error nil
-  end
-
-  test "renders warden errors" do
-    request.env['warden.options'] = {attempted_path: '/1/sessions/asdf.json'}
-    strategy = stub :message => {:field => :translate_me}
-    request.env['warden'].stubs(:winning_strategy).returns(strategy)
-    I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
-    get :new, :format => :json
-    assert_response 422
-    assert_json_error :field => "translation stub"
-  end
-
-  test "renders failed attempt message" do
-    request.env['warden.options'] = {attempted_path: '/1/sessions/asdf.json'}
-    request.env['warden'].stubs(:winning_strategy).returns(nil)
-    get :new, :format => :json
-    assert_response 422
-    assert_json_error :login => I18n.t(:all_strategies_failed)
-  end
-
-  test "destory should logout" do
-    login
-    expect_logout
-    delete :destroy
-    assert_response :redirect
-    assert_redirected_to home_url
-  end
-
-end
diff --git a/users/test/functional/test_helpers_test.rb b/users/test/functional/test_helpers_test.rb
deleted file mode 100644
index 845e516..0000000
--- a/users/test/functional/test_helpers_test.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# There are a few test helpers for dealing with login etc.
-# We test them here and also document their behaviour.
-#
-
-require 'test_helper'
-
-class TestHelpersTest < ActionController::TestCase
-  tests ApplicationController # testing no controller in particular
-
-  def test_login_stubs_warden
-    login
-    assert_equal @current_user, request.env['warden'].user
-  end
-
-  def test_login_token_authenticates
-    login
-    assert_equal @current_user, @controller.send(:token_authenticate)
-  end
-
-  def test_login_stubs_token
-    login
-    assert @token
-    assert_equal @current_user, @token.authenticate
-  end
-
-  def test_login_adds_token_header
-    login
-    token_present = @controller.authenticate_with_http_token do |token, options|
-      assert_equal @token.id, token
-    end
-    # authenticate_with_http_token just returns nil and does not
-    # execute the block if there is no token. So we have to also
-    # ensure it was run:
-    assert token_present
-  end
-end
-
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
deleted file mode 100644
index 0713836..0000000
--- a/users/test/functional/users_controller_test.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'test_helper'
-
-class UsersControllerTest < ActionController::TestCase
-
-  test "should get new" do
-    get :new
-    assert_equal User, assigns(:user).class
-    assert_response :success
-  end
-
-  test "new should redirect logged in users" do
-    login
-    get :new
-    assert_response :redirect
-    assert_redirected_to home_path
-  end
-
-  test "failed show without login" do
-    user = find_record :user
-    get :show, :id => user.id
-    assert_response :redirect
-    assert_redirected_to login_path
-  end
-
-  test "user can see user" do
-    user = find_record :user,
-      :most_recent_tickets => []
-    login user
-    get :show, :id => user.id
-    assert_response :success
-  end
-
-  test "admin can see other user" do
-    user = find_record :user,
-      :most_recent_tickets => []
-    login :is_admin? => true
-    get :show, :id => user.id
-    assert_response :success
-
-  end
-
-  test "user cannot see other user" do
-    user = find_record :user,
-      :most_recent_tickets => []
-    login
-    get :show, :id => user.id
-    assert_response :redirect
-    assert_access_denied
-  end
-
-  test "may not show non-existing user without auth" do
-    nonid = 'thisisnotanexistinguserid'
-
-    get :show, :id => nonid
-    assert_access_denied(true, false)
-  end
-
-  test "may not show non-existing user without admin" do
-    nonid = 'thisisnotanexistinguserid'
-    login
-
-    get :show, :id => nonid
-    assert_access_denied
-  end
-
-  test "redirect admin to user list for non-existing user" do
-    nonid = 'thisisnotanexistinguserid'
-    login :is_admin? => true
-    get :show, :id => nonid
-    assert_response :redirect
-    assert_equal({:alert => "No such user."}, flash.to_hash)
-    assert_redirected_to users_path
-  end
-
-  test "should get edit view" do
-    user = find_record :user
-
-    login user
-    get :edit, :id => user.id
-
-    assert_equal user, assigns[:user]
-  end
-
-  test "admin can destroy user" do
-    user = find_record :user
-
-    # we destroy the user record and the associated data...
-    user.expects(:destroy)
-    Identity.expects(:disable_all_for).with(user)
-    Ticket.expects(:destroy_all_from).with(user)
-
-    login :is_admin? => true
-    delete :destroy, :id => user.id
-
-    assert_response :redirect
-    assert_redirected_to users_path
-  end
-
-  test "user can cancel account" do
-    user = find_record :user
-
-    # we destroy the user record and the associated data...
-    user.expects(:destroy)
-    Identity.expects(:disable_all_for).with(user)
-    Ticket.expects(:destroy_all_from).with(user)
-
-    login user
-    expect_logout
-    delete :destroy, :id => @current_user.id
-
-    assert_response :redirect
-    assert_redirected_to bye_url
-  end
-
-  test "non-admin can't destroy user" do
-    user = find_record :user
-
-    login
-    delete :destroy, :id => user.id
-
-    assert_access_denied
-  end
-
-  test "admin can list users" do
-    login :is_admin? => true
-    get :index
-
-    assert_response :success
-    assert assigns(:users)
-  end
-
-  test "non-admin can't list users" do
-    login
-    get :index
-
-    assert_access_denied
-  end
-
-  test "admin can search users" do
-    login :is_admin? => true
-    get :index, :query => "a"
-
-    assert_response :success
-    assert assigns(:users)
-  end
-
-  test "user cannot enable own account" do
-    user = find_record :user
-    login
-    post :enable, :id => user.id
-    assert_access_denied
-  end
-
-  test "admin can deactivate user" do
-    user = find_record :user
-    assert user.enabled?
-    user.expects(:save).returns(true)
-
-    login :is_admin? => true
-
-    post :deactivate, :id => user.id
-    assert !assigns(:user).enabled?
-  end
-
-end
diff --git a/users/test/functional/v1/messages_controller_test.rb b/users/test/functional/v1/messages_controller_test.rb
deleted file mode 100644
index 24a5b1f..0000000
--- a/users/test/functional/v1/messages_controller_test.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'test_helper'
-
-class V1::MessagesControllerTest < ActionController::TestCase
-
-  setup do
-    @user = FactoryGirl.build(:user)
-    @user.save
-    @message = Message.new(:text => 'a test message')
-    @message.user_ids_to_show << @user.id
-    @message.save
-  end
-
-  teardown do
-    @message.destroy
-    @user.destroy
-  end
-
-  test "get messages for user" do
-    login @user
-    get :index
-    assert response.body.include? @message.text
-    assert response.body.include? @message.id
-  end
-
-  test "mark message read for user" do
-    login @user
-    assert @message.user_ids_to_show.include?(@user.id)
-    assert !@message.user_ids_have_shown.include?(@user.id)
-    put :update, :id => @message.id
-    @message.reload
-    assert !@message.user_ids_to_show.include?(@user.id)
-    assert @message.user_ids_have_shown.include?(@user.id)
-    assert_json_response true
-  end
-
-  test "do not get seen messages" do
-    login @user
-    put :update, :id => @message.id
-    @message.reload
-    get :index
-    assert !(response.body.include? @message.text)
-    assert !(response.body.include? @message.id)
-  end
-
-
-  test "mark read responds even with bad inputs" do
-    login @user
-    put :update, :id => 'more nonsense'
-    assert_json_response false
- end
-
-  test "fails if not authenticated" do
-    get :index, :format => :json
-    assert_access_denied
-  end
-
-end
diff --git a/users/test/functional/v1/sessions_controller_test.rb b/users/test/functional/v1/sessions_controller_test.rb
deleted file mode 100644
index df0d681..0000000
--- a/users/test/functional/v1/sessions_controller_test.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'test_helper'
-
-# This is a simple controller unit test.
-# We're stubbing out both warden and srp.
-# There's an integration test testing the full rack stack and srp
-class V1::SessionsControllerTest < ActionController::TestCase
-
-  setup do
-    @request.env['HTTP_HOST'] = 'api.lvh.me'
-    @user = stub_record :user, {}, true
-    @client_hex = 'a123'
-  end
-
-  test "renders json" do
-    get :new, :format => :json
-    assert_response :success
-    assert_json_error nil
-  end
-
-  test "renders warden errors" do
-    request.env['warden.options'] = {attempted_path: 'path/to/controller'}
-    strategy = stub :message => {:field => :translate_me}
-    request.env['warden'].stubs(:winning_strategy).returns(strategy)
-    I18n.expects(:t).with(:translate_me).at_least_once.returns("translation stub")
-    get :new, :format => :json
-    assert_response 422
-    assert_json_error :field => "translation stub"
-  end
-
-  # Warden takes care of parsing the params and
-  # rendering the response. So not much to test here.
-  test "should perform handshake" do
-    request.env['warden'].expects(:authenticate!)
-    # make sure we don't get a template missing error:
-    @controller.stubs(:render)
-    post :create, :login => @user.login, 'A' => @client_hex
-  end
-
-  test "should authenticate" do
-    request.env['warden'].expects(:authenticate!)
-    @controller.stubs(:current_user).returns(@user)
-    handshake = stub(:to_hash => {h: "ash"})
-    session[:handshake] = handshake
-
-    post :update, :id => @user.login, :client_auth => @client_hex
-
-    assert_nil session[:handshake]
-    assert_response :success
-    assert json_response.keys.include?("id")
-    assert json_response.keys.include?("token")
-    assert token = Token.find(json_response['token'])
-    assert_equal @user.id, token.user_id
-  end
-
-  test "destroy should logout" do
-    login
-    expect_logout
-    delete :destroy
-    assert_response 204
-  end
-
-end
diff --git a/users/test/functional/v1/users_controller_test.rb b/users/test/functional/v1/users_controller_test.rb
deleted file mode 100644
index 7cd9b0c..0000000
--- a/users/test/functional/v1/users_controller_test.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require 'test_helper'
-
-class V1::UsersControllerTest < ActionController::TestCase
-
-  test "user can change settings" do
-    user = find_record :user
-    changed_attribs = record_attributes_for :user_with_settings
-    account_settings = stub
-    account_settings.expects(:update).with(changed_attribs)
-    Account.expects(:new).with(user).returns(account_settings)
-
-    login user
-    put :update, :user => changed_attribs, :id => user.id, :format => :json
-
-    assert_equal user, assigns[:user]
-    assert_response 204
-    assert_equal " ", @response.body
-  end
-
-  test "admin can update user" do
-    user = find_record :user
-    changed_attribs = record_attributes_for :user_with_settings
-    account_settings = stub
-    account_settings.expects(:update).with(changed_attribs)
-    Account.expects(:new).with(user).returns(account_settings)
-
-    login :is_admin? => true
-    put :update, :user => changed_attribs, :id => user.id, :format => :json
-
-    assert_equal user, assigns[:user]
-    assert_response 204
-  end
-
-  test "user cannot update other user" do
-    user = find_record :user
-    login
-    put :update, :user => record_attributes_for(:user_with_settings), :id => user.id, :format => :json
-    assert_access_denied
-  end
-
-  test "should create new user" do
-    user_attribs = record_attributes_for :user
-    user = User.new(user_attribs)
-    Account.expects(:create).with(user_attribs).returns(user)
-
-    post :create, :user => user_attribs, :format => :json
-
-    assert_nil session[:user_id]
-    assert_json_response user
-    assert_response :success
-  end
-
-  test "should redirect to signup form on failed attempt" do
-    user_attribs = record_attributes_for :user
-    user_attribs.slice!('login')
-    user = User.new(user_attribs)
-    assert !user.valid?
-    Account.expects(:create).with(user_attribs).returns(user)
-
-    post :create, :user => user_attribs, :format => :json
-
-    assert_json_error user.errors.messages
-    assert_response 422
-  end
-
-  test "admin can autocomplete users" do
-    login :is_admin? => true
-    get :index, :query => 'a', :format => :json
-
-    assert_response :success
-    assert assigns(:users)
-  end
-
-end
diff --git a/users/test/functional/webfinger_controller_test.rb b/users/test/functional/webfinger_controller_test.rb
deleted file mode 100644
index 6597b69..0000000
--- a/users/test/functional/webfinger_controller_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'test_helper'
-
-class WebfingerControllerTest < ActionController::TestCase
-
-  test "get host meta xml" do
-    get :host_meta, :format => :xml
-    assert_response :success
-    assert_equal "application/xml", response.content_type
-  end
-
-  test "get host meta json" do
-    get :host_meta, :format => :json
-    assert_response :success
-    assert_equal "application/json", response.content_type
-  end
-
-  test "get user webfinger xml" do
-    @user = stub_record :user, :public_key => 'my public key'
-    User.stubs(:find_by_login).with(@user.login).returns(@user)
-    get :search, :q => @user.email_address.to_s, :format => :xml
-    assert_response :success
-    assert_equal "application/xml", response.content_type
-  end
-
-  test "get user webfinger json" do
-    @user = stub_record :user, :public_key => 'my public key'
-    User.stubs(:find_by_login).with(@user.login).returns(@user)
-    get :search, :q => @user.email_address.to_s, :format => :json
-    assert_response :success
-    assert_equal "application/json", response.content_type
-  end
-
-end
diff --git a/users/test/integration/.gitkeep b/users/test/integration/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/test/integration/api/Readme.md b/users/test/integration/api/Readme.md
deleted file mode 100644
index 04363bd..0000000
--- a/users/test/integration/api/Readme.md
+++ /dev/null
@@ -1,23 +0,0 @@
-API tests
-==========
-
-
-Testing the restful api from a simple python client as that's what we'll be using.
-
-This test so far mostly demoes the API. We have no SRP calc in there.
-
-TODO: keep track of the cookies during login. The server uses the session to keep track of the random numbers A and B.
-
-The output of signup_and_login_wrong_password pretty well describes the SRP API:
-
-```
-POST: http://localhost:9292/users.json
-    {"user[password_salt]": "54321", "user[password_verifier]": "12345", "user[login]": "SWQ055"}
- -> {"password_salt":"54321","login":"SWQ055"}
-POST: http://localhost:9292/sessions
-    {"A": "12345", "login": "SWQ055"}
- -> {"B":"1778367531e93a4c7713c76f67649f35a4211ebc520926ae8c3848cd66171651"}
-PUT: http://localhost:9292/sessions/SWQ055
-    {"M": "123ABC"}
- -> {"errors":[{"login":"Not a valid username/password combination"},{"password":"Not a valid username/password combination"}]}
-```
diff --git a/users/test/integration/api/login_test.rb b/users/test/integration/api/login_test.rb
deleted file mode 100644
index 92d153f..0000000
--- a/users/test/integration/api/login_test.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require 'test_helper'
-require_relative 'srp_test'
-
-class LoginTest < SrpTest
-
-  setup do
-    register_user
-  end
-
-  test "requires handshake before validation" do
-    validate("bla")
-    assert_json_error login: I18n.t(:all_strategies_failed)
-  end
-
-  test "login with srp" do
-    authenticate
-    assert_equal ["M2", "id", "token"], server_auth.keys
-    assert last_response.successful?
-    assert_nil server_auth["errors"]
-    assert server_auth["M2"]
-  end
-
-  test "wrong password login attempt" do
-    authenticate password: "wrong password"
-    assert_json_error "base" => "Not a valid username/password combination"
-    assert !last_response.successful?
-    assert_nil server_auth["M2"]
-  end
-
-  test "wrong username login attempt" do
-    assert_raises RECORD_NOT_FOUND do
-      authenticate login: "wrong login"
-    end
-    assert_json_error "base" => "Not a valid username/password combination"
-    assert !last_response.successful?
-    assert_nil server_auth
-  end
-
-  test "logout" do
-    authenticate
-    logout
-    assert_equal 204, last_response.status
-  end
-
-  test "logout requires token" do
-    authenticate
-    logout(nil, {})
-    assert_equal 422, last_response.status
-  end
-end
diff --git a/users/test/integration/api/pgp_key_test.rb b/users/test/integration/api/pgp_key_test.rb
deleted file mode 100644
index 4c7fb4c..0000000
--- a/users/test/integration/api/pgp_key_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'test_helper'
-require_relative 'srp_test'
-
-class PgpKeyTest < SrpTest
-
-  setup do
-    # todo: prepare user and login without doing the srp dance
-    register_user
-    authenticate
-  end
-
-  test "upload pgp key" do
-    update_user public_key: key
-    assert_equal key, Identity.for(@user).keys[:pgp]
-  end
-
-  # eventually probably want to remove most of this into a non-integration
-  # functional test
-  test "prevent uploading invalid key" do
-    update_user public_key: "invalid key"
-    assert_nil Identity.for(@user).keys[:pgp]
-  end
-
-  test "prevent emptying public key" do
-    update_user public_key: key
-    update_user public_key: ""
-    assert_equal key, Identity.for(@user).keys[:pgp]
-  end
-
-  protected
-
-  def key
-    @key ||= FactoryGirl.build :pgp_key
-  end
-end
diff --git a/users/test/integration/api/python/flow_with_srp.py b/users/test/integration/api/python/flow_with_srp.py
deleted file mode 100755
index 9fc168b..0000000
--- a/users/test/integration/api/python/flow_with_srp.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-
-# under development
-
-import requests
-import json
-import string
-import random
-import srp._pysrp as srp
-import binascii
-
-safe_unhexlify = lambda x: binascii.unhexlify(x) if (len(x) % 2 == 0) else binascii.unhexlify('0'+x)
-
-# using globals for now
-# server = 'https://dev.bitmask.net/1'
-server = 'http://api.lvh.me:3000/1'
-
-def run_tests():
-  login = 'test_' + id_generator()
-  password = id_generator() + id_generator()
-  usr = srp.User( login, password, srp.SHA256, srp.NG_1024 )
-  print_and_parse(signup(login, password))
-
-  auth = print_and_parse(authenticate(usr))
-  verify_or_debug(auth, usr)
-  assert usr.authenticated()
-
-  usr = change_password(auth['id'], login, auth['token'])
-
-  auth = print_and_parse(authenticate(usr))
-  verify_or_debug(auth, usr)
-  # At this point the authentication process is complete.
-  assert usr.authenticated()
-
-# let's have some random name
-def id_generator(size=6, chars=string.ascii_lowercase + string.digits):
-  return ''.join(random.choice(chars) for x in range(size))
-
-# log the server communication
-def print_and_parse(response):
-  request = response.request
-  print request.method + ': ' + response.url
-  if hasattr(request, 'data'):
-    print "    " + json.dumps(response.request.data)
-  print " -> " + response.text
-  try: 
-    return json.loads(response.text)
-  except ValueError:
-    return None
-
-def signup(login, password):
-  salt, vkey = srp.create_salted_verification_key( login, password, srp.SHA256, srp.NG_1024 )
-  user_params = {
-      'user[login]': login,
-      'user[password_verifier]': binascii.hexlify(vkey),
-      'user[password_salt]': binascii.hexlify(salt)
-      }
-  return requests.post(server + '/users.json', data = user_params, verify = False)
-
-def change_password(user_id, login, token):
-  password = id_generator() + id_generator()
-  salt, vkey = srp.create_salted_verification_key( login, password, srp.SHA256, srp.NG_1024 )
-  user_params = {
-      'user[password_verifier]': binascii.hexlify(vkey),
-      'user[password_salt]': binascii.hexlify(salt)
-      }
-  auth_headers = { 'Authorization': 'Token token="' + token + '"'}
-  print user_params
-  print_and_parse(requests.put(server + '/users/' + user_id + '.json', data = user_params, verify = False, headers = auth_headers))
-  return srp.User( login, password, srp.SHA256, srp.NG_1024 )
-
-
-def authenticate(usr):
-  session = requests.session()
-  uname, A = usr.start_authentication()
-  params = {
-      'login': uname,
-      'A': binascii.hexlify(A)
-      }
-  init = print_and_parse(session.post(server + '/sessions', data = params, verify=False))
-  M = usr.process_challenge( safe_unhexlify(init['salt']), safe_unhexlify(init['B']) )
-  return session.put(server + '/sessions/' + uname, verify = False,
-      data = {'client_auth': binascii.hexlify(M)})
-
-def verify_or_debug(auth, usr):
-  if ( 'errors' in auth ):
-    print '    u = "%x"' % usr.u
-    print '    x = "%x"' % usr.x
-    print '    v = "%x"' % usr.v
-    print '    S = "%x"' % usr.S
-    print '    K = "' + binascii.hexlify(usr.K) + '"'
-    print '    M = "' + binascii.hexlify(usr.M) + '"'
-  else:
-    usr.verify_session( safe_unhexlify(auth["M2"]) )
-
-run_tests()
diff --git a/users/test/integration/api/python/login_wrong_username.py b/users/test/integration/api/python/login_wrong_username.py
deleted file mode 100755
index 390f250..0000000
--- a/users/test/integration/api/python/login_wrong_username.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env python
-
-server = 'http://localhost:3000'
-
-import requests
-import json
-import string
-import random
-
-def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
-  return ''.join(random.choice(chars) for x in range(size))
-
-params = {
-    'login': 'python_test_user_'+id_generator(),
-    'A': '12345',
-    }
-r = requests.post(server + '/sessions', data = params)
-print r.url
-print r.text
diff --git a/users/test/integration/api/python/signup.py b/users/test/integration/api/python/signup.py
deleted file mode 100755
index 0d3a4e0..0000000
--- a/users/test/integration/api/python/signup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-server = 'http://localhost:3000'
-
-import requests
-import json
-import string
-import random
-
-def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
-  return ''.join(random.choice(chars) for x in range(size))
-
-user_params = {
-    'user[login]': 'python_test_user_'+id_generator(),
-    'user[password_verifier]': '12345',
-    'user[password_salt]': '54321'
-    }
-r = requests.post(server + '/users.json', data = user_params)
-print r.url
-print r.text
diff --git a/users/test/integration/api/python/signup_and_login.py b/users/test/integration/api/python/signup_and_login.py
deleted file mode 100755
index ac611d7..0000000
--- a/users/test/integration/api/python/signup_and_login.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-
-# FAILS
-#
-# This test is currently failing for me because the session is not kept.
-# Played with it a bunch - is probably messed up right now as well.
-
-
-server = 'http://localhost:3000'
-
-import requests
-import json
-import string
-import random
-
-def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
-  return ''.join(random.choice(chars) for x in range(size))
-
-def print_and_parse(response):
-  print response.request.method + ': ' + response.url
-  print "    " + json.dumps(response.request.data)
-  print " -> " + response.text
-  return json.loads(response.text)
-
-def signup(session):
-  user_params = {
-      'user[login]': id_generator(),
-      'user[password_verifier]': '12345',
-      'user[password_salt]': 'AB54321'
-      }
-  return session.post(server + '/users.json', data = user_params)
-
-def authenticate(session, login):
-  params = {
-      'login': login,
-      'A': '12345',
-      }
-  init = print_and_parse(session.post(server + '/sessions', data = params))
-  return session.put(server + '/sessions/' + login, data = {'client_auth': '123'})
-
-session = requests.session()
-user = print_and_parse(signup(session))
-# SRP signup would happen here and calculate M hex
-auth = print_and_parse(authenticate(session, user['login']))
diff --git a/users/test/integration/api/python/signup_and_login_wrong_password.py b/users/test/integration/api/python/signup_and_login_wrong_password.py
deleted file mode 100755
index 9efffa1..0000000
--- a/users/test/integration/api/python/signup_and_login_wrong_password.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-
-server = 'http://localhost:9292'
-
-import requests
-import json
-import string
-import random
-
-def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
-  return ''.join(random.choice(chars) for x in range(size))
-
-def print_and_parse(response):
-  print response.request.method + ': ' + response.url
-  print "    " + json.dumps(response.request.data)
-  print " -> " + response.text
-#  print " () " + json.dumps(requests.utils.dict_from_cookiejar(response.cookies))
-  return json.loads(response.text)
-
-def signup():
-  user_params = {
-      'user[login]': id_generator(),
-      'user[password_verifier]': '12345',
-      'user[password_salt]': '54321'
-      }
-  return requests.post(server + '/users.json', data = user_params)
-
-def handshake(login):
-  params = {
-      'login': login,
-      'A': '12345',
-      }
-  return requests.post(server + '/sessions', data = params)
-
-def authenticate(login, M):
-  return requests.put(server + '/sessions/' + login, data = {'M': M})
-
-
-user = print_and_parse(signup())
-handshake = print_and_parse(handshake(user['login']))
-# SRP signup would happen here and calculate M hex
-M = '123ABC'
-auth = print_and_parse(authenticate(user['login'], M))
diff --git a/users/test/integration/api/python/umlauts.py b/users/test/integration/api/python/umlauts.py
deleted file mode 100755
index 96fecbf..0000000
--- a/users/test/integration/api/python/umlauts.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-# under development
-
-import requests
-import json
-import string
-import random
-import srp._pysrp as srp
-import binascii
-
-safe_unhexlify = lambda x: binascii.unhexlify(x) if (len(x) % 2 == 0) else binascii.unhexlify('0'+x)
-
-# using globals for now
-# server = 'https://dev.bitmask.net/1'
-server = 'http://api.lvh.me:3000/1'
-
-def run_tests():
-  login = 'test_' + id_generator()
-  password = id_generator() + "äöì" + id_generator()
-  usr = srp.User( login, password, srp.SHA256, srp.NG_1024 )
-  print_and_parse(signup(login, password))
-
-  auth = print_and_parse(authenticate(usr))
-  verify_or_debug(auth, usr)
-  assert usr.authenticated()
-
-
-# let's have some random name
-def id_generator(size=6, chars=string.ascii_lowercase + string.digits):
-  return ''.join(random.choice(chars) for x in range(size))
-
-# log the server communication
-def print_and_parse(response):
-  request = response.request
-  print request.method + ': ' + response.url
-  if hasattr(request, 'data'):
-    print "    " + json.dumps(response.request.data)
-  print " -> " + response.text
-  try: 
-    return json.loads(response.text)
-  except ValueError:
-    return None
-
-def signup(login, password):
-  salt, vkey = srp.create_salted_verification_key( login, password, srp.SHA256, srp.NG_1024 )
-  user_params = {
-      'user[login]': login,
-      'user[password_verifier]': binascii.hexlify(vkey),
-      'user[password_salt]': binascii.hexlify(salt)
-      }
-  print json.dumps(user_params)
-  return requests.post(server + '/users.json', data = user_params, verify = False)
-
-def authenticate(usr):
-  session = requests.session()
-  uname, A = usr.start_authentication()
-  params = {
-      'login': uname,
-      'A': binascii.hexlify(A)
-      }
-  init = print_and_parse(session.post(server + '/sessions', data = params, verify=False))
-  M = usr.process_challenge( safe_unhexlify(init['salt']), safe_unhexlify(init['B']) )
-  return session.put(server + '/sessions/' + uname, verify = False,
-      data = {'client_auth': binascii.hexlify(M)})
-
-def verify_or_debug(auth, usr):
-  if ( 'errors' in auth ):
-    print '    u = "%x"' % usr.u
-    print '    x = "%x"' % usr.x
-    print '    v = "%x"' % usr.v
-    print '    S = "%x"' % usr.S
-    print '    K = "' + binascii.hexlify(usr.K) + '"'
-    print '    M = "' + binascii.hexlify(usr.M) + '"'
-  else:
-    usr.verify_session( safe_unhexlify(auth["M2"]) )
-
-run_tests()
diff --git a/users/test/integration/api/signup_test.rb b/users/test/integration/api/signup_test.rb
deleted file mode 100644
index 236c547..0000000
--- a/users/test/integration/api/signup_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'test_helper'
-require_relative 'srp_test'
-
-class SignupTest < SrpTest
-
-  setup do
-    register_user
-  end
-
-  test "signup response" do
-    assert_json_response :login => @login, :ok => true
-    assert last_response.successful?
-  end
-
-  test "signup creates user" do
-    assert @user
-    assert_equal @login, @user.login
-  end
-end
-
diff --git a/users/test/integration/api/srp_test.rb b/users/test/integration/api/srp_test.rb
deleted file mode 100644
index 946450e..0000000
--- a/users/test/integration/api/srp_test.rb
+++ /dev/null
@@ -1,104 +0,0 @@
-class SrpTest < RackTest
-
-  teardown do
-    if @user
-      cleanup_user
-    end
-    Warden.test_reset!
-  end
-
-  # this test wraps the api and implements the interface the ruby-srp client.
-  def handshake(login, aa)
-    post "http://api.lvh.me:3000/1/sessions.json",
-      :login => login,
-      'A' => aa,
-      :format => :json
-    response = JSON.parse(last_response.body)
-    if response['errors']
-      raise RECORD_NOT_FOUND.new(response['errors'])
-    else
-      return response['B']
-    end
-  end
-
-  def validate(m)
-    put "http://api.lvh.me:3000/1/sessions/" + @login + '.json',
-      :client_auth => m,
-      :format => :json
-    return JSON.parse(last_response.body)
-  end
-
-  protected
-
-  attr_reader :server_auth
-
-  def register_user(login = "integration_test_user", password = 'srp, verify me!')
-    cleanup_user(login)
-    post 'http://api.lvh.me:3000/1/users.json',
-      user_params(login: login, password: password)
-    @user = User.find_by_login(login)
-    @login = login
-    @password = password
-  end
-
-  def update_user(params)
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
-      user_params(params),
-      auth_headers
-  end
-
-  def authenticate(params = nil)
-    @server_auth = srp(params).authenticate(self)
-  end
-
-  def auth_headers
-    return {} if @server_auth.nil?
-    {
-      "HTTP_AUTHORIZATION" => encoded_token
-    }
-  end
-
-  def encoded_token
-    ActionController::HttpAuthentication::Token.encode_credentials(server_auth["token"])
-  end
-
-  def logout(params=nil, headers=nil)
-    delete "http://api.lvh.me:3000/1/logout.json",
-      params || {format: :json},
-      headers || auth_headers
-  end
-
-  def cleanup_user(login = nil)
-    login ||= @user.login
-    Identity.by_address.key(login + '@' + APP_CONFIG[:domain]).each do |identity|
-      identity.destroy
-    end
-    if user = User.find_by_login(login)
-      user.destroy
-    end
-  end
-
-  def user_params(params)
-    if params.keys.include?(:password)
-      srp_process_password(params)
-    end
-    return { user: params, format: :json }
-  end
-
-  def srp_process_password(params)
-    params.reverse_merge! login: @login, salt: @salt
-    @srp = SRP::Client.new params[:login], password: params.delete(:password)
-    @salt = srp.salt.to_s(16)
-    params.merge! :password_verifier => srp.verifier.to_s(16),
-      :password_salt => @salt
-  end
-
-  def srp(params = nil)
-    if params.nil?
-      @srp
-    else
-      params.reverse_merge! password: @password
-      SRP::Client.new(params.delete(:login) || @login, params)
-    end
-  end
-end
diff --git a/users/test/integration/api/update_account_test.rb b/users/test/integration/api/update_account_test.rb
deleted file mode 100644
index 63429e7..0000000
--- a/users/test/integration/api/update_account_test.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-require 'test_helper'
-require_relative 'srp_test'
-
-class UpdateAccountTest < SrpTest
-
-  setup do
-    register_user
-  end
-
-  test "require authentication" do
-    update_user password: "No! Verify me instead."
-    assert_access_denied
-  end
-
-  test "require token" do
-    authenticate
-    put "http://api.lvh.me:3000/1/users/" + @user.id + '.json',
-      user_params(password: "No! Verify me instead.")
-    assert_access_denied
-  end
-
-  test "update password via api" do
-    authenticate
-    update_user password: "No! Verify me instead."
-    authenticate
-    assert last_response.successful?
-    assert_nil server_auth["errors"]
-    assert server_auth["M2"]
-  end
-
-  test "change login with password_verifier" do
-    authenticate
-    new_login = 'zaph'
-    cleanup_user new_login
-    update_user login: new_login, password: @password
-    authenticate
-    assert last_response.successful?
-    assert_equal new_login, @user.reload.login
-  end
-
-  test "prevent changing login without changing password_verifier" do
-    authenticate
-    original_login = @user.login
-    new_login = 'zaph'
-    cleanup_user new_login
-    update_user login: new_login
-    assert last_response.successful?
-    # does not change login if no password_verifier is present
-    assert_equal original_login, @user.reload.login
-  end
-end
diff --git a/users/test/integration/browser/account_test.rb b/users/test/integration/browser/account_test.rb
deleted file mode 100644
index a5677ad..0000000
--- a/users/test/integration/browser/account_test.rb
+++ /dev/null
@@ -1,147 +0,0 @@
-require 'test_helper'
-
-class AccountTest < BrowserIntegrationTest
-
-  teardown do
-    Identity.destroy_all_disabled
-  end
-
-  test "normal account workflow" do
-    username, password = submit_signup
-    assert page.has_content?("Welcome #{username}")
-    click_on 'Logout'
-    assert page.has_content?("Log In")
-    assert_equal '/', current_path
-    assert user = User.find_by_login(username)
-    user.account.destroy
-  end
-
-  test "successful login" do
-    username, password = submit_signup
-    click_on 'Logout'
-    attempt_login(username, password)
-    assert page.has_content?("Welcome #{username}")
-    within('.sidenav li.active') do
-      assert page.has_content?("Overview")
-    end
-    User.find_by_login(username).account.destroy
-  end
-
-  test "failed login" do
-    visit '/'
-    attempt_login("username", "wrong password")
-    assert_invalid_login(page)
-  end
-
-  test "account destruction" do
-    username, password = submit_signup
-    click_on I18n.t('account_settings')
-    click_on I18n.t('destroy_my_account')
-    assert page.has_content?(I18n.t('account_destroyed'))
-    attempt_login(username, password)
-    assert_invalid_login(page)
-  end
-
-  test "handle blocked after account destruction" do
-    username, password = submit_signup
-    click_on I18n.t('account_settings')
-    click_on I18n.t('destroy_my_account')
-    submit_signup(username)
-    assert page.has_content?('has already been taken')
-  end
-
-  test "default user actions" do
-    username, password = submit_signup
-    click_on "Account Settings"
-    assert page.has_content? I18n.t('destroy_my_account')
-    assert page.has_no_css? '#update_login_and_password'
-    assert page.has_no_css? '#update_pgp_key'
-  end
-
-  test "default admin actions" do
-    username, password = submit_signup
-    with_config admins: [username] do
-      click_on "Account Settings"
-      assert page.has_content? I18n.t('destroy_my_account')
-      assert page.has_no_css? '#update_login_and_password'
-      assert page.has_css? '#update_pgp_key'
-    end
-  end
-
-  test "change password" do
-    with_config user_actions: ['change_password'] do
-      username, password = submit_signup
-      click_on "Account Settings"
-      within('#update_login_and_password') do
-        fill_in 'Password', with: "other password"
-        fill_in 'Password confirmation', with: "other password"
-        click_on 'Save'
-      end
-      click_on 'Logout'
-      attempt_login(username, "other password")
-      assert page.has_content?("Welcome #{username}")
-      User.find_by_login(username).account.destroy
-    end
-  end
-
-  test "change pgp key" do
-    with_config user_actions: ['change_pgp_key'] do
-      pgp_key = FactoryGirl.build :pgp_key
-      username, password = submit_signup
-      click_on "Account Settings"
-      within('#update_pgp_key') do
-        fill_in 'Public key', with: pgp_key
-        click_on 'Save'
-      end
-      page.assert_selector 'input[value="Saving..."]'
-      # at some point we're done:
-      page.assert_no_selector 'input[value="Saving..."]'
-      assert page.has_field? 'Public key', with: pgp_key.to_s
-      user = User.find_by_login(username)
-      assert_equal pgp_key, user.public_key
-      user.account.destroy
-    end
-  end
-
-
-  # trying to seed an invalid A for srp login
-  test "detects attempt to circumvent SRP" do
-    user = FactoryGirl.create :user
-    visit '/login'
-    fill_in 'Username', with: user.login
-    fill_in 'Password', with: "password"
-    inject_malicious_js
-    click_on 'Log In'
-    assert page.has_content?("Invalid random key")
-    assert page.has_no_content?("Welcome")
-    user.destroy
-  end
-
-  test "reports internal server errors" do
-    V1::UsersController.any_instance.stubs(:create).raises
-    submit_signup
-    assert page.has_content?("server failed")
-  end
-
-  def attempt_login(username, password)
-    click_on 'Log In'
-    fill_in 'Username', with: username
-    fill_in 'Password', with: password
-    click_on 'Log In'
-  end
-
-  def assert_invalid_login(page)
-    assert page.has_selector? 'input.btn-primary.disabled'
-    assert page.has_content? I18n.t(:invalid_user_pass)
-    assert page.has_no_selector? 'input.btn-primary.disabled'
-  end
-
-  def inject_malicious_js
-    page.execute_script <<-EOJS
-      var calc = new srp.Calculate();
-      calc.A = function(_a) {return "00";};
-      calc.S = calc.A;
-      srp.session = new srp.Session(null, calc);
-    EOJS
-  end
-end
diff --git a/users/test/integration/browser/session_test.rb b/users/test/integration/browser/session_test.rb
deleted file mode 100644
index 3a41b3a..0000000
--- a/users/test/integration/browser/session_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'test_helper'
-
-class SessionTest < BrowserIntegrationTest
-
-  setup do
-    @username, password = submit_signup
-  end
-
-  teardown do
-    user = User.find_by_login(@username)
-    id = user.identity
-    id.destroy
-    user.destroy
-  end
-
-  test "valid session" do
-    assert page.has_content?("Welcome #{@username}")
-  end
-
-  test "expired session" do
-    assert page.has_content?("Welcome #{@username}")
-    pretend_now_is(Time.now + 40.minutes) do
-      visit '/'
-      assert page.has_no_content?("Welcome #{@username}")
-    end
-  end
-end
diff --git a/users/test/integration/navigation_test.rb b/users/test/integration/navigation_test.rb
deleted file mode 100644
index eec8c0e..0000000
--- a/users/test/integration/navigation_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class NavigationTest < ActionDispatch::IntegrationTest
-
-  # test "the truth" do
-  #   assert true
-  # end
-end
-
diff --git a/users/test/leap_web_users_test.rb b/users/test/leap_web_users_test.rb
deleted file mode 100644
index f142e54..0000000
--- a/users/test/leap_web_users_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class LeapWebUsersTest < ActiveSupport::TestCase
-  test "module exists" do
-    assert_kind_of Module, LeapWebUsers
-  end
-end
diff --git a/users/test/support/auth_test_helper.rb b/users/test/support/auth_test_helper.rb
deleted file mode 100644
index 57f9f9b..0000000
--- a/users/test/support/auth_test_helper.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-module AuthTestHelper
-  extend ActiveSupport::Concern
-
-  # Controller will fetch current user from warden.
-  # Make it pick up our current_user
-  included do
-    setup do
-      request.env['warden'] ||= stub :user => nil
-    end
-  end
-
-  def login(user_or_method_hash = {})
-    if user_or_method_hash.respond_to?(:reverse_merge)
-      user_or_method_hash.reverse_merge! :is_admin? => false
-    end
-    @current_user = stub_record(:user, user_or_method_hash)
-    request.env['warden'] = stub :user => @current_user
-    request.env['HTTP_AUTHORIZATION'] = header_for_token_auth
-    return @current_user
-  end
-
-  def assert_access_denied(denied = true, logged_in = true)
-    if denied
-      if @response.content_type == 'application/json'
-        assert_json_response('error' => I18n.t(:not_authorized))
-        assert_response :unprocessable_entity
-      else
-        if logged_in
-          assert_equal({:alert => I18n.t(:not_authorized)}, flash.to_hash)
-          assert_redirected_to home_url
-        else
-          assert_equal({:alert => I18n.t(:not_authorized_login)}, flash.to_hash)
-          assert_redirected_to login_url
-        end
-      end
-    else
-      assert flash[:alert].blank?
-    end
-  end
-
-  def expect_logout
-    expect_warden_logout
-    @token.expects(:destroy) if @token
-  end
-
-  protected
-
-  def header_for_token_auth
-    @token = find_record(:token, :authenticate => @current_user)
-    ActionController::HttpAuthentication::Token.encode_credentials @token.id
-  end
-
-  def expect_warden_logout
-    raw = mock('raw session') do
-      expects(:inspect)
-    end
-    request.env['warden'].expects(:raw_session).returns(raw)
-    request.env['warden'].expects(:logout)
-  end
-
-end
-
-class ActionController::TestCase
-  include AuthTestHelper
-end
diff --git a/users/test/support/stub_record_helper.rb b/users/test/support/stub_record_helper.rb
deleted file mode 100644
index 25138a0..0000000
--- a/users/test/support/stub_record_helper.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-module StubRecordHelper
-
-  #
-  # We will stub find when called on the records class and
-  # return the record given.
-  #
-  # If no record is given but a hash or nil will create a stub based on
-  # that instead and returns the stub.
-  #
-  def find_record(factory, record_or_attribs_hash = {})
-    record = stub_record factory, record_or_attribs_hash, true
-    klass = record.class
-    # find is just an alias for get with CouchRest Model
-    klass.stubs(:get).with(record.to_param.to_s).returns(record)
-    klass.stubs(:find).with(record.to_param.to_s).returns(record)
-    return record
-  end
-
-  # Create a stub that has the usual functions of a database record.
-  # It won't fail on rendering a form for example.
-  #
-  # If the second parameter is a record we return the record itself.
-  # This way you can build functions that either take a record or a
-  # method hash to stub from. See find_record for an example.
-  def stub_record(factory, record_or_method_hash = {}, persisted=false)
-    if record_or_method_hash && !record_or_method_hash.is_a?(Hash)
-      return record_or_method_hash
-    end
-    FactoryGirl.build_stubbed(factory).tap do |record|
-      if persisted or record.persisted?
-        record_or_method_hash.reverse_merge! :created_at => Time.now,
-          :updated_at => Time.now, :id => Random.rand(100000).to_s
-      end
-      record.stubs(record_or_method_hash) if record_or_method_hash.present?
-    end
-  end
-
-  # returns deep stringified attributes so they can be compared to
-  # what the controller receives as params
-  def record_attributes_for(factory, attribs_hash = nil)
-    FactoryGirl.attributes_for(factory, attribs_hash).tap do |attribs|
-      attribs.keys.each do |key|
-        val = attribs.delete(key)
-        attribs[key.to_s] = val.is_a?(Hash) ? val.stringify_keys! : val
-      end
-    end
-  end
-
-end
-
-class ActionController::TestCase
-  include StubRecordHelper
-end
diff --git a/users/test/support/time_test_helper.rb b/users/test/support/time_test_helper.rb
deleted file mode 100644
index f673f12..0000000
--- a/users/test/support/time_test_helper.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# Extend the Time class so that we can offset the time that 'now'
-# returns.  This should allow us to effectively time warp for functional
-# tests that require limits per hour, what not.
-class Time #:nodoc:
-  class <<self
-    attr_accessor :testing_offset
-
-    def now_with_testing_offset
-      now_without_testing_offset - testing_offset
-    end
-    alias_method_chain :now, :testing_offset
-  end
-end
-Time.testing_offset = 0
-
-module TimeTestHelper
-  # Time warp to the specified time for the duration of the passed block
-  def pretend_now_is(time)
-    begin
-      Time.testing_offset = Time.now - time
-      yield
-    ensure
-      Time.testing_offset = 0
-    end
-  end
-end
-
-class ActiveSupport::TestCase
-  include TimeTestHelper
-end
diff --git a/users/test/test_helper.rb b/users/test/test_helper.rb
deleted file mode 100644
index 52dff53..0000000
--- a/users/test/test_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../../test/dummy/config/environment', __FILE__)
-require 'rails/test_help'
-require 'mocha/setup'
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
diff --git a/users/test/unit/.gitkeep b/users/test/unit/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/users/test/unit/account_test.rb b/users/test/unit/account_test.rb
deleted file mode 100644
index 4fb3c3d..0000000
--- a/users/test/unit/account_test.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'test_helper'
-
-class AccountTest < ActiveSupport::TestCase
-
-  teardown do
-    Identity.destroy_all_disabled
-  end
-
-  test "create a new account" do
-    user = Account.create(FactoryGirl.attributes_for(:user))
-    assert user.valid?
-    assert user.persisted?
-    assert id = user.identity
-    assert_equal user.email_address, id.address
-    assert_equal user.email_address, id.destination
-    user.account.destroy
-  end
-
-  test "create and remove a user account" do
-    # We keep an identity that will block the handle from being reused.
-    assert_difference "Identity.count" do
-      assert_no_difference "User.count" do
-        user = Account.create(FactoryGirl.attributes_for(:user))
-        user.account.destroy
-      end
-    end
-  end
-
-  test "change username and create alias" do
-    user = Account.create(FactoryGirl.attributes_for(:user))
-    old_id = user.identity
-    old_email = user.email_address
-    user.account.update(FactoryGirl.attributes_for(:user))
-    user.reload
-    old_id.reload
-    assert user.valid?
-    assert user.persisted?
-    assert id = user.identity
-    assert id.persisted?
-    assert_equal user.email_address, id.address
-    assert_equal user.email_address, id.destination
-    assert_equal user.email_address, old_id.destination
-    assert_equal old_email, old_id.address
-    user.account.destroy
-  end
-
-end
diff --git a/users/test/unit/email_test.rb b/users/test/unit/email_test.rb
deleted file mode 100644
index 7cfbc84..0000000
--- a/users/test/unit/email_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'test_helper'
-
-class EmailTest < ActiveSupport::TestCase
-
-  test "valid format" do
-    email = Email.new(email_string)
-    assert email.valid?
-  end
-
-  test "validates format" do
-    email = Email.new("email")
-    assert !email.valid?
-    assert_equal ["needs to be a valid email address"], email.errors[:email]
-  end
-
-  def email_string
-    @email_string ||= Faker::Internet.email
-  end
-end
diff --git a/users/test/unit/helpers/session_helper_test.rb b/users/test/unit/helpers/session_helper_test.rb
deleted file mode 100644
index 2824733..0000000
--- a/users/test/unit/helpers/session_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class SessionHelperTest < ActionView::TestCase
-end
diff --git a/users/test/unit/helpers/users_helper_test.rb b/users/test/unit/helpers/users_helper_test.rb
deleted file mode 100644
index 96af37a..0000000
--- a/users/test/unit/helpers/users_helper_test.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class UsersHelperTest < ActionView::TestCase
-end
diff --git a/users/test/unit/identity_test.rb b/users/test/unit/identity_test.rb
deleted file mode 100644
index eca104f..0000000
--- a/users/test/unit/identity_test.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-require 'test_helper'
-
-class IdentityTest < ActiveSupport::TestCase
-  include StubRecordHelper
-
-  setup do
-    @user = find_record :user
-  end
-
-  test "initial identity for a user" do
-    id = Identity.for(@user)
-    assert_equal @user.email_address, id.address
-    assert_equal @user.email_address, id.destination
-    assert_equal @user, id.user
-  end
-
-  test "add alias" do
-    id = Identity.for @user, address: alias_name
-    assert_equal LocalEmail.new(alias_name), id.address
-    assert_equal @user.email_address, id.destination
-    assert_equal @user, id.user
-  end
-
-  test "add forward" do
-    id = Identity.for @user, destination: forward_address
-    assert_equal @user.email_address, id.address
-    assert_equal Email.new(forward_address), id.destination
-    assert_equal @user, id.user
-  end
-
-  test "forward alias" do
-    id = Identity.for @user, address: alias_name, destination: forward_address
-    assert_equal LocalEmail.new(alias_name), id.address
-    assert_equal Email.new(forward_address), id.destination
-    assert_equal @user, id.user
-  end
-
-  test "prevents duplicates" do
-    id = Identity.create_for @user, address: alias_name, destination: forward_address
-    dup = Identity.build_for @user, address: alias_name, destination: forward_address
-    assert !dup.valid?
-    assert_equal ["This alias already exists"], dup.errors[:base]
-    id.destroy
-  end
-
-  test "validates availability" do
-    other_user = find_record :user
-    id = Identity.create_for @user, address: alias_name, destination: forward_address
-    taken = Identity.build_for other_user, address: alias_name
-    assert !taken.valid?
-    assert_equal ["This email has already been taken"], taken.errors[:base]
-    id.destroy
-  end
-
-  test "setting and getting pgp key" do
-    id = Identity.for(@user)
-    id.set_key(:pgp, pgp_key_string)
-    assert_equal pgp_key_string, id.keys[:pgp]
-  end
-
-  test "querying pgp key via couch" do
-    id = Identity.for(@user)
-    id.set_key(:pgp, pgp_key_string)
-    id.save
-    view = Identity.pgp_key_by_email.key(id.address)
-    assert_equal 1, view.rows.count
-    assert result = view.rows.first
-    assert_equal id.address, result["key"]
-    assert_equal id.keys[:pgp], result["value"]
-    id.destroy
-  end
-
-  test "fail to add non-local email address as identity address" do
-    id = Identity.for @user, address: forward_address
-    assert !id.valid?
-    assert_match /needs to end in/, id.errors[:address].first
-  end
-
-  test "alias must meet same conditions as login" do
-    id = Identity.create_for @user, address: alias_name.capitalize
-    assert !id.valid?
-    #hacky way to do this, but okay for now:
-    assert id.errors.messages.flatten(2).include? "Must begin with a lowercase letter"
-    assert id.errors.messages.flatten(2).include? "Only lowercase letters, digits, . - and _ allowed."
-  end
-
-  test "destination must be valid email address" do
-    id = Identity.create_for @user, address: @user.email_address, destination: 'ASKJDLFJD'
-    assert !id.valid?
-    assert id.errors.messages[:destination].include? "needs to be a valid email address"
-  end
-
-  test "disabled identity" do
-    id = Identity.for(@user)
-    id.disable
-    assert_equal @user.email_address, id.address
-    assert_equal nil, id.destination
-    assert_equal nil, id.user
-    assert !id.enabled?
-    assert id.valid?
-  end
-
-  test "disabled identity blocks handle" do
-    id = Identity.for(@user)
-    id.disable
-    id.save
-    other_user = find_record :user
-    taken = Identity.build_for other_user, address: id.address
-    assert !taken.valid?
-    Identity.destroy_all_disabled
-  end
-
-  test "destroy all disabled identities" do
-    id = Identity.for(@user)
-    id.disable
-    id.save
-    assert Identity.count > 0
-    Identity.destroy_all_disabled
-    assert_equal 0, Identity.disabled.count
-  end
-
-  def alias_name
-    @alias_name ||= Faker::Internet.user_name
-  end
-
-  def forward_address
-    @forward_address ||= Faker::Internet.email
-  end
-
-  def pgp_key_string
-    @pgp_key ||= "DUMMY PGP KEY ... "+SecureRandom.base64(4096)
-  end
-end
diff --git a/users/test/unit/local_email_test.rb b/users/test/unit/local_email_test.rb
deleted file mode 100644
index 20ee7f1..0000000
--- a/users/test/unit/local_email_test.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'test_helper'
-
-class LocalEmailTest < ActiveSupport::TestCase
-
-  test "appends domain" do
-    local = LocalEmail.new(handle)
-    assert_equal LocalEmail.new(email), local
-    assert local.valid?
-  end
-
-  test "returns handle" do
-    local = LocalEmail.new(email)
-    assert_equal handle, local.handle
-  end
-
-  test "prints full email" do
-    local = LocalEmail.new(handle)
-    assert_equal email, "#{local}"
-  end
-
-  test "validates domain" do
-    local = LocalEmail.new(Faker::Internet.email)
-    assert !local.valid?
-    assert_equal ["needs to end in @#{LocalEmail.domain}"], local.errors[:email]
-  end
-
-  test "blacklists rfc2142" do
-    black_listed = LocalEmail.new('hostmaster')
-    assert !black_listed.valid?
-  end
-
-  test "blacklists etc passwd" do
-    black_listed = LocalEmail.new('nobody')
-    assert !black_listed.valid?
-  end
-
-  test "whitelist overwrites automatic blacklists" do
-    with_config handle_whitelist: ['nobody', 'hostmaster'] do
-      white_listed = LocalEmail.new('nobody')
-      assert white_listed.valid?
-      white_listed = LocalEmail.new('hostmaster')
-      assert white_listed.valid?
-    end
-  end
-
-  test "blacklists from config" do
-    black_listed = LocalEmail.new('www-data')
-    assert !black_listed.valid?
-  end
-
-  test "blacklist from config overwrites whitelist" do
-    with_config handle_whitelist: ['www-data'] do
-      black_listed = LocalEmail.new('www-data')
-      assert !black_listed.valid?
-    end
-  end
-
-  def handle
-    @handle ||= Faker::Internet.user_name
-  end
-
-  def email
-    handle + "@" + APP_CONFIG[:domain]
-  end
-end
diff --git a/users/test/unit/token_test.rb b/users/test/unit/token_test.rb
deleted file mode 100644
index a3c6cf6..0000000
--- a/users/test/unit/token_test.rb
+++ /dev/null
@@ -1,89 +0,0 @@
-require 'test_helper'
-
-class ClientCertificateTest < ActiveSupport::TestCase
-  include StubRecordHelper
-
-  setup do
-    @user = find_record :user
-  end
-
-  test "new token for user" do
-    sample = Token.new(:user_id => @user.id)
-    assert sample.valid?
-    assert_equal @user.id, sample.user_id
-    assert_equal @user, sample.authenticate
-  end
-
-  test "token id is secure" do
-    sample = Token.new(:user_id => @user.id)
-    other = Token.new(:user_id => @user.id)
-    assert sample.id,
-      "id is set on initialization"
-    assert sample.id[0..10] != other.id[0..10],
-      "token id prefixes should not repeat"
-    assert /[g-zG-Z]/.match(sample.id),
-      "should use non hex chars in the token id"
-    assert sample.id.size > 16,
-      "token id should be more than 16 chars long"
-  end
-
-  test "token checks for user" do
-    sample = Token.new
-    assert !sample.valid?, "Token should require a user record"
-  end
-
-  test "token updates timestamps" do
-    sample = Token.new(user_id: @user.id)
-    sample.last_seen_at = 1.minute.ago
-    sample.expects(:save)
-    assert_equal @user, sample.authenticate
-    assert Time.now - sample.last_seen_at < 1.minute, "last_seen_at has not been updated"
-  end
-
-  test "token will not expire if token_expires_after is not set" do
-    sample = Token.new(user_id: @user.id)
-    sample.last_seen_at = 2.years.ago
-    with_config auth: {} do
-      sample.expects(:save)
-      assert_equal @user, sample.authenticate
-    end
-  end
-
-  test "expired token returns nil on authenticate" do
-    sample = Token.new(user_id: @user.id)
-    sample.last_seen_at = 2.hours.ago
-    with_config auth: {token_expires_after: 60} do
-      sample.expects(:destroy)
-      assert_nil sample.authenticate
-    end
-  end
-
-  test "Token.destroy_all_expired is noop if no expiry is set" do
-    expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago
-    with_config auth: {} do
-      Token.destroy_all_expired
-    end
-    assert_equal expired, Token.find(expired.id)
-  end
-
-  test "Token.destroy_all_expired cleans up expired tokens only" do
-    expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago
-    fresh = FactoryGirl.create :token
-    with_config auth: {token_expires_after: 60} do
-      Token.destroy_all_expired
-    end
-    assert_nil Token.find(expired.id)
-    assert_equal fresh, Token.find(fresh.id)
-    fresh.destroy
-  end
-
-
-  test "Token.destroy_all_expired does not interfere with expired.authenticate" do
-    expired = FactoryGirl.create :token, last_seen_at: 2.hours.ago
-    with_config auth: {token_expires_after: 60} do
-      Token.destroy_all_expired
-    end
-    assert_nil expired.authenticate
-  end
-
-end
diff --git a/users/test/unit/unauthenticated_user_test.rb b/users/test/unit/unauthenticated_user_test.rb
deleted file mode 100644
index e5fafb8..0000000
--- a/users/test/unit/unauthenticated_user_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class UnauthenticatedUserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
deleted file mode 100644
index ffbb7d8..0000000
--- a/users/test/unit/user_test.rb
+++ /dev/null
@@ -1,68 +0,0 @@
-require 'test_helper'
-
-class UserTest < ActiveSupport::TestCase
-
-  include SRP::Util
-  setup do
-    @user = FactoryGirl.build(:user)
-  end
-
-  test "design docs in database are authorative" do
-    assert !User.design_doc.auto_update,
-      "Automatic update of design docs should be disabled"
-  end
-
-  test "test set of attributes should be valid" do
-    @user.valid?
-    assert_equal Hash.new, @user.errors.messages
-  end
-
-  test "test require hex for password_verifier" do
-    @user.password_verifier = "QWER"
-    assert !@user.valid?
-  end
-
-  test "test require alphanumerical for login" do
-    @user.login = "qw#r"
-    assert !@user.valid?
-  end
-
-  test "verifier returns number for the hex in password_verifier" do
-    assert_equal @user.password_verifier.hex, @user.verifier
-  end
-
-  test "salt returns number for the hex in password_salt" do
-    assert_equal @user.password_salt.hex, @user.salt
-  end
-
-  test 'normal user is no admin' do
-    assert !@user.is_admin?
-  end
-
-  test 'user with login in APP_CONFIG is an admin' do
-    admin_login = APP_CONFIG['admins'].first
-    @user.login = admin_login
-    assert @user.is_admin?
-  end
-
-  test "login needs to be unique" do
-    other_user = FactoryGirl.create :user, login: @user.login
-    assert !@user.valid?
-    other_user.destroy
-  end
-
-  test "login needs to be unique amongst aliases" do
-    other_user = FactoryGirl.create :user
-    id = Identity.create_for other_user, address: @user.login
-    assert !@user.valid?
-    id.destroy
-    other_user.destroy
-  end
-
-  test "deprecated public key api still works" do
-    key = SecureRandom.base64(4096)
-    @user.public_key = key
-    assert_equal key, @user.public_key
-  end
-
-end
diff --git a/users/test/unit/warden_strategy_secure_remote_password_test.rb b/users/test/unit/warden_strategy_secure_remote_password_test.rb
deleted file mode 100644
index e6fcfbe..0000000
--- a/users/test/unit/warden_strategy_secure_remote_password_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-class WardenStrategySecureRemotePasswordTest < ActiveSupport::TestCase
-
-# TODO : turn this into sth. real
-=begin
-  setup do
-    @user = stub :login => "me", :id => 123
-    @client_hex = 'a123'
-    @client_rnd = @client_hex.hex
-    @server_hex = 'b123'
-    @server_rnd = @server_hex.hex
-    @server_rnd_exp = 'e123'.hex
-    @salt = 'stub user salt'
-    @server_handshake = stub :aa => @client_rnd, :bb => @server_rnd, :b => @server_rnd_exp
-    @server_auth = 'adfe'
-  end
-
-
-  test "should perform handshake" do
-    @user.expects(:initialize_auth).
-      with(@client_rnd).
-      returns(@server_handshake)
-    @server_handshake.expects(:to_json).
-     returns({'B' => @server_hex, 'salt' => @salt}.to_json)
-    User.expects(:find).with(@user.login).returns(@user)
-    assert_equal @server_handshake, session[:handshake]
-    assert_response :success
-    assert_json_response :B => @server_hex, :salt => @salt
-  end
-
-  test "should report user not found" do
-    unknown = "login_that_does_not_exist"
-    User.expects(:find).with(unknown).raises(RECORD_NOT_FOUND)
-    post :create, :login => unknown
-    assert_response :success
-    assert_json_error "login" => ["unknown user"]
-  end
-
-  test "should authorize" do
-    session[:handshake] = @server_handshake
-    @server_handshake.expects(:authenticate!).
-      with(@client_rnd).
-      returns(@user)
-    @server_handshake.expects(:to_json).
-      returns({:M2 => @server_auth}.to_json)
-    post :update, :id => @user.login, :client_auth => @client_hex
-    assert_nil session[:handshake]
-    assert_json_response :M2 => @server_auth
-    assert_equal @user.id, session[:user_id]
-  end
-
-  test "should report wrong password" do
-    session[:handshake] = @server_handshake
-    @server_handshake.expects(:authenticate!).
-      with(@client_rnd).
-      raises(WRONG_PASSWORD)
-    post :update, :id => @user.login, :client_auth => @client_hex
-    assert_nil session[:handshake]
-    assert_nil session[:user_id]
-    assert_json_error "password" => ["wrong password"]
-  end
-
-=end
-end
diff --git a/users/test/unit/webfinger/host_meta_presenter_test.rb b/users/test/unit/webfinger/host_meta_presenter_test.rb
deleted file mode 100644
index af86404..0000000
--- a/users/test/unit/webfinger/host_meta_presenter_test.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'test_helper'
-require 'webfinger'
-require 'json'
-
-class Webfinger::HostMetaPresenterTest < ActiveSupport::TestCase
-
-  setup do
-    @request = stub(
-      url: "https://#{APP_CONFIG[:domain]}/.well-known/host-meta"
-    )
-    @meta = Webfinger::HostMetaPresenter.new(@request)
-  end
-
-  test "creates proper json" do
-    hash = JSON.parse @meta.to_json
-    assert_equal ["subject", "links"].sort, hash.keys.sort
-    hash.each do |key, value|
-      assert_equal @meta.send(key.to_sym).to_json, value.to_json
-    end
-  end
-
-end
-
-
diff --git a/users/test/unit/webfinger/user_presenter_test.rb b/users/test/unit/webfinger/user_presenter_test.rb
deleted file mode 100644
index 04aeb22..0000000
--- a/users/test/unit/webfinger/user_presenter_test.rb
+++ /dev/null
@@ -1,49 +0,0 @@
-require 'test_helper'
-require 'webfinger'
-require 'json'
-
-class Webfinger::UserPresenterTest < ActiveSupport::TestCase
-
-
-  setup do
-    @user = stub(
-      username: 'testuser',
-      email_address: "testuser@#{APP_CONFIG[:domain]}"
-    )
-    @request = stub(
-      host: APP_CONFIG[:domain]
-    )
-  end
-
-  test "user without key has no links" do
-    @user.stubs :public_key => nil
-    presenter = Webfinger::UserPresenter.new(@user, @request)
-    assert_equal Hash.new, presenter.links
-  end
-
-  test "user with key has corresponding link" do
-    @user.stubs :public_key => "here's a key"
-    presenter = Webfinger::UserPresenter.new(@user, @request)
-    assert_equal [:public_key], presenter.links.keys
-    assert_equal "PGP", presenter.links[:public_key][:type]
-    assert_equal presenter.send(:key), presenter.links[:public_key][:href]
-  end
-
-  test "key is base64 encoded" do
-    @user.stubs :public_key => "here's a key"
-    presenter = Webfinger::UserPresenter.new(@user, @request)
-    assert_equal Base64.encode64(@user.public_key), presenter.send(:key)
-  end
-
-  test "creates proper json representation" do
-    @user.stubs :public_key => "here's a key"
-    presenter = Webfinger::UserPresenter.new(@user, @request)
-    hash = JSON.parse presenter.to_json
-    assert_equal ["subject", "links"].sort, hash.keys.sort
-    hash.each do |key, value|
-      assert_equal presenter.send(key.to_sym).to_json, value.to_json
-    end
-  end
-
-
-end
-- 
cgit v1.2.3


From 9776dd10fc60efde38946588d0955c406f6c1f5e Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 8 Apr 2014 14:22:56 +0200
Subject: move users: config and lib

---
 .../config/initializers/add_controller_methods.rb  |  4 --
 users/config/initializers/error_constants.rb       |  1 -
 users/config/initializers/warden.rb                |  7 --
 users/config/locales/en.yml                        | 73 -------------------
 users/config/routes.rb                             | 29 --------
 users/lib/leap_web_users.rb                        |  4 --
 users/lib/leap_web_users/engine.rb                 | 14 ----
 users/lib/tasks/leap_web_users_tasks.rake          | 10 ---
 users/lib/warden/session_serializer.rb             | 13 ----
 .../warden/strategies/secure_remote_password.rb    | 81 ----------------------
 users/lib/webfinger.rb                             |  6 --
 users/lib/webfinger/host_meta_presenter.rb         | 30 --------
 users/lib/webfinger/user_presenter.rb              | 35 ----------
 users/script/rails                                 |  8 ---
 14 files changed, 315 deletions(-)
 delete mode 100644 users/config/initializers/add_controller_methods.rb
 delete mode 100644 users/config/initializers/error_constants.rb
 delete mode 100644 users/config/initializers/warden.rb
 delete mode 100644 users/config/locales/en.yml
 delete mode 100644 users/config/routes.rb
 delete mode 100644 users/lib/leap_web_users.rb
 delete mode 100644 users/lib/leap_web_users/engine.rb
 delete mode 100644 users/lib/tasks/leap_web_users_tasks.rake
 delete mode 100644 users/lib/warden/session_serializer.rb
 delete mode 100644 users/lib/warden/strategies/secure_remote_password.rb
 delete mode 100644 users/lib/webfinger.rb
 delete mode 100644 users/lib/webfinger/host_meta_presenter.rb
 delete mode 100644 users/lib/webfinger/user_presenter.rb
 delete mode 100755 users/script/rails

(limited to 'users')

diff --git a/users/config/initializers/add_controller_methods.rb b/users/config/initializers/add_controller_methods.rb
deleted file mode 100644
index f572ecb..0000000
--- a/users/config/initializers/add_controller_methods.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-ActiveSupport.on_load(:application_controller) do
-  include ControllerExtension::Authentication
-  include ControllerExtension::TokenAuthentication
-end
diff --git a/users/config/initializers/error_constants.rb b/users/config/initializers/error_constants.rb
deleted file mode 100644
index d4a0f52..0000000
--- a/users/config/initializers/error_constants.rb
+++ /dev/null
@@ -1 +0,0 @@
-WRONG_PASSWORD = SRP::WrongPassword
diff --git a/users/config/initializers/warden.rb b/users/config/initializers/warden.rb
deleted file mode 100644
index 45feb6c..0000000
--- a/users/config/initializers/warden.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-Rails.configuration.middleware.use RailsWarden::Manager do |config|
-  config.default_strategies :secure_remote_password
-  config.failure_app = SessionsController
-end
-
-RailsWarden.unauthenticated_action = :new
-
diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml
deleted file mode 100644
index ed6653a..0000000
--- a/users/config/locales/en.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-en:
-  account_settings: "Account Settings"
-  logout: "Logout"
-  none: "None"
-  signup: "Sign Up"
-  signup_message: "Please create an account."
-  cancel: "Cancel"
-  login: "Log In"
-  username: "Username"
-  password: "Password"
-  change_password: "Change Password"
-  login_message: "Please log in with your account."
-  invalid_user_pass: "Not a valid username/password combination"
-  invalid_ephemeral: "Invalid random key used. This looked like an attempt to hack the site to us. If it wasn't please contact support so we can look into the issue."
-  all_strategies_failed: "Could not understand your login attempt. Please first send your login and a SRP ephemeral value A and then send the client_auth in the same session (using cookies)."
-  update_login_and_password: "Update Login and Password"
-  destroy_my_account: "Destroy my account"
-  destroy_account_info: "This will permanently destroy your account and all the data associated with it. Proceed with caution!"
-  admin_destroy_account: "Destroy the account %{username}"
-  account_destroyed: "The account has been destroyed successfully."
-  set_email_address: "Set email address"
-  forward_email: "Forward Email"
-  email_aliases: "Email Aliases"
-  public_key: "Public Key"
-  add_email_alias: "Add Email Alias"
-  user_updated_successfully: "Settings have been updated successfully."
-  user_created_successfully: "Successfully created your account."
-  email_alias_destroyed_successfully: "Removed email alias %{alias}."
-  use_ascii_key: "OpenPGP public key. Do not change this value unless you know what you are doing."
-  advanced_options: "Advanced Options"
-  not_authorized: "Sorry, but you are not authorized to perform that action."
-  not_authorized_login: "Please log in to perform that action."
-  search: "Search"
-  cookie_disabled_warning: "You have cookies disabled. You will not be able to login until you enable cookies."
-  js_required_html: "We are sorry, but this doesn't work without javascript enabled. This is because the authentication system used, <a href='http://srp.stanford.edu/'>SRP</a>, requires javascript."
-  enable_account: "Enable the account %{username}"
-  enable_description: "This will restore the account to full functionality"
-  deactivate_account: "Deactivate the account %{username}"
-  deactivate_description: "This will temporarily deactivate some account functionality." #todo detail exact functionality. can receive email but not send or renew client certificate?
-  payment_one_month_warning: "We hope you have been enjoying this service this past month. Please sign up to pay within the next month, by %{date_in_one_month}. Directions for payment are available at INSERT_URL"
-  bye: "Goodbye!"
-  bye_message: "So long and thanks for all the fish."
-
-  #
-  # overview
-  #
-  overview_welcome: "Welcome %{username}."
-  overview_intro: "From this user control panel, you can:"
-  overview_tickets: "Create and check support tickets."
-  overview_email: "Modify email settings."
-  overview_account: "Delete your account."
-
-  #
-  # rails
-  #
-  activemodel:
-    models:
-      user:
-        one: User
-        other: "%{count} Users"
-  simple_form:
-    labels:
-      user:
-        email_forward: "Email Forward"
-    hints:
-      user:
-        email_forward: >
-          Forward all email messages to this address. Messages will be encrypted before being forwarded.
-          This is an option for advanced users who are familar with OpenPGP.
-    placeholders:
-      user:
-        email_forward: "my_other_email@domain.net"
-
diff --git a/users/config/routes.rb b/users/config/routes.rb
deleted file mode 100644
index 2819fa9..0000000
--- a/users/config/routes.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-Rails.application.routes.draw do
-
-  namespace "api", { module: "v1",
-      path: "/1/",
-      defaults: {format: 'json'} } do
-    resources :sessions, :only => [:new, :create, :update]
-    delete "logout" => "sessions#destroy", :as => "logout"
-    resources :users, :only => [:create, :update, :destroy, :index]
-    resources :messages, :only => [:index, :update]
-  end
-
-  scope "(:locale)", :locale => MATCH_LOCALE do
-    get "login" => "sessions#new", :as => "login"
-    delete "logout" => "sessions#destroy", :as => "logout"
-
-    get "signup" => "users#new", :as => "signup"
-    resources :users, :except => [:create, :update] do
-      # resource :email_settings, :only => [:edit, :update]
-      # resources :email_aliases, :only => [:destroy], :id => /.*/
-      post 'deactivate', on: :member
-      post 'enable', on: :member
-    end
-  end
-
-  get "/.well-known/host-meta" => 'webfinger#host_meta'
-  get "/webfinger" => 'webfinger#search'
-  get "/key/:login" => 'keys#show'
-
-end
diff --git a/users/lib/leap_web_users.rb b/users/lib/leap_web_users.rb
deleted file mode 100644
index e1b7b1f..0000000
--- a/users/lib/leap_web_users.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require "leap_web_users/engine"
-
-module LeapWebUsers
-end
diff --git a/users/lib/leap_web_users/engine.rb b/users/lib/leap_web_users/engine.rb
deleted file mode 100644
index a2be168..0000000
--- a/users/lib/leap_web_users/engine.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# thou shall require all your dependencies in an engine.
-require "rails_warden"
-require "ruby-srp"
-
-require "warden/session_serializer"
-require "warden/strategies/secure_remote_password"
-
-require "webfinger"
-
-module LeapWebUsers
-  class Engine < ::Rails::Engine
-
-  end
-end
diff --git a/users/lib/tasks/leap_web_users_tasks.rake b/users/lib/tasks/leap_web_users_tasks.rake
deleted file mode 100644
index 62bcbe9..0000000
--- a/users/lib/tasks/leap_web_users_tasks.rake
+++ /dev/null
@@ -1,10 +0,0 @@
-# desc "Explaining what the task does"
-# task :leap_web_users do
-#   # Task goes here
-# end
-
-# recommended that for our setup, we should have this triggered from a cron job in puppet rather than using whenever gem
-desc "Send one month warning messages"
-task :leap_web_users do
-  User.send_one_month_warnings
-end
diff --git a/users/lib/warden/session_serializer.rb b/users/lib/warden/session_serializer.rb
deleted file mode 100644
index 81d7076..0000000
--- a/users/lib/warden/session_serializer.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Warden
-  # Setup Session Serialization
-  class SessionSerializer
-    def serialize(record)
-      [record.class.name, record.id]
-    end
-
-    def deserialize(keys)
-      klass, id = keys
-      klass.constantize.find(id)
-    end
-  end
-end
diff --git a/users/lib/warden/strategies/secure_remote_password.rb b/users/lib/warden/strategies/secure_remote_password.rb
deleted file mode 100644
index 2c334c6..0000000
--- a/users/lib/warden/strategies/secure_remote_password.rb
+++ /dev/null
@@ -1,81 +0,0 @@
-module Warden
-  module Strategies
-    class SecureRemotePassword < Warden::Strategies::Base
-
-      def valid?
-        handshake? || authentication?
-      end
-
-      def authenticate!
-        if authentication?
-          validate!
-        else  # handshake
-          initialize!
-        end
-      end
-
-      protected
-
-      def handshake?
-        params['A'] && params['login']
-      end
-
-      def authentication?
-        params['client_auth'] && session[:handshake]
-      end
-
-      def validate!
-        if client = validate
-          success!(User.find_by_login(client.username))
-        else
-          Rails.logger.warn "Login attempt failed."
-          Rails.logger.debug debug_info
-          Rails.logger.debug "Received: #{params['client_auth']}"
-          session.delete(:handshake)
-          fail!(:base => "invalid_user_pass")
-        end
-      end
-
-      def validate
-        session[:handshake].authenticate(params['client_auth'])
-      end
-
-      def initialize!
-        if user = User.find_by_login(id)
-          client = SRP::Client.new user.username,
-            :verifier => user.verifier,
-            :salt => user.salt
-          session[:handshake] = SRP::Session.new(client, params['A'])
-          custom! json_response(session[:handshake])
-        else
-          fail! :base => 'invalid_user_pass'
-        end
-      rescue SRP::InvalidEphemeral
-        fail!(:base => "invalid_ephemeral")
-      end
-
-      def json_response(object)
-        [ 200,
-          {"Content-Type" => "application/json; charset=utf-8"},
-          [object.to_json]
-        ]
-      end
-
-      def id
-        params["id"] || params["login"]
-      end
-
-      protected
-
-      def debug_info
-        JSON.pretty_generate(session[:handshake].internal_state)
-      end
-
-    end
-  end
-  Warden::Strategies.add :secure_remote_password,
-    Warden::Strategies::SecureRemotePassword
-
-end
-
-
diff --git a/users/lib/webfinger.rb b/users/lib/webfinger.rb
deleted file mode 100644
index dd49b41..0000000
--- a/users/lib/webfinger.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Webfinger
-
-  autoload :HostMetaPresenter, 'webfinger/host_meta_presenter'
-  autoload :UserPresenter, 'webfinger/user_presenter'
-
-end
diff --git a/users/lib/webfinger/host_meta_presenter.rb b/users/lib/webfinger/host_meta_presenter.rb
deleted file mode 100644
index 84ab7a9..0000000
--- a/users/lib/webfinger/host_meta_presenter.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'uri'
-
-class Webfinger::HostMetaPresenter
-  def initialize(request)
-    @request = request
-  end
-
-  def to_json(options = {})
-    {
-      subject: subject,
-      links: links
-    }.to_json(options)
-  end
-
-  def subject
-    url = URI.parse(@request.url)
-    url.path = ''
-    url.to_s
-  end
-
-  def links
-    { lrdd: { type: 'application/xrd+xml', template: webfinger_template } }
-  end
-
-  protected
-
-  def webfinger_template(path = 'webfinger', query_param='q')
-    "#{subject}/#{path}?#{query_param}={uri}"
-  end
-end
diff --git a/users/lib/webfinger/user_presenter.rb b/users/lib/webfinger/user_presenter.rb
deleted file mode 100644
index 329f477..0000000
--- a/users/lib/webfinger/user_presenter.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-class Webfinger::UserPresenter
-  include Rails.application.routes.url_helpers
-  attr_accessor :user
-
-  def initialize(user, request)
-    @user = user
-    @request = request
-  end
-
-  def to_json(options = {})
-    {
-      subject: subject,
-      links:   links
-    }.to_json(options)
-  end
-
-  def subject
-    "acct:#{@user.email_address}"
-  end
-
-  def links
-    links = {}
-    links[:public_key] = { type: 'PGP', href: key } if key
-    return links
-  end
-
-  protected
-
-  def key
-    if @user.public_key.present?
-      Base64.encode64(@user.public_key.to_s)
-    end
-  end
-
-end
diff --git a/users/script/rails b/users/script/rails
deleted file mode 100755
index ee08520..0000000
--- a/users/script/rails
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby1.8
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/leap_web_users/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'
-- 
cgit v1.2.3