app/controllers/oauth2/users_controller.rb in vidibus-oauth2_server-0.0.3 vs app/controllers/oauth2/users_controller.rb in vidibus-oauth2_server-0.0.4

@@ -1,18 +1,22 @@
 class Oauth2::UsersController < Oauth2Controller
   before_filter :ensure_token!
   before_filter :find_user
 
   def show
-    render :json => @user.attributes.only(*%w[name email uuid])
+    attributes = @user.try!(:oauth_attributes) || @user.attributes.only(*%w[name email uuid])
+    render :json => attributes
   end
 
   protected
 
   def find_user
-    @user = find_user_by_uuid(@access_token.user_id) or render(:nothing => true, :status => :bad_request)
+    @user = User.where(:uuid => @access_token.user_id).first or render(:nothing => true, :status => :bad_request)
   end
 
   def ensure_token!
-    @access_token = Oauth2Token.find!(:token => params[:access_token])
+    unless token = params[:access_token] || params[:oauth_token]
+      raise Vidibus::Oauth2Server::MissingTokenError
+    end
+    @access_token = Oauth2Token.find!(:token => token)
   end
 end