Fix calls to token repository

Author: nolanpro

ProcessMaker/Http/Controllers/Api/UserTokenController.php

@@ -92,7 +92,7 @@ public function index(Request $request, User $user)
             throw new AuthorizationException(__('Not authorized to update this user.'));
         }
 
-        $tokens = $this->tokenRepository->forUser($user->id);
+        $tokens = $this->tokenRepository->forUser($user);
 
         $results = $tokens->load('client')->filter(function ($token) {
             return $token->client->personal_access_client && !$token->revoked;
@@ -202,7 +202,7 @@ public function show(Request $request, User $user, $tokenId)
 
         $token = $this->tokenRepository->findForUser(
             $tokenId,
-            $user->getKey()
+            $user
         );
 
         if (is_null($token)) {
@@ -256,7 +256,7 @@ public function destroy(Request $request, User $user, $tokenId)
 
         $token = $this->tokenRepository->findForUser(
             $tokenId,
-            $user->getKey()
+            $user
         );
 
         if (is_null($token)) {

ProcessMaker/Http/Resources/UserTokenResource.php

@@ -2,8 +2,66 @@
 
 namespace ProcessMaker\Http\Resources;
 
-use Illuminate\Http\Resources\Json\ResourceCollection;
+use Illuminate\Http\Request;
+use Laravel\Passport\PersonalAccessTokenResult;
+use Laravel\Passport\Token;
 
 class UserTokenResource extends ApiResource
 {
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        // Handle PersonalAccessTokenResult (from token creation)
+        if ($this->resource instanceof PersonalAccessTokenResult) {
+            $token = $this->resource->getToken();
+
+            return [
+                'accessToken' => $this->resource->accessToken,
+                'token' => $this->formatTokenModel($token),
+            ];
+        }
+
+        // Handle Token model (from token retrieval)
+        if ($this->resource instanceof Token) {
+            return $this->formatTokenModel($this->resource);
+        }
+
+        // Fallback to parent implementation
+        return parent::toArray($request);
+    }
+
+    /**
+     * Format the token model into the expected array structure.
+     *
+     * @param  Token  $token
+     * @return array
+     */
+    protected function formatTokenModel(Token $token): array
+    {
+        // Ensure scopes is always an array
+        $scopes = $token->scopes;
+        if (is_string($scopes)) {
+            $scopes = json_decode($scopes, true) ?? [];
+        }
+        if (!is_array($scopes)) {
+            $scopes = [];
+        }
+
+        return [
+            'id' => $token->id,
+            'user_id' => $token->user_id,
+            'client_id' => $token->client_id,
+            'name' => $token->name,
+            'scopes' => $scopes,
+            'revoked' => (bool) $token->revoked,
+            'created_at' => $token->created_at ? $token->created_at->toIso8601String() : null,
+            'updated_at' => $token->updated_at ? $token->updated_at->toIso8601String() : null,
+            'expires_at' => $token->expires_at ? $token->expires_at->toIso8601String() : null,
+        ];
+    }
 }

phpunit.xml

@@ -5,6 +5,11 @@
          colors="true"
          testdox="true"
          extensionsDirectory="tests/Extensions"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true"
 >
   <testsuites>
       <testsuite name="Features">