Merge branch 'master' of github.com:thinchat/thin_auth

app/controllers/api/v1/users_controller.rb

@@ -1,12 +1,11 @@
 class Api::V1::UsersController < ApplicationController
+  respond_to :json
 
   def show
-    @user = User.where(id: params[:id].to_s).first
-    if @user
-      render :json => @user.to_json
+    if @user = User.where(id: params[:id].to_s).first
+      respond_with @user
     else
-      render :json => {:error => "user not found"}.to_json, :status => 404
+      render :json => {:error => "User not found."}, :status => :not_found
     end
   end
-
-end
+end

app/models/user.rb

@@ -27,8 +27,4 @@ def self.approved_email?(email)
     domain = email.split('@').last
     ACCEPTED_DOMAINS.include? domain
   end
-
-  def to_json
-    super(:except => :password)
-  end
 end