[doorkeeper] Attempt to fix oauth connect issues.

app/controllers/api/base_controller.rb

@@ -94,7 +94,6 @@ class Api::BaseController < ApplicationController
   end
 
   def authorize_if_got_token!(*scopes)
-    Doorkeeper::AccessToken.connection.stick_to_master!
     doorkeeper_authorize!(*scopes) if doorkeeper_token
   end
 

config/routes.rb

@@ -16,6 +16,9 @@ Rails.application.routes.draw do
     mount PgHero::Engine, at: 'pghero', as: :pghero
   end
 
+  Doorkeeper::AccessToken.connection.stick_to_master!
+  Doorkeeper::AccessGrant.connection.stick_to_master!
+
   use_doorkeeper do
     controllers authorizations: 'oauth/authorizations',
                 authorized_applications: 'oauth/authorized_applications',