added support for legacy tickets, fixed switching of modes and also style updates

2026-10-14 16:21:15 +01:00
parent efb8ee3898
commit e241c08ef6
41 changed files with 638 additions and 27 deletions
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Helpdesk\Http\Controllers;
+
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\ValidationException;
+use Laravel\Sanctum\PersonalAccessToken;
+
+final class NativeAuthController extends Controller
+{
+    public function login(Request $request): JsonResponse
+    {
+        $data = $request->validate([
+            'email' => ['required', 'email'],
+            'password' => ['required', 'string'],
+            'device_name' => ['sometimes', 'string', 'max:100'],
+        ]);
+
+        $user = User::query()
+            ->where('email', $data['email'])
+            ->first();
+
+        if (! $user || ! Hash::check($data['password'], $user->password)) {
+            throw ValidationException::withMessages([
+                'email' => ['The provided credentials are incorrect.'],
+            ]);
+        }
+
+        // Native two-factor and passkey challenges are not implemented yet.
+        // Never issue a token to an account requiring these challenges.
+        if (
+            ! empty($user->two_factor_secret)
+            || ! empty($user->two_factor_confirmed_at)
+        ) {
+            return response()->json([
+                'message' => 'This account requires additional authentication.',
+                'code' => 'additional_authentication_required',
+            ], 403);
+        }
+
+        $token = $user->createToken(
+            $data['device_name'] ?? 'HelpdeskMac',
+            ['helpdesk:native'],
+            now()->addDays(30)
+        );
+
+        return response()->json([
+            'token_type' => 'Bearer',
+            'access_token' => $token->plainTextToken,
+            'expires_at' => $token->accessToken->expires_at?->toIso8601String(),
+            'user' => $this->userData($user),
+        ]);
+    }
+
+    public function user(Request $request): JsonResponse
+    {
+        return response()->json([
+            'user' => $this->userData($request->user()),
+        ]);
+    }
+
+    public function logout(Request $request): JsonResponse
+    {
+        $token = $request->user()->currentAccessToken();
+
+        if ($token instanceof PersonalAccessToken) {
+            $token->delete();
+        }
+
+        return response()->json([
+            'message' => 'Logged out successfully.',
+        ]);
+    }
+
+    private function userData(User $user): array
+    {
+        return [
+            'id' => $user->getKey(),
+            'name' => $user->name,
+            'email' => $user->email,
+            'helpdesk_agent' => $user->isHelpdeskAgent(),
+            'helpdesk_admin' => $user->isHelpdeskAdmin(),
+        ];
+    }
+}
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Modules\Helpdesk\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use Illuminate\View\View;
+
+final class NativeAuthorizationController extends Controller
+{
+    public function authorize(Request $request): View
+    {
+        $request->validate([
+            'client_id' => ['required', 'string'],
+            'redirect_uri' => ['required', 'string'],
+            'response_type' => ['required', 'in:code'],
+            'state' => ['required', 'string', 'min:32'],
+            'code_challenge' => ['required', 'string', 'size:43'],
+            'code_challenge_method' => ['required', 'in:S256'],
+        ]);
+
+        // Authorization-code issuance is not implemented yet.
+        // Never redirect a code or token to an unregistered URI.
+        abort(501, 'Native authorization is not yet implemented.');
+    }
+
+    public function approve(Request $request): void
+    {
+        abort(501, 'Native authorization approval is not yet implemented.');
+    }
+}
@@ -7,44 +7,144 @@ namespace Modules\Helpdesk\Http\Controllers;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\Rule;
 use Modules\Helpdesk\Models\Ticket;
+use Modules\Helpdesk\Services\TicketService;

 final class NativeTicketController extends Controller
 {
+    public function __construct(
+        private readonly TicketService $tickets,
+    ) {}
+
    public function index(Request $request): JsonResponse
    {
        $user = $request->user();
-        $query = Ticket::query()->orderByDesc('id');
-        if (!$user->can('helpdesk.admin')) {
-            $query->where(function ($q) use ($user) { $q->where('user_id', $user->getKey())->orWhere('agent_id', $user->getKey()); });
+
+        $query = Ticket::query()
+            ->visibleTo($user)
+            ->orderByDesc('id');
+
+        if ($request->filled('search')) {
+            $search = addcslashes(
+                (string) $request->query('search'),
+                '%_\\'
+            );
+
+            $query->where(
+                'subject',
+                'like',
+                '%'.$search.'%'
+            );
        }
-        if ($search = $request->query('search')) {
-            $query->where('subject', 'like', '%'.addcslashes((string) $search, '%_\\').'%');
-        }
-        return response()->json($query->paginate(30));
+
+        return response()->json(
+            $query->paginate(30)
+        );
    }

    public function show(Request $request, Ticket $ticket): JsonResponse
    {
-        $this->authorizeTicket($request, $ticket);
-        return response()->json($ticket->load(['comments', 'status', 'priority', 'agent']));
+        $user = $request->user();
+
+        $ticket = Ticket::query()
+            ->visibleTo($user)
+            ->whereKey($ticket->getKey())
+            ->firstOrFail();
+
+        return response()->json(
+            $ticket->load([
+                'comments',
+                'status',
+                'priority',
+                'category',
+                'project',
+                'team',
+                'agent',
+                'attachments',
+                'tags',
+            ])
+        );
    }

    public function store(Request $request): JsonResponse
    {
-        $data = $request->validate(['subject' => ['required','string','max:255'], 'body' => ['required','string']]);
-        $ticket = DB::transaction(function () use ($request, $data) {
-            return Ticket::create($data + [
-                'reference' => 'MAC-'.strtoupper(bin2hex(random_bytes(6))),
-                'user_id' => $request->user()->getKey(),
-            ]);
-        });
-        return response()->json($ticket, 201);
-    }
+        $data = $request->validate([
+            'subject' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'body' => [
+                'required',
+                'string',
+            ],
+            'priority_id' => [
+                'required',
+                'integer',
+                Rule::exists('helpdesk_priorities', 'id'),
+            ],
+            'category_id' => [
+                'nullable',
+                'integer',
+                Rule::exists('helpdesk_categories', 'id'),
+            ],
+            'project_id' => [
+                'nullable',
+                'integer',
+                Rule::exists('helpdesk_projects', 'id'),
+            ],
+            'product_id' => [
+                'nullable',
+                'integer',
+                Rule::exists('helpdesk_products', 'id'),
+            ],
+            'team_id' => [
+                'nullable',
+                'integer',
+                Rule::exists('helpdesk_teams', 'id'),
+            ],
+            'board_id' => [
+                'nullable',
+                'integer',
+                Rule::exists('helpdesk_kanban_boards', 'id'),
+            ],
+            'due_at' => [
+                'nullable',
+                'date',
+            ],
+            'tag_ids' => [
+                'sometimes',
+                'array',
+            ],
+            'tag_ids.*' => [
+                'integer',
+                'distinct',
+                Rule::exists('helpdesk_tags', 'id'),
+            ],
+            'attachments' => [
+                'sometimes',
+                'array',
+            ],
+            'attachments.*' => [
+                'file',
+                'max:10240',
+            ],
+        ]);

-    private function authorizeTicket(Request $request, Ticket $ticket): void
-    {
-        abort_unless($request->user()->can('helpdesk.admin') || (int) $ticket->user_id === (int) $request->user()->getKey() || (int) $ticket->agent_id === (int) $request->user()->getKey(), 403);
+        $files = $request->file('attachments', []);
+
+        unset($data['attachments']);
+
+        $ticket = $this->tickets->create(
+            $request->user(),
+            $data,
+            $files
+        );
+
+        return response()->json(
+            $ticket,
+            201
+        );
    }
 }
@@ -20,7 +20,6 @@ use Modules\Helpdesk\Livewire\TicketTimer;
 use Modules\Helpdesk\Models\Ticket;
 use Modules\Helpdesk\Policies\TicketPolicy;
 use Modules\Helpdesk\Support\ModuleInfo;
-
 final class HelpdeskServiceProvider extends ServiceProvider
 {
    /**
@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Route;
 use Modules\Helpdesk\Http\Controllers\GitWebhookController;
 use Modules\Helpdesk\Http\Controllers\WorkflowOpenController;
 use Modules\Helpdesk\Support\ModuleInfo;
+use Modules\Helpdesk\Http\Controllers\NativeAuthorizationController;

 final class RouteServiceProvider extends ServiceProvider
 {
@@ -42,6 +43,17 @@ final class RouteServiceProvider extends ServiceProvider
            ->prefix(config('helpdesk.route_prefix', 'helpdesk'))
            ->name('helpdesk.')
            ->group(module_path(ModuleInfo::name(), 'Routes/web.php'));
+        // Native macOS authentication through Laravel Fortify.
+        Route::middleware(['web', 'auth:web'])
+            ->prefix('helpdesk/native')
+            ->name('helpdesk.native.')
+            ->group(function (): void {
+                Route::get('/authorize', [NativeAuthorizationController::class, 'authorize'])
+                    ->name('authorize');
+
+                Route::post('/authorize', [NativeAuthorizationController::class, 'approve'])
+                    ->name('approve');
+            });
    }

    /**
@@ -7,6 +7,7 @@ use Modules\Helpdesk\Http\Controllers\GitWebhookController;
 use Modules\Helpdesk\Http\Controllers\HelpdeskSyncController;
 use Modules\Helpdesk\Http\Controllers\NativeTicketController;
 use Modules\Helpdesk\Http\Middleware\VerifyHelpdeskSyncToken;
+use Modules\Helpdesk\Http\Controllers\NativeAuthController;

 Route::get('/status', static fn (): array => [
    'module' => 'helpdesk',
@@ -34,3 +35,26 @@ Route::middleware('auth:sanctum')->prefix('native/v1')->group(function () {
    Route::get('tickets/{ticket}', [NativeTicketController::class, 'show']);
    Route::post('tickets', [NativeTicketController::class, 'store']);
 });
+
+Route::prefix('native/v1')
+    ->name('native.')
+    ->group(function (): void {
+
+        Route::middleware('auth:sanctum')->group(function (): void {
+
+            Route::get('auth/user', [NativeAuthController::class, 'user'])
+                ->name('auth.user');
+
+            Route::post('auth/logout', [NativeAuthController::class, 'logout'])
+                ->name('auth.logout');
+
+            Route::get('tickets', [NativeTicketController::class, 'index'])
+                ->name('tickets.index');
+
+            Route::get('tickets/{ticket}', [NativeTicketController::class, 'show'])
+                ->name('tickets.show');
+
+            Route::post('tickets', [NativeTicketController::class, 'store'])
+                ->name('tickets.store');
+        });
+    });