Merge pull request #1477 from Sephster/change-user-to-owner

Update additional attribute name

Author: Sephster

.styleci.yml

@@ -9,7 +9,6 @@ enabled:
   - include
   - method_separation
   - native_function_casing
-  - no_blank_lines_between_uses
   - no_duplicate_semicolons
   - no_multiline_whitespace_before_semicolons
   - no_php4_constructor

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Changed additional attribute added from `oauth_user_id` to the more appropriately named `oauth_owner_id` which can encompass either the user ID or client ID (PR #XXX) 
+
 ## [9.2.0] - released 2025-02-15
 ### Added
 - Added a new function to the provided ClientTrait, `supportsGrantType` to allow the auth server to issue the response `unauthorized_client` when applicable (PR #1420)

src/AuthorizationValidators/BearerTokenValidator.php

@@ -130,7 +130,7 @@ public function validateAuthorization(ServerRequestInterface $request): ServerRe
         return $request
             ->withAttribute('oauth_access_token_id', $claims->get('jti'))
             ->withAttribute('oauth_client_id', $claims->get('aud')[0])
-            ->withAttribute('oauth_user_id', $claims->get('sub'))
+            ->withAttribute('oauth_owner_id', $claims->get('sub'))
             ->withAttribute('oauth_scopes', $claims->get('scopes'));
     }
 }

tests/ResponseTypes/BearerResponseTypeTest.php

@@ -154,7 +154,7 @@ public function testDetermineAccessTokenInHeaderValidToken(): void
 
         self::assertEquals('abcdef', $request->getAttribute('oauth_access_token_id'));
         self::assertEquals('clientName', $request->getAttribute('oauth_client_id'));
-        self::assertEquals('123', $request->getAttribute('oauth_user_id'));
+        self::assertEquals('123', $request->getAttribute('oauth_owner_id'));
         self::assertEquals([], $request->getAttribute('oauth_scopes'));
     }