From 63ad3a1590268e0b424c5f84639889d0032698d0 Mon Sep 17 00:00:00 2001 From: Fosco Marotto Date: Sat, 23 Jan 2021 16:33:48 -0500 Subject: [PATCH] [doorkeeper] Attempt to fix oauth connect issues. --- app/controllers/api/base_controller.rb | 1 - config/routes.rb | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 283d8c37..f6e85528 100644 --- a/app/controllers/api/base_controller.rb +++ b/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 diff --git a/config/routes.rb b/config/routes.rb index 1e913d40..44a8163f 100644 --- a/config/routes.rb +++ b/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', @@ -225,9 +228,9 @@ Rails.application.routes.draw do end namespace :chat_conversation_accounts do - # + # end - + resources :chat_conversation_accounts, only: :show do member do post :messenger_block_relationships @@ -365,7 +368,7 @@ Rails.application.routes.draw do resource :removed_accounts, only: [:show, :create, :destroy], controller: 'groups/removed_accounts' resource :password, only: [:create], controller: 'groups/password' resource :join_requests, only: [:show], controller: 'groups/requests' - + post '/join_requests/respond', to: 'groups/requests#respond_to_request' resource :pin, only: [:show, :create], controller: 'groups/pins'