Merge branch 'master' into develop

2 files changed, 41 insertions, 0 deletions

diff --git a/users/app/controllers/v1/sessions_controller.rb b/users/app/controllers/v1/sessions_controller.rb
new file mode 100644
index 0000000..5b4a13b
--- /dev/null
+++ b/users/app/controllers/v1/sessions_controller.rb
@@ -0,0 +1,28 @@
+module V1
+  class SessionsController < ApplicationController
+
+    skip_before_filter :verify_authenticity_token
+
+    def new
+      @session = Session.new
+      if authentication_errors
+        @errors = authentication_errors
+        render :status => 422
+      end
+    end
+
+    def create
+      authenticate!
+    end
+
+    def update
+      authenticate!
+      render :json => session.delete(:handshake)
+    end
+
+    def destroy
+      logout
+      redirect_to root_path
+    end
+  end
+end
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
new file mode 100644
index 0000000..eda2fad
--- /dev/null
+++ b/users/app/controllers/v1/users_controller.rb
@@ -0,0 +1,13 @@
+module V1
+  class UsersController < ApplicationController
+
+    skip_before_filter :verify_authenticity_token, :only => [:create]
+
+    respond_to :json
+
+    def create
+      @user = User.create(params[:user])
+      respond_with @user
+    end
+  end
+end