From: Tom Hughes Date: Wed, 21 Jul 2021 10:52:10 +0000 (+0100) Subject: Treat association between users and OAuth 2 applications as polymorphic X-Git-Tag: live~1552 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/377f394a7cf968f1937030687fe71a393dea6244 Treat association between users and OAuth 2 applications as polymorphic --- diff --git a/app/models/user.rb b/app/models/user.rb index c02795a4a..cca894a6b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -68,7 +68,7 @@ class User < ApplicationRecord has_many :client_applications has_many :oauth_tokens, -> { order(:authorized_at => :desc).preload(:client_application) }, :class_name => "OauthToken" - has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :foreign_key => :owner_id + has_many :oauth2_applications, :class_name => Doorkeeper.config.application_model.name, :as => :owner has_many :access_grants, :class_name => Doorkeeper.config.access_grant_model.name, :foreign_key => :resource_owner_id has_many :access_tokens, :class_name => Doorkeeper.config.access_token_model.name, :foreign_key => :resource_owner_id