From fcd238cb4b2f173f29749e86023fd98bd80ebaaf Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Wed, 16 Apr 2025 18:08:00 +0200 Subject: [PATCH] Fix issues with null appearing for user owned access tokens --- app/models/session_activation.rb | 2 +- app/models/user.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb index af686a0a74..400ab1d146 100644 --- a/app/models/session_activation.rb +++ b/app/models/session_activation.rb @@ -76,7 +76,7 @@ class SessionActivation < ApplicationRecord ) { - application_id: context.client, + application_id: context.client.id, resource_owner_id: context.resource_owner, scopes: context.scopes, expires_in: Doorkeeper::OAuth::Authorization::Token.access_token_expires_in(Doorkeeper.config, context), diff --git a/app/models/user.rb b/app/models/user.rb index 3de3974bef..bff65d1749 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -310,9 +310,9 @@ class User < ApplicationRecord def token_for_app(app) return nil if app.nil? || app.owner != self - context = Doorkeeper::OAuth::Authorization::Token.build_context(app, Doorkeeper::OAuth::AUTHORIZATION_CODE, app.scopes, app.owner) + context = Doorkeeper::OAuth::Authorization::Token.build_context(app, Doorkeeper::OAuth::AUTHORIZATION_CODE, app.scopes, app.owner.id) - Doorkeeper::AccessToken.find_or_create_by(application_id: context.client.id, resource_owner_id: context.resource_owner.id) do |t| + Doorkeeper::AccessToken.find_or_create_by(application_id: context.client.id, resource_owner_id: context.resource_owner) do |t| t.scopes = context.scopes t.expires_in = Doorkeeper::OAuth::Authorization::Token.access_token_expires_in(Doorkeeper.config, context) t.use_refresh_token = Doorkeeper::OAuth::Authorization::Token.refresh_token_enabled?(Doorkeeper.config, context)