Improving feed queries, switching API to doorkeeper authentication

2016-03-11 16:47:36 +01:00
parent b919f39b31
commit 447cfef62d
12 changed files with 50 additions and 11 deletions
--- a/app/controllers/api/accounts_controller.rb
+++ b/app/controllers/api/accounts_controller.rb
@ -1,6 +1,6 @@
 class Api::AccountsController < ApiController
  before_action :set_account
-  before_action :authenticate_user!
+  before_action :doorkeeper_authorize!
  respond_to    :json

  def show
--- a/app/controllers/api/follows_controller.rb
+++ b/app/controllers/api/follows_controller.rb
@ -1,5 +1,5 @@
 class Api::FollowsController < ApiController
-  before_action :authenticate_user!
+  before_action :doorkeeper_authorize!
  respond_to    :json

  def create
--- a/app/controllers/api/statuses_controller.rb
+++ b/app/controllers/api/statuses_controller.rb
@ -1,5 +1,5 @@
 class Api::StatusesController < ApiController
-  before_action :authenticate_user!
+  before_action :doorkeeper_authorize!
  respond_to    :json

  def show
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@ -4,7 +4,7 @@ class ApiController < ApplicationController
  protected

  def current_resource_owner
-    User.find(doorkeeper_token.user_id) if doorkeeper_token
+    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
  end

  def current_user