summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
Diffstat (limited to 'users/app')
-rw-r--r--users/app/controllers/email_aliases_controller.rb12
-rw-r--r--users/app/controllers/sessions_controller.rb10
-rw-r--r--users/app/controllers/v1/users_controller.rb1
3 files changed, 1 insertions, 22 deletions
diff --git a/users/app/controllers/email_aliases_controller.rb b/users/app/controllers/email_aliases_controller.rb
deleted file mode 100644
index c90432f..0000000
--- a/users/app/controllers/email_aliases_controller.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class EmailAliasesController < UsersBaseController
- before_filter :fetch_user
-
- def destroy
- @alias = @user.email_aliases.delete(params[:id])
- if @user.save
- flash[:notice] = t(:email_alias_destroyed_successfully, :alias => bold(@alias))
- end
- redirect_to edit_user_email_settings_path(@user) #TODO: this path doesn't exist. will want to add path for identities controller
- end
-
-end
diff --git a/users/app/controllers/sessions_controller.rb b/users/app/controllers/sessions_controller.rb
index d6c455b..0494b51 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/users/app/controllers/sessions_controller.rb
@@ -8,16 +8,6 @@ class SessionsController < ApplicationController
end
end
- def create
- logout if logged_in?
- authenticate!
- end
-
- def update
- authenticate!
- render :json => session.delete(:handshake)
- end
-
def destroy
logout
redirect_to root_path
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index f380c19..4f82572 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -8,6 +8,7 @@ module V1
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)