Fix oauth/token

app/Http/Controllers/OAuth/ApiTokenController.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Controllers\OAuth;
+
+use Laravel\Passport\Http\Controllers\AccessTokenController;
+use Laravel\Passport\Token;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+class ApiTokenController extends AccessTokenController
+{
+    public function issueToken(ServerRequestInterface $psrRequest, ResponseInterface $psrResponse): Response
+    {
+        $response = parent::issueToken($psrRequest, $psrResponse);
+
+        $data = json_decode($response->getContent(), true);
+
+        if (isset($data['access_token'])) {
+            $tokenId = $this->getTokenIdFromJwt($data['access_token']);
+
+            if ($tokenId) {
+                $token = Token::find($tokenId);
+
+                if ($token) {
+                    $data['created_at'] = $token->created_at->toIso8601String();
+                }
+            }
+        }
+
+        return response()->json($data, $response->getStatusCode());
+    }
+
+    private function getTokenIdFromJwt(string $jwt): ?string
+    {
+        try {
+            $parts = explode('.', $jwt);
+            if (count($parts) !== 3) {
+                return null;
+            }
+
+            $payload = json_decode(base64_decode(strtr($parts[1], '-_', '+/')), true);
+
+            return $payload['jti'] ?? null;
+        } catch (\Exception $e) {
+            return null;
+        }
+    }
+}

app/Models/OAuthToken.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Models;
+
+use Laravel\Passport\Token as PassportToken;
+
+class OAuthToken extends PassportToken
+{
+    protected $visible = [
+        'id',
+        'user_id',
+        'client_id',
+        'name',
+        'scopes',
+        'revoked',
+        'created_at',
+        'updated_at',
+        'expires_at',
+    ];
+}

app/Providers/AppServiceProvider.php

@@ -6,6 +6,7 @@ use App\Avatar;
 use App\Follower;
 use App\HashtagFollow;
 use App\Like;
+use App\Models\OAuthToken;
 use App\ModLog;
 use App\Notification;
 use App\Observers\AvatarObserver;
@@ -111,6 +112,7 @@ class AppServiceProvider extends ServiceProvider
             return Limit::perDay(50)->by($request->ip());
         });
 
+        Passport::useTokenModel(OAuthToken::class);
         Passport::tokensExpireIn(now()->addDays(config('instance.oauth.token_expiration', 356)));
         Passport::refreshTokensExpireIn(now()->addDays(config('instance.oauth.refresh_expiration', 400)));
         Passport::enableImplicitGrant();

routes/web.php

@@ -54,7 +54,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
         'prefix' => config('passport.path', 'oauth'),
     ], function () {
         Route::post('/token', [
-            'uses' => '\Laravel\Passport\Http\Controllers\AccessTokenController@issueToken',
+            'uses' => '\App\Http\Controllers\OAuth\ApiTokenController@issueToken',
             'as' => 'token',
             'middleware' => 'throttle',
         ]);