Skip to content

A free open source IT asset/license management system

Added livewire component for persoinal access tokens for admin

snipee062062cb3d7
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 5d31c3a1cc..9a9817d17f 100644
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -1120,30 +1120,13 @@ class SettingsController extends Controller
*/
public function api(): View
{
- $personalAccessTokens = DB::table('oauth_access_tokens')
+ $personalAccessTokenCount = DB::table('oauth_access_tokens')
->join('oauth_clients', 'oauth_access_tokens.client_id', '=', 'oauth_clients.id')
- ->leftJoin('users', 'oauth_access_tokens.user_id', '=', 'users.id')
->where('oauth_clients.personal_access_client', true)
- ->select([
- 'oauth_access_tokens.id',
- 'oauth_access_tokens.name',
- 'oauth_access_tokens.revoked',
- 'oauth_access_tokens.created_at',
- 'oauth_access_tokens.expires_at',
- 'oauth_access_tokens.user_id as token_user_id',
- 'oauth_clients.name as client_name',
- 'users.id as existing_user_id',
- 'users.first_name as first_name',
- 'users.last_name as last_name',
- 'users.username as username',
- 'users.display_name as display_name',
- 'users.deleted_at as user_deleted_at',
- ])
- ->orderByDesc('oauth_access_tokens.created_at')
- ->get();
+ ->count();
return view('settings.api', [
- 'personalAccessTokens' => $personalAccessTokens,
+ 'personalAccessTokenCount' => $personalAccessTokenCount,
]);
}
diff --git a/app/Livewire/AdminPersonalAccessTokens.php b/app/Livewire/AdminPersonalAccessTokens.php
new file mode 100644
index 0000000000..b90c08b761
--- /dev/null
+++ b/app/Livewire/AdminPersonalAccessTokens.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Livewire;
+
+use Illuminate\Support\Facades\DB;
+use Livewire\Component;
+
+/**
+ * Livewire component for the admin-facing User API Tokens (Personal Access Tokens) table.
+ * Displays all personal access tokens across all users, used on the Settings > OAuth page.
+ */
+class AdminPersonalAccessTokens extends Component
+{
+ public function render()
+ {
+ $tokens = DB::table('oauth_access_tokens')
+ ->join('oauth_clients', 'oauth_access_tokens.client_id', '=', 'oauth_clients.id')
+ ->leftJoin('users', 'oauth_access_tokens.user_id', '=', 'users.id')
+ ->where('oauth_clients.personal_access_client', true)
+ ->select([
+ 'oauth_access_tokens.id',
+ 'oauth_access_tokens.name',
+ 'oauth_access_tokens.revoked',
+ 'oauth_access_tokens.created_at',
+ 'oauth_access_tokens.expires_at',
+ 'oauth_access_tokens.user_id as token_user_id',
+ 'oauth_clients.name as client_name',
+ 'users.id as existing_user_id',
+ 'users.username as username',
+ 'users.display_name as display_name',
+ 'users.deleted_at as user_deleted_at',
+ ])
+ ->orderByDesc('oauth_access_tokens.created_at')
+ ->get();
+
+ return view('livewire.admin-personal-access-tokens', [
+ 'tokens' => $tokens,
+ ]);
+ }
+}
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 80d725ce13..d4cb3ad09d 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -339,6 +339,7 @@ return [
'oauth_client' => 'Client',
'oauth_deleted_user' => 'Deleted user (ID: :id)',
'oauth_token_status_revoked' => 'Revoked',
+ 'oauth_token_status_expired' => 'Expired',
'oauth_token_status_active' => 'Active',
'oauth_revoke' => 'Revoke',
'oauth_unrevoke' => 'Unrevoke',
diff --git a/resources/views/livewire/admin-personal-access-tokens.blade.php b/resources/views/livewire/admin-personal-access-tokens.blade.php
new file mode 100644
index 0000000000..7936f8bcf1
--- /dev/null
+++ b/resources/views/livewire/admin-personal-access-tokens.blade.php
@@ -0,0 +1,87 @@
+<div>
+ @if($tokens->isEmpty())
+ <p class="text-muted">{{ trans('admin/settings/general.oauth_personal_access_tokens_none') }}</p>
+ @else
+ <div id="PersonalAccessTokensToolbar" class="pull-left" style="min-width: 280px; padding-top: 10px;"></div>
+ <div class="table-responsive">
+ <table
+ class="table table-striped snipe-table"
+ data-toolbar="#PersonalAccessTokensToolbar"
+ data-toggle="table"
+ data-sort-name="created_at"
+ data-sort-order="desc"
+ >
+ <thead>
+ <tr>
+ <th data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
+ <th data-field="user" data-sortable="true">{{ trans('general.created_by') }}</th>
+ <th data-field="client" data-sortable="true">{{ trans('admin/settings/general.oauth_client') }}</th>
+ <th data-field="status" data-sortable="true">{{ trans('general.status') }}</th>
+ <th data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
+ <th data-field="expires_at" data-sortable="true">{{ trans('general.expires') }}</th>
+ <th data-field="actions" data-sortable="false">
+ <span class="sr-only">{{ trans('general.actions') }}</span>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ @foreach($tokens as $token)
+ @php
+ $isRevoked = (int) $token->revoked === 1;
+ $isExpired = !$isRevoked && $token->expires_at && \Carbon\Carbon::parse($token->expires_at)->isPast();
+ $isActive = !$isRevoked && !$isExpired;
+ $profileLabel = $token->display_name ?: $token->username;
+ $isSoftDeletedUser = $token->user_deleted_at !== null;
+ @endphp
+ <tr>
+ <td>{{ $token->name ?: $token->id }}</td>
+ <td>
+ @if($token->existing_user_id)
+ <a href="{{ route('users.show', $token->token_user_id) }}">
+ @if($isSoftDeletedUser)
+ <del>{{ $profileLabel }}</del>
+ @else
+ {{ $profileLabel }}
+ @endif
+ </a>
+ @else
+ {{ trans('admin/settings/general.oauth_deleted_user', ['id' => $token->token_user_id]) }}
+ @endif
+ </td>
+ <td>{{ $token->client_name }}</td>
+ <td>
+ @if($isRevoked)
+ <span class="label label-danger">{{ trans('admin/settings/general.oauth_token_status_revoked') }}</span>
+ @elseif($isExpired)
+ <span class="label label-warning">{{ trans('admin/settings/general.oauth_token_status_expired') }}</span>
+ @else
+ <span class="label label-success">{{ trans('admin/settings/general.oauth_token_status_active') }}</span>
+ @endif
+ </td>
+ <td>{{ $token->created_at ? \App\Helpers\Helper::getFormattedDateObject($token->created_at, 'datetime', false) : '' }}</td>
+ <td>{{ $token->expires_at ? \App\Helpers\Helper::getFormattedDateObject($token->expires_at, 'datetime', false) : '' }}</td>
+ <td class="text-right">
+ @if($isRevoked)
+ <form method="POST" action="{{ route('settings.oauth.tokens.unrevoke', ['token' => $token->id]) }}" style="display: inline;">
+ @csrf
+ <button type="submit" class="btn btn-sm btn-default text-success" data-tooltip="true" title="{{ trans('admin/settings/general.oauth_unrevoke') }}">
+ <i class="fa-solid fa-toggle-off"></i>
+ </button>
+ </form>
+ @elseif(!$isExpired)
+ <form method="POST" action="{{ route('settings.oauth.tokens.revoke', ['token' => $token->id]) }}" style="display: inline;">
+ @csrf
+ <button type="submit" class="btn btn-sm btn-default text-danger" data-tooltip="true" title="{{ trans('admin/settings/general.oauth_revoke') }}">
+ <i class="fa-solid fa-toggle-on"></i>
+ </button>
+ </form>
+ @endif
+ </td>
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
+ @endif
+</div>
+
diff --git a/resources/views/settings/api.blade.php b/resources/views/settings/api.blade.php
index a4354e2238..3e8b9311aa 100644
--- a/resources/views/settings/api.blade.php
+++ b/resources/views/settings/api.blade.php
@@ -17,7 +17,7 @@
<x-tabs.nav-item
name="personal-access-tokens"
:label="trans('admin/settings/general.oauth_personal_access_tokens')"
- :count="($personalAccessTokens ?? collect())->count()"
+ :count="$personalAccessTokenCount ?? 0"
/>
<x-tabs.nav-item
@@ -39,83 +39,7 @@
</x-tabs.pane>
<x-tabs.pane name="personal-access-tokens">
- @if(($personalAccessTokens ?? collect())->isEmpty())
- <p class="text-muted">{{ trans('admin/settings/general.oauth_personal_access_tokens_none') }}</p>
- @else
- <div id="PersonalAccessTokensToolbar" class="pull-left" style="min-width: 280px; padding-top: 10px;"></div>
- <div class="table-responsive">
- <table
- class="table table-striped snipe-table"
- data-toolbar="#PersonalAccessTokensToolbar"
- data-toggle="table"
- data-sort-name="created_at"
- data-sort-order="desc"
- >
- <thead>
- <tr>
- <th data-field="name" data-sortable="true">{{ trans('general.name') }}</th>
- <th data-field="user" data-sortable="true">{{ trans('general.created_by') }}</th>
- <th data-field="client" data-sortable="true">{{ trans('admin/settings/general.oauth_client') }}</th>
- <th data-field="status" data-sortable="true">{{ trans('general.status') }}</th>
- <th data-field="created_at" data-sortable="true">{{ trans('general.created_at') }}</th>
- <th data-field="expires_at" data-sortable="true">{{ trans('general.expires') }}</th>
- <th data-field="actions" data-sortable="false">
- <span class="sr-only">{{ trans('general.actions') }}</span>
- </th>
- </tr>
- </thead>
- <tbody>
- @foreach($personalAccessTokens as $token)
- <tr>
- <td>{{ $token->name ?: $token->id }}</td>
- <td>
- @if($token->existing_user_id)
- @php
- $profileLabel = $token->display_name ?: $token->username;
- $isSoftDeletedUser = $token->user_deleted_at !== null;
- @endphp
- <a href="{{ route('users.show', $token->token_user_id) }}">
- @if($isSoftDeletedUser)
- <del>{{ $profileLabel }}</del>
- @else
- {{ $profileLabel }}
- @endif
- </a>
- @else
- {{ trans('admin/settings/general.oauth_deleted_user', ['id' => $token->token_user_id]) }}
- @endif
- </td>
- <td>{{ $token->client_name }}</td>
- <td>
- @if((int) $token->revoked === 1)
- <span class="label label-danger">{{ trans('admin/settings/general.oauth_token_status_revoked') }}</span>
- @else
- <span class="label label-success">{{ trans('admin/settings/general.oauth_token_status_active') }}</span>
- @endif
- </td>
- <td>{{ $token->created_at ? \App\Helpers\Helper::getFormattedDateObject($token->created_at, 'datetime', false) : '' }}</td>
- <td>{{ $token->expires_at ? \App\Helpers\Helper::getFormattedDateObject($token->expires_at, 'datetime', false) : '' }}</td>
- <td class="text-right">
- @if((int) $token->revoked === 1)
- <form method="POST" action="{{ route('settings.oauth.tokens.unrevoke', ['token' => $token->id]) }}" style="display: inline;">
- @csrf
- <button type="submit" class="btn btn-sm btn-default text-success" data-tooltip="true" title="{{ trans('admin/settings/general.oauth_unrevoke') }}">
- <i class="fa-solid fa-toggle-off"></i></button>
- </form>
- @else
- <form method="POST" action="{{ route('settings.oauth.tokens.revoke', ['token' => $token->id]) }}" style="display: inline;">
- @csrf
- <button type="submit" class="btn btn-sm btn-default text-danger" data-tooltip="true" title="{{ trans('admin/settings/general.oauth_revoke') }}">
- <i class="fa-solid fa-toggle-on"></i></button>
- </form>
- @endif
- </td>
- </tr>
- @endforeach
- </tbody>
- </table>
- </div>
- @endif
+ <livewire:admin-personal-access-tokens/>
</x-tabs.pane>
<x-tabs.pane name="oauth-clients">