adapt clockify importer to support task -> tasks column rename

Bumps [WyriHaximus/github-action-get-previous-tag](https://github.com/wyrihaximus/github-action-get-previous-tag) from 1 to 2.
- [Release notes](https://github.com/wyrihaximus/github-action-get-previous-tag/releases)
- [Commits](https://github.com/wyrihaximus/github-action-get-previous-tag/compare/v1...v2)

---
updated-dependencies:
- dependency-name: WyriHaximus/github-action-get-previous-tag
  dependency-version: '2'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/build-onpremise.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -46,9 +46,9 @@ jobs:
       - name: "Get Previous tag (normal push)"
         id: previoustag
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        uses: "WyriHaximus/github-action-get-previous-tag@v2"
         with:
-          prefix: "v"
+          pattern: "v*[0-9].*[0-9].*[0-9]"
 
       - name: "Get version"
         id: release-version
@@ -96,7 +96,7 @@ jobs:
           node-version: '20.x'
 
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
@@ -124,27 +124,27 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ${{ env.DOCKER_REPO }}
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
           password: ${{ secrets.ONPREMISE_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: "Build and push by digest"
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: docker/prod/Dockerfile
@@ -163,7 +163,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: "Upload digest"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
@@ -177,25 +177,25 @@ jobs:
       - build
     steps:
       - name: "Download digests"
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
           password: ${{ secrets.ONPREMISE_TOKEN }}
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: "Docker meta"
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ${{ env.DOCKER_REPO }}

.github/workflows/build-private.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -33,9 +33,9 @@ jobs:
       - name: "Get Previous tag (normal push)"
         id: previoustag
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        uses: "WyriHaximus/github-action-get-previous-tag@v2"
         with:
-          prefix: "v"
+          pattern: "v*[0-9].*[0-9].*[0-9]"
 
       - name: "Get version"
         id: version
@@ -73,7 +73,7 @@ jobs:
           node-version: '20.x'
 
       - name: "Checkout billing extension"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: solidtime-io/extension-billing
           path: extensions/Billing
@@ -93,7 +93,7 @@ jobs:
         run: cd extensions/Billing && npm ci
 
       - name: "Checkout services extension"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: solidtime-io/extension-services
           path: extensions/Services
@@ -111,7 +111,7 @@ jobs:
         run: cd extensions/Services && npm ci
 
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
@@ -160,7 +160,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: rg.fr-par.scw.cloud/solidtime
           username: nologin
@@ -168,7 +168,7 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: rg.fr-par.scw.cloud/solidtime/solidtime
           tags: |
@@ -179,13 +179,13 @@ jobs:
             type=sha,format=long
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: "Build and push"
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           build-args: |

.github/workflows/build-public.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -47,9 +47,9 @@ jobs:
       - name: "Get Previous tag (normal push)"
         id: previoustag
         if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+        uses: "WyriHaximus/github-action-get-previous-tag@v2"
         with:
-          prefix: "v"
+          pattern: "v*[0-9].*[0-9].*[0-9]"
 
       - name: "Get version"
         id: release-version
@@ -109,34 +109,34 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ${{ env.DOCKERHUB_REPO }}
             ${{ env.GHCR_REPO }}
 
       - name: "Login to Docker Hub Container Registry"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@v4
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: "Build and push by digest"
         id: build
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: docker/prod/Dockerfile
@@ -155,7 +155,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: "Upload digest"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
@@ -169,31 +169,31 @@ jobs:
       - build
     steps:
       - name: "Download digests"
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v8
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GHCR"
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: "Docker meta"
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ${{ env.DOCKERHUB_REPO }}

.github/workflows/generate-api-docs.yml

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -52,7 +52,7 @@ jobs:
         run: php artisan scramble:export --path=build/api-docs.json
 
       - name: "Upload API docs to GitHub"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: api-docs.json
           path: build/api-docs.json

.github/workflows/npm-build.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2

.github/workflows/npm-format-check.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Use Node.js"
         uses: actions/setup-node@v6

.github/workflows/npm-lint.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Use Node.js"
         uses: actions/setup-node@v6

.github/workflows/npm-publish-api.yml

@@ -11,7 +11,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci

.github/workflows/npm-publish-ui.yml

@@ -11,7 +11,7 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       # Setup .npmrc file to publish to npm
       - uses: actions/setup-node@v6
         with:

.github/workflows/npm-test-unit.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 

.github/workflows/npm-typecheck.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2

.github/workflows/phpstan.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2

.github/workflows/phpunit.yml

@@ -36,7 +36,7 @@ jobs:
           --health-retries 5
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -68,7 +68,7 @@ jobs:
         run: php artisan test --stop-on-failure --coverage-text --coverage-clover=coverage.xml
 
       - name: "Upload coverage reports to Codecov"
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v7.0.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Check code style"
         uses: aglipanci/laravel-pint-action@2.6

.github/workflows/playwright.yml

@@ -35,7 +35,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: "Setup node"
         uses: actions/setup-node@v6
@@ -86,7 +86,7 @@ jobs:
           MAILPIT_BASE_URL: 'http://localhost:8025'
 
       - name: "Upload blob report"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: blob-report-${{ matrix.shardIndex }}
@@ -99,10 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: "Setup node"
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: '20.x'
 
@@ -110,7 +110,7 @@ jobs:
         run: npm ci
 
       - name: "Download blob reports"
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v8
         with:
           path: all-blob-reports
           pattern: blob-report-*
@@ -120,7 +120,7 @@ jobs:
         run: npx playwright merge-reports --reporter html ./all-blob-reports
 
       - name: "Upload merged HTML report"
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: playwright-report
           path: playwright-report/

app/Events/MemberAdded.php

@@ -9,6 +9,9 @@ use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 
+/**
+ * Replaces legacy TeamMemberAdded event.
+ */
 class MemberAdded
 {
     use Dispatchable;

app/Events/MemberAdding.php

@@ -9,6 +9,9 @@ use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 
+/**
+ * Replaces legacy AddingTeamMember event.
+ */
 class MemberAdding
 {
     use Dispatchable;

app/Events/OrganizationInvitationAdding.php

@@ -9,6 +9,9 @@ use App\Models\Organization;
 use App\Models\User;
 use Illuminate\Foundation\Events\Dispatchable;
 
+/**
+ * Replaces legacy InvitingTeamMember event.
+ */
 class OrganizationInvitationAdding
 {
     use Dispatchable;

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -6,6 +6,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Role;
 use App\Events\AfterCreateOrganization;
+use App\Http\Requests\V1\Organization\OrganizationDestroyRequest;
 use App\Http\Requests\V1\Organization\OrganizationStoreRequest;
 use App\Http\Requests\V1\Organization\OrganizationUpdateRequest;
 use App\Http\Resources\V1\Organization\OrganizationResource;
@@ -50,6 +51,9 @@ class OrganizationController extends Controller
         if ($request->getName() !== null) {
             $organization->name = $request->getName();
         }
+        if ($request->getCurrency() !== null) {
+            $organization->currency = $request->getCurrency();
+        }
         if ($request->getEmployeesCanSeeBillableRates() !== null) {
             $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
         }
@@ -121,7 +125,7 @@ class OrganizationController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function destroy(Organization $organization, DeletionService $deletionService): JsonResponse
+    public function destroy(Organization $organization, OrganizationDestroyRequest $request, DeletionService $deletionService): JsonResponse
     {
         $this->checkPermission($organization, 'organizations:delete');
 

app/Http/Controllers/Api/V1/UserController.php

@@ -6,6 +6,7 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
 use App\Exceptions\Api\UserResendEmailVerificationNoPendingEmailApiException;
+use App\Http\Requests\V1\User\UserDestroyRequest;
 use App\Http\Requests\V1\User\UserUpdateCurrentOrganizationRequest;
 use App\Http\Requests\V1\User\UserUpdateRequest;
 use App\Http\Resources\V1\User\UserResource;
@@ -193,7 +194,7 @@ class UserController extends Controller
      * @throws AuthorizationException Thrown when the authenticated user does not match the user to be deleted.
      * @throws CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers Thrown when the user to be deleted is the owner of an organization with multiple members.
      */
-    public function destroy(User $user, DeletionService $deletionService): JsonResponse
+    public function destroy(User $user, UserDestroyRequest $request, DeletionService $deletionService): JsonResponse
     {
         if ($user->getKey() !== $this->user()->getKey()) {
             throw new AuthorizationException;

app/Http/Controllers/Web/OrganizationController.php

@@ -54,15 +54,9 @@ class OrganizationController extends Controller
             'currencies' => array_map(function (Currency $currency): string {
                 return $currency->getName();
             }, ISOCurrencyProvider::getInstance()->getAvailableCurrencies()),
-            'availableRoles' => [],
-            'availablePermissions' => [],
-            'defaultPermissions' => [],
             'permissions' => [
-                'canAddTeamMembers' => true,
+                'canDeleteTeam' => $this->hasPermission($organization, 'organizations:delete'),
-                'canDeleteTeam' => true,
+                'canUpdateTeam' => $this->hasPermission($organization, 'organizations:update'),
-                'canRemoveTeamMembers' => true,
-                'canUpdateTeam' => true,
-                'canUpdateTeamMembers' => true,
             ],
         ]);
     }

app/Http/Controllers/Web/OtherBrowserSessionsController.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Controllers\Web;
+
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\ValidationException;
+use Laravel\Fortify\Actions\ConfirmPassword;
+
+class OtherBrowserSessionsController extends Controller
+{
+    /**
+     * Log the user out of their other browser sessions across all devices.
+     */
+    public function destroy(Request $request, StatefulGuard $guard): RedirectResponse
+    {
+        $password = (string) $request->string('password');
+
+        $confirmed = app(ConfirmPassword::class)($guard, $request->user(), $password);
+
+        if (! $confirmed) {
+            throw ValidationException::withMessages([
+                'password' => __('The password is incorrect.'),
+            ]);
+        }
+
+        $guard->logoutOtherDevices($password);
+
+        $this->deleteOtherSessionRecords($request);
+
+        return back(303);
+    }
+
+    /**
+     * Delete the other browser session records from storage.
+     */
+    protected function deleteOtherSessionRecords(Request $request): void
+    {
+        if (config('session.driver') !== 'database') {
+            return;
+        }
+
+        DB::connection(config('session.connection'))
+            ->table(config('session.table', 'sessions'))
+            ->where('user_id', $request->user()->getAuthIdentifier())
+            ->where('id', '!=', $request->session()->getId())
+            ->delete();
+    }
+}

app/Http/Middleware/EnsureEmailIsVerified.php

@@ -17,7 +17,7 @@ class EnsureEmailIsVerified
      */
     public function handle(Request $request, Closure $next, ?string $redirectToRoute = null): Response
     {
-        if (! app()->isLocal()) {
+        if (! app()->isLocal() || config('app.local_email_verification')) {
             if ($request->user() === null ||
                 (! $request->user()->hasVerifiedEmail())) {
                 return $request->expectsJson()

app/Http/Requests/V1/Organization/OrganizationDestroyRequest.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\Organization;
+
+use App\Http\Requests\V1\BaseFormRequest;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Validator;
+
+class OrganizationDestroyRequest extends BaseFormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string>>
+     */
+    public function rules(): array
+    {
+        return [
+            'password' => [
+                'required',
+                'string',
+            ],
+        ];
+    }
+
+    /**
+     * @return array<int, callable(Validator): void>
+     */
+    public function after(): array
+    {
+        return [
+            function (Validator $validator): void {
+                if ($validator->errors()->has('password')) {
+                    return;
+                }
+
+                $user = $this->user();
+                $password = $this->input('password');
+
+                if (! is_string($password) || $user === null || ! Hash::check($password, (string) $user->password)) {
+                    $validator->errors()->add('password', __('The password is incorrect.'));
+                }
+            },
+        ];
+    }
+}

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -11,6 +11,8 @@ use App\Enums\NumberFormat;
 use App\Enums\TimeFormat;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
+use App\Rules\CurrencyRule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Validation\Rule;
 
 /**
@@ -21,7 +23,7 @@ class OrganizationUpdateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule>>
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule|ValidationRule>>
      */
     public function rules(): array
     {
@@ -30,6 +32,10 @@ class OrganizationUpdateRequest extends BaseFormRequest
                 'string',
                 'max:255',
             ],
+            'currency' => [
+                'string',
+                new CurrencyRule,
+            ],
             'billable_rate' => array_merge(
                 [
                     'nullable',
@@ -68,6 +74,11 @@ class OrganizationUpdateRequest extends BaseFormRequest
         return $this->has('name') ? (string) $this->input('name') : null;
     }
 
+    public function getCurrency(): ?string
+    {
+        return $this->has('currency') ? (string) $this->input('currency') : null;
+    }
+
     public function getNumberFormat(): ?NumberFormat
     {
         return $this->has('number_format') ? NumberFormat::from($this->input('number_format')) : null;

app/Http/Requests/V1/User/UserDestroyRequest.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests\V1\User;
+
+use App\Http\Requests\V1\BaseFormRequest;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Validator;
+
+class UserDestroyRequest extends BaseFormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, array<string>>
+     */
+    public function rules(): array
+    {
+        return [
+            'password' => [
+                'required',
+                'string',
+            ],
+        ];
+    }
+
+    /**
+     * @return array<int, callable(Validator): void>
+     */
+    public function after(): array
+    {
+        return [
+            function (Validator $validator): void {
+                if ($validator->errors()->has('password')) {
+                    return;
+                }
+
+                $user = $this->user();
+                $password = $this->input('password');
+
+                if (! is_string($password) || $user === null || ! Hash::check($password, (string) $user->password)) {
+                    $validator->errors()->add('password', __('The password is incorrect.'));
+                }
+            },
+        ];
+    }
+}

app/Service/Import/Importers/ClockifyProjectsImporter.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Service\Import\Importers;
 
 use Exception;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 use League\Csv\Exception as CsvException;
 use League\Csv\Reader;
@@ -24,6 +25,7 @@ class ClockifyProjectsImporter extends DefaultImporter
             $header = $reader->getHeader();
             $this->validateHeader($header);
             $billableRateKey = $this->getBillableRateKey($header);
+            $tasksKey = $this->getTasksKey($header);
             $records = $reader->getRecords();
             foreach ($records as $record) {
                 $clientId = null;
@@ -44,11 +46,12 @@ class ClockifyProjectsImporter extends DefaultImporter
                         'is_billable' => $record['Billability'] === 'Yes',
                         'billable_rate' => $billableRateKey !== null && $record[$billableRateKey] !== '' ? (int) (((float) $record[$billableRateKey]) * 100) : null,
                         'estimated_time' => $record['Estimated (h)'] !== '' && is_numeric($record['Estimated (h)']) ? (int) ($record['Estimated (h)'] * 3600) : null,
+                        'archived_at' => $record['Status'] === 'Archived' ? Carbon::now() : null,
                     ]);
                 }
 
-                if ($record['Task'] !== '') {
+                if ($record[$tasksKey] !== '') {
-                    $tasks = explode(', ', $record['Task']);
+                    $tasks = explode(', ', $record[$tasksKey]);
                     foreach ($tasks as $task) {
                         $this->taskImportHelper->getKey([
                             'name' => $task,
@@ -81,13 +84,26 @@ class ClockifyProjectsImporter extends DefaultImporter
             'Status',
             'Visibility',
             'Billability',
-            'Task',
         ];
         foreach ($requiredFields as $requiredField) {
             if (! in_array($requiredField, $header, true)) {
                 throw new ImportException('Invalid CSV header, missing field: '.$requiredField);
             }
         }
+        // Clockify renamed the "Task" column to "Tasks" in newer exports; accept either.
+        if (! in_array('Task', $header, true) && ! in_array('Tasks', $header, true)) {
+            throw new ImportException('Invalid CSV header, missing field: Tasks');
+        }
+    }
+
+    /**
+     * Clockify renamed the "Task" column to "Tasks" in newer exports.
+     *
+     * @param  array<string>  $header
+     */
+    private function getTasksKey(array $header): string
+    {
+        return in_array('Tasks', $header, true) ? 'Tasks' : 'Task';
     }
 
     /**

app/Service/Import/Importers/ClockifyTimeEntriesImporter.php

@@ -116,10 +116,12 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
                     throw new ImportException('Time entry description is too long');
                 }
                 $timeEntry->description = $record['Description'];
-                if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                if (isset($record['Billable'])) {
-                    throw new ImportException('Invalid billable value');
+                    if (! in_array($record['Billable'], ['Yes', 'No'], true)) {
+                        throw new ImportException('Invalid billable value');
+                    }
+                    $timeEntry->billable = $record['Billable'] === 'Yes';
                 }
-                $timeEntry->billable = $record['Billable'] === 'Yes';
                 $timeEntry->tags = $this->getTags($record['Tags']);
                 $timeEntry->is_imported = true;
 
@@ -219,7 +221,6 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
             'Group',
             'Email',
             'Tags',
-            'Billable',
             'Start Date',
             'Start Time',
             'End Date',

app/Service/UserService.php

@@ -62,6 +62,7 @@ class UserService
                 $intervalFormat,
                 $timeFormat,
             );
+            $this->switchCurrentOrganization($user, $organization);
         }
 
         return $user;

composer.json

@@ -132,7 +132,8 @@
             "pestphp/pest-plugin": true,
             "php-http/discovery": true,
             "wikimedia/composer-merge-plugin": true
-        }
+        },
+        "process-timeout": 900
     },
     "minimum-stability": "stable",
     "prefer-stable": true

config/app.php

@@ -81,6 +81,8 @@ return [
 
     'enable_registration' => (bool) env('APP_ENABLE_REGISTRATION', false),
 
+    'local_email_verification' => (bool) env('APP_LOCAL_EMAIL_VERIFICATION', false),
+
     /*
     |--------------------------------------------------------------------------
     | Application Timezone

docker-compose.yml

@@ -107,7 +107,7 @@ services:
             - sail
             - reverse-proxy
     playwright:
-        image: mcr.microsoft.com/playwright:v1.59.1-jammy
+        image: mcr.microsoft.com/playwright:v1.60.0-jammy
         command: ['npx', 'playwright', 'test', '--ui-port=8080', '--ui-host=0.0.0.0']
         working_dir: /src
         extra_hosts:

e2e/calendar.spec.ts

@@ -12,7 +12,7 @@ import {
     createRunningTimeEntryWithStartViaApi,
     createTaskViaApi,
     createProjectWithClientViaApi,
-    updateUserProfileViaWeb,
+    updateUserProfileViaApi,
     updateOrganizationSettingViaApi,
 } from './utils/api';
 
@@ -1803,28 +1803,22 @@ test.describe('Click-Drag Selection to Create', () => {
 // =============================================
 
 test.describe('Timezone & Localization', () => {
-    test('week start day: monday shows Mon as first column', async ({ page }) => {
+    test('week start day: monday shows Mon as first column', async ({ page, ctx }) => {
-        // Navigate to calendar first to load Inertia page props
+        await updateUserProfileViaApi(ctx, { week_start: 'monday' });
         await goToCalendar(page);
-        await updateUserProfileViaWeb(page, { week_start: 'monday' });
-        await page.reload();
         await expect(page.locator('.fc')).toBeVisible();
 
         const firstHeader = page.locator('.fc-col-header-cell').first();
         await expect(firstHeader).toContainText('Mon');
     });
 
-    test('week start day: sunday shows Sun as first column', async ({ page }) => {
+    test('week start day: sunday shows Sun as first column', async ({ page, ctx }) => {
+        await updateUserProfileViaApi(ctx, { week_start: 'sunday' });
         await goToCalendar(page);
-        await updateUserProfileViaWeb(page, { week_start: 'sunday' });
-        await page.reload();
         await expect(page.locator('.fc')).toBeVisible();
 
         const firstHeader = page.locator('.fc-col-header-cell').first();
         await expect(firstHeader).toContainText('Sun');
-
-        // Reset to monday for other tests
-        await updateUserProfileViaWeb(page, { week_start: 'monday' });
     });
 
     test('12-hour time format shows AM/PM on slot labels', async ({ page, ctx }) => {

e2e/command-palette.spec.ts

@@ -348,7 +348,7 @@ test.describe('Command Palette', () => {
             const newOrgName = 'TestOrg' + Math.floor(Math.random() * 10000);
 
             // Create a new organization
-            await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+            await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
             await page.getByLabel('Organization Name').fill(newOrgName);
             await page.getByRole('button', { name: 'Create' }).click();
 
@@ -393,7 +393,7 @@ test.describe('Command Palette', () => {
             const newOrgName = 'GroupTestOrg' + Math.floor(Math.random() * 10000);
 
             // Create a new organization to ensure we have multiple
-            await page.goto(PLAYWRIGHT_BASE_URL + '/teams/create');
+            await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
             await page.getByLabel('Organization Name').fill(newOrgName);
             await page.getByRole('button', { name: 'Create' }).click();
             await expect(page.getByTestId('dashboard_view')).toBeVisible({ timeout: 10000 });

e2e/organization.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from '../playwright/fixtures';
-import { PLAYWRIGHT_BASE_URL } from '../playwright/config';
+import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
 
 async function goToOrganizationSettings(page) {
     await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
@@ -36,13 +36,52 @@ async function createTimeEntry(page, duration: string) {
 test('test that organization name can be updated', async ({ page }) => {
     await goToOrganizationSettings(page);
     await page.getByLabel('Organization Name').fill('NEW ORG NAME');
-    await page.getByLabel('Organization Name').press('Enter');
+    await Promise.all([
-    await page.getByLabel('Organization Name').press('Meta+r');
+        page.waitForResponse(
+            (response) =>
+                response.url().includes('/api/v1/organizations/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200
+        ),
+        page
+            .locator('form')
+            .filter({ hasText: 'Organization Name' })
+            .getByRole('button', { name: 'Save' })
+            .click(),
+    ]);
+    await page.reload();
     await expect(page.locator('[data-testid="organization_switcher"]:visible')).toContainText(
         'NEW ORG NAME'
     );
 });
 
+test('test that organization currency can be updated', async ({ page }) => {
+    await goToOrganizationSettings(page);
+    await page.getByLabel('Currency', { exact: true }).selectOption('USD');
+    await Promise.all([
+        page.waitForRequest(
+            (request) =>
+                request.url().includes('/api/v1/organizations/') &&
+                request.method() === 'PUT' &&
+                request.postDataJSON().currency === 'USD'
+        ),
+        page.waitForResponse(
+            async (response) =>
+                response.url().includes('/api/v1/organizations/') &&
+                response.request().method() === 'PUT' &&
+                response.status() === 200 &&
+                (await response.json()).data.currency === 'USD'
+        ),
+        page
+            .locator('form')
+            .filter({ hasText: 'Organization Name' })
+            .getByRole('button', { name: 'Save' })
+            .click(),
+    ]);
+    await page.reload();
+    await expect(page.getByLabel('Currency', { exact: true })).toHaveValue('USD');
+});
+
 test('test that organization billable rate can be updated with all existing time entries', async ({
     page,
 }) => {
@@ -369,13 +408,153 @@ test('test that format settings persist after page reload', async ({ page }) =>
     await expect(page.getByLabel('Date Format')).toContainText('DD/MM/YYYY');
 });
 
+// =============================================
+// Create, Delete & Switch
+// =============================================
+
+test.describe('Organization Create, Delete & Switch', () => {
+    async function createOrganization(page, name: string) {
+        await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
+        await page.getByLabel('Organization Name').fill(name);
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/api/v1/organizations') &&
+                    response.request().method() === 'POST' &&
+                    response.status() === 201
+            ),
+            page.getByRole('button', { name: 'Create' }).click(),
+        ]);
+        // The backend switches the current organization to the new one and the
+        // frontend reloads into its dashboard.
+        await expect(page.getByTestId('dashboard_view')).toBeVisible({ timeout: 10000 });
+    }
+
+    test('can create a new organization and switches to it automatically', async ({ page }) => {
+        const newOrgName = 'CreateOrg' + Math.floor(Math.random() * 100000);
+        await createOrganization(page, newOrgName);
+
+        await expect(page.locator('[data-testid="organization_switcher"]:visible')).toContainText(
+            newOrgName
+        );
+    });
+
+    test('does not create an organization when the name is empty', async ({ page }) => {
+        await page.goto(PLAYWRIGHT_BASE_URL + '/organizations/create');
+
+        // The form posts to the API, which rejects the empty name with a 422.
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/api/v1/organizations') &&
+                    response.request().method() === 'POST' &&
+                    response.status() === 422
+            ),
+            page.getByRole('button', { name: 'Create' }).click(),
+        ]);
+
+        // Validation failed, so we stay on the create form and never reach a
+        // dashboard. Assert on the form rather than the URL.
+        await expect(page.getByText('Organization Details')).toBeVisible();
+        await expect(page.getByRole('alert')).toContainText('The name field is required.');
+        await expect(page.getByLabel('Organization Name')).toHaveAttribute('aria-invalid', 'true');
+        await expect(page.getByTestId('dashboard_view')).toHaveCount(0);
+    });
+
+    test('can delete an organization', async ({ page }) => {
+        // Create a throwaway organization so the primary one is never deleted.
+        const orgName = 'DeleteOrg' + Math.floor(Math.random() * 100000);
+        await createOrganization(page, orgName);
+
+        // Open the (now current) throwaway organization's settings.
+        await goToOrganizationSettings(page);
+
+        // Open the confirmation modal, then confirm inside the dialog.
+        await page.getByRole('button', { name: 'Delete Organization' }).click();
+        await page.getByRole('dialog').getByPlaceholder('Password').fill(TEST_USER_PASSWORD);
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/api/v1/organizations') &&
+                    response.request().method() === 'DELETE' &&
+                    response.status() === 204
+            ),
+            page.getByRole('dialog').getByRole('button', { name: 'Delete Organization' }).click(),
+        ]);
+
+        // We are redirected to the dashboard of a different organization.
+        await expect(page.getByTestId('dashboard_view')).toBeVisible({ timeout: 10000 });
+        await expect(
+            page.locator('[data-testid="organization_switcher"]:visible')
+        ).not.toContainText(orgName);
+    });
+
+    test('delete organization shows an error when the password is wrong', async ({ page }) => {
+        const orgName = 'DeleteOrgWrongPassword' + Math.floor(Math.random() * 100000);
+        await createOrganization(page, orgName);
+        await goToOrganizationSettings(page);
+
+        await page.getByRole('button', { name: 'Delete Organization' }).click();
+        const dialog = page.getByRole('dialog');
+        await dialog.getByPlaceholder('Password').fill('not-the-real-password');
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/api/v1/organizations') &&
+                    response.request().method() === 'DELETE' &&
+                    response.status() === 422
+            ),
+            dialog.getByRole('button', { name: 'Delete Organization' }).click(),
+        ]);
+
+        await expect(dialog.getByRole('alert')).toBeVisible();
+        await expect(dialog).toBeVisible();
+    });
+
+    test('can switch the current organization via the organization switcher', async ({ page }) => {
+        await page.goto(PLAYWRIGHT_BASE_URL + '/dashboard');
+        const orgSwitcher = page.locator('[data-testid="organization_switcher"]:visible');
+        await expect(orgSwitcher).toBeVisible();
+        const previousOrgNameLines = (await orgSwitcher.innerText())
+            .split('\n')
+            .map((line) => line.trim())
+            .filter(Boolean);
+        const previousOrgName = previousOrgNameLines[previousOrgNameLines.length - 1];
+
+        // Ensure there are at least two organizations to switch between.
+        const orgName = 'SwitchOrg' + Math.floor(Math.random() * 100000);
+        await createOrganization(page, orgName);
+
+        await expect(orgSwitcher).toContainText(orgName);
+
+        // Open the switcher and pick a different organization.
+        await orgSwitcher.click();
+        await expect(page.getByText('Switch Organizations')).toBeVisible();
+        const otherOrgButton = page.getByRole('menuitem', { name: previousOrgName });
+        await expect(otherOrgButton).toBeVisible();
+
+        await Promise.all([
+            page.waitForResponse(
+                (response) =>
+                    response.url().includes('/users/me/current-organization') &&
+                    response.request().method() === 'PUT' &&
+                    response.status() === 200
+            ),
+            otherOrgButton.click(),
+        ]);
+
+        await expect(orgSwitcher).not.toContainText(orgName, { timeout: 10000 });
+        await expect(orgSwitcher).toContainText(previousOrgName, { timeout: 10000 });
+    });
+});
+
 // =============================================
 // Admin Permission Tests
 // =============================================
 
 test.describe('Admin Organization Settings Access', () => {
     test('admin can see and edit organization settings', async ({ ctx, admin }) => {
-        await admin.page.goto(PLAYWRIGHT_BASE_URL + '/teams/' + ctx.orgId);
+        await admin.page.goto(PLAYWRIGHT_BASE_URL + '/organizations/' + ctx.orgId);
 
         // Organization Name section is visible
         await expect(
@@ -396,6 +575,9 @@ test.describe('Admin Organization Settings Access', () => {
         // Save buttons should be visible (admin can update)
         await expect(admin.page.getByRole('button', { name: 'Save' }).first()).toBeVisible();
 
+        // The Organization Name input is editable (admin can update)
+        await expect(admin.page.getByLabel('Organization Name')).toBeEnabled();
+
         // Delete organization should NOT be visible (owner only)
         await expect(
             admin.page.getByRole('heading', { name: 'Delete Organization' })
@@ -409,13 +591,17 @@ test.describe('Admin Organization Settings Access', () => {
 
 test.describe('Employee Organization Settings Restrictions', () => {
     test('employee can see org name but not editable settings', async ({ ctx, employee }) => {
-        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/teams/' + ctx.orgId);
+        await employee.page.goto(PLAYWRIGHT_BASE_URL + '/organizations/' + ctx.orgId);
 
         // Organization Name section is visible (but inputs are disabled)
         await expect(
             employee.page.getByRole('heading', { name: 'Organization Name', level: 3 })
         ).toBeVisible({ timeout: 10000 });
 
+        // The name and currency inputs are rendered but disabled (employee cannot update)
+        await expect(employee.page.getByLabel('Organization Name')).toBeDisabled();
+        await expect(employee.page.getByLabel('Currency')).toBeDisabled();
+
         // Editable settings sections should NOT be visible
         await expect(
             employee.page.getByRole('heading', { name: 'Billable Rate', level: 3 })
@@ -429,5 +615,10 @@ test.describe('Employee Organization Settings Restrictions', () => {
 
         // Save button should not be visible (employee cannot update)
         await expect(employee.page.getByRole('button', { name: 'Save' })).not.toBeVisible();
+
+        // Delete organization should NOT be visible (owner only)
+        await expect(
+            employee.page.getByRole('heading', { name: 'Delete Organization' })
+        ).not.toBeVisible();
     });
 });

e2e/profile.spec.ts

@@ -342,8 +342,8 @@ test('delete account shows an error when the password is wrong', async ({ page }
     await Promise.all([
         page.waitForResponse(
             (response) =>
-                response.url().includes('/user/confirm-password') &&
+                response.url().includes('/api/v1/users/') &&
-                response.request().method() === 'POST' &&
+                response.request().method() === 'DELETE' &&
                 response.status() === 422
         ),
         dialog.getByRole('button', { name: 'Delete Account' }).click(),

e2e/two-factor.spec.ts

@@ -0,0 +1,192 @@
+import { test, expect } from '../playwright/fixtures';
+import { PLAYWRIGHT_BASE_URL, TEST_USER_PASSWORD } from '../playwright/config';
+import { generateTotpCode, generateInvalidTotpCode } from './utils/totp';
+import type { Page } from '@playwright/test';
+
+async function goToProfilePage(page: Page) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/user/profile');
+}
+
+/**
+ * ConfirmsPassword only opens the dialog when the password has not been
+ * confirmed recently, so fill it only when it actually shows up.
+ */
+async function confirmPasswordIfPrompted(page: Page) {
+    const dialog = page.getByRole('dialog');
+    const appeared = await dialog
+        .waitFor({ state: 'visible', timeout: 2500 })
+        .then(() => true)
+        .catch(() => false);
+    if (appeared) {
+        await dialog.getByPlaceholder('Password').fill(TEST_USER_PASSWORD);
+        await dialog.getByRole('button', { name: 'Confirm' }).click();
+        await expect(dialog).not.toBeVisible();
+    }
+}
+
+/**
+ * Enables 2FA from the profile page and returns the TOTP secret (setup key)
+ * and the recovery codes fetched right after enabling.
+ */
+async function enableTwoFactor(page: Page): Promise<{ secret: string; recoveryCodes: string[] }> {
+    await goToProfilePage(page);
+    await page
+        .getByText('You have not enabled two factor authentication.')
+        .locator('..')
+        .getByRole('button', { name: 'Enable' })
+        .click();
+
+    const dialog = page.getByRole('dialog');
+    await expect(dialog).toBeVisible();
+
+    const recoveryCodesResponse = page.waitForResponse(
+        (response) =>
+            response.url().includes('/user/two-factor-recovery-codes') &&
+            response.request().method() === 'GET'
+    );
+    await dialog.getByPlaceholder('Password').fill(TEST_USER_PASSWORD);
+    await dialog.getByRole('button', { name: 'Confirm' }).click();
+
+    await expect(page.getByRole('heading', { name: 'Finish enabling two factor' })).toBeVisible();
+    const recoveryCodes: string[] = await (await recoveryCodesResponse).json();
+
+    const setupKeyText = await page.getByText('Setup Key:').textContent();
+    const secret = setupKeyText!.replace('Setup Key:', '').trim();
+    expect(secret.length).toBeGreaterThan(0);
+
+    return { secret, recoveryCodes };
+}
+
+/**
+ * Confirms a freshly enabled 2FA setup with a valid TOTP code.
+ */
+async function confirmTwoFactor(page: Page, secret: string) {
+    await page.getByLabel('Code').fill(generateTotpCode(secret));
+    await page.getByRole('button', { name: 'Confirm', exact: true }).click();
+    await confirmPasswordIfPrompted(page);
+    await expect(page.getByText('You have enabled two factor authentication.')).toBeVisible();
+}
+
+async function logout(page: Page) {
+    await page.getByTestId('current_user_button').click();
+    await page.getByText('Log Out', { exact: true }).click();
+    await page.waitForURL(PLAYWRIGHT_BASE_URL + '/login');
+}
+
+/**
+ * Reads the email of the current user from the profile form, waiting until
+ * the user query has populated it.
+ */
+async function getProfileEmail(page: Page): Promise<string> {
+    await goToProfilePage(page);
+    const emailInput = page.getByLabel('Email', { exact: true });
+    await expect(emailInput).toHaveValue(/@/);
+    return await emailInput.inputValue();
+}
+
+async function loginUntilTwoFactorChallenge(page: Page, email: string) {
+    await page.goto(PLAYWRIGHT_BASE_URL + '/login');
+    await page.getByLabel('Email').fill(email);
+    await page.getByLabel('Password').fill(TEST_USER_PASSWORD);
+    await page.getByRole('button', { name: 'Log in' }).click();
+    await page.waitForURL(PLAYWRIGHT_BASE_URL + '/two-factor-challenge');
+}
+
+test('test that 2FA can be confirmed with a TOTP code and shows recovery codes', async ({
+    page,
+}) => {
+    const { secret, recoveryCodes } = await enableTwoFactor(page);
+    await confirmTwoFactor(page, secret);
+
+    await expect(page.getByText('Store these recovery codes')).toBeVisible();
+    expect(recoveryCodes.length).toBeGreaterThan(0);
+    for (const code of recoveryCodes) {
+        await expect(page.getByText(code)).toBeVisible();
+    }
+
+    // The confirmed state survives a reload
+    await page.reload();
+    await expect(page.getByText('You have enabled two factor authentication.')).toBeVisible();
+});
+
+test('test that 2FA confirmation fails with an invalid TOTP code', async ({ page }) => {
+    const { secret } = await enableTwoFactor(page);
+
+    await page.getByLabel('Code').fill(generateInvalidTotpCode(secret));
+    await page.getByRole('button', { name: 'Confirm', exact: true }).click();
+    await confirmPasswordIfPrompted(page);
+
+    await expect(page.getByRole('alert')).toContainText(
+        'The provided two factor authentication code was invalid.'
+    );
+    await expect(page.getByRole('heading', { name: 'Finish enabling two factor' })).toBeVisible();
+});
+
+test('test that recovery codes can be regenerated', async ({ page }) => {
+    const { secret, recoveryCodes } = await enableTwoFactor(page);
+    await confirmTwoFactor(page, secret);
+
+    const newCodesResponse = page.waitForResponse(
+        (response) =>
+            response.url().includes('/user/two-factor-recovery-codes') &&
+            response.request().method() === 'GET'
+    );
+    await page.getByRole('button', { name: 'Regenerate Recovery Codes' }).click();
+    await confirmPasswordIfPrompted(page);
+    const newCodes: string[] = await (await newCodesResponse).json();
+
+    expect(newCodes).not.toEqual(recoveryCodes);
+    await expect(page.getByText(newCodes[0])).toBeVisible();
+    await expect(page.getByText(recoveryCodes[0])).not.toBeVisible();
+});
+
+test('test that 2FA can be disabled', async ({ page }) => {
+    const { secret } = await enableTwoFactor(page);
+    await confirmTwoFactor(page, secret);
+
+    await page.getByRole('button', { name: 'Disable' }).click();
+    await confirmPasswordIfPrompted(page);
+    await expect(page.getByText('You have not enabled two factor authentication.')).toBeVisible();
+
+    // The disabled state survives a reload
+    await page.reload();
+    await expect(page.getByText('You have not enabled two factor authentication.')).toBeVisible();
+});
+
+test('test that login challenges for a TOTP code and rejects an invalid code', async ({ page }) => {
+    const email = await getProfileEmail(page);
+
+    const { secret } = await enableTwoFactor(page);
+    await confirmTwoFactor(page, secret);
+    await logout(page);
+
+    await loginUntilTwoFactorChallenge(page, email);
+
+    await page.getByLabel('Code').fill(generateInvalidTotpCode(secret));
+    await page.getByRole('button', { name: 'Log in' }).click();
+    await expect(page.getByRole('alert')).toContainText(
+        'The provided two factor authentication code was invalid.'
+    );
+
+    // Fortify rejects replayed codes, and the current window's code was
+    // already consumed when confirming the setup — use the next window's
+    // code, which the +/- 1 step verification window also accepts.
+    await page.getByLabel('Code').fill(generateTotpCode(secret, Date.now() + 30_000));
+    await page.getByRole('button', { name: 'Log in' }).click();
+    await expect(page.getByTestId('dashboard_view')).toBeVisible();
+});
+
+test('test that login works with a recovery code', async ({ page }) => {
+    const email = await getProfileEmail(page);
+
+    const { secret, recoveryCodes } = await enableTwoFactor(page);
+    await confirmTwoFactor(page, secret);
+    await logout(page);
+
+    await loginUntilTwoFactorChallenge(page, email);
+
+    await page.getByRole('button', { name: 'Use a recovery code' }).click();
+    await page.getByLabel('Recovery Code').fill(recoveryCodes[0]);
+    await page.getByRole('button', { name: 'Log in' }).click();
+    await expect(page.getByTestId('dashboard_view')).toBeVisible();
+});

e2e/utils/api.ts

@@ -641,10 +641,13 @@ export async function updateOrganizationCurrencyViaWeb(
     const xsrfCookie = cookies.find((c) => c.name === 'XSRF-TOKEN');
     const xsrfToken = xsrfCookie ? decodeURIComponent(xsrfCookie.value) : '';
 
-    const response = await page.request.put(`${PLAYWRIGHT_BASE_URL}/teams/${ctx.orgId}`, {
+    const response = await page.request.put(
-        headers: { 'X-XSRF-TOKEN': xsrfToken },
+        `${PLAYWRIGHT_BASE_URL}/api/v1/organizations/${ctx.orgId}`,
-        data: { name, currency },
+        {
-    });
+            headers: { 'X-XSRF-TOKEN': xsrfToken },
+            data: { name, currency },
+        }
+    );
     expect(response.status()).toBe(200);
 }
 
@@ -801,53 +804,23 @@ export async function getCurrentUserViaApi(ctx: TestContext) {
     };
 }
 
-export async function updateUserProfileViaWeb(
+export async function updateUserProfileViaApi(
-    page: Page,
+    ctx: TestContext,
     settings: { timezone?: string; week_start?: string }
 ) {
-    // Read user info from Inertia's data-page attribute on the root element
+    const user = await getCurrentUserViaApi(ctx);
-    const userInfo = await page.evaluate(() => {
-        // Try Inertia's data-page attribute (stores initial page props as JSON)
-        const appEl = document.getElementById('app');
-        if (appEl) {
-            const dataPage = appEl.getAttribute('data-page');
-            if (dataPage) {
-                try {
-                    const parsed = JSON.parse(dataPage);
-                    const user = parsed?.props?.auth?.user;
-                    if (user) {
-                        return {
-                            name: user.name,
-                            email: user.email,
-                            timezone: user.timezone,
-                            week_start: user.week_start,
-                        };
-                    }
-                } catch {
-                    // JSON parse failed
-                }
-            }
-        }
-        return null;
-    });
-    if (!userInfo) throw new Error('Could not read user info from Inertia data-page attribute');
 
-    const cookies = await page.context().cookies();
+    // Only send the fields under test; the endpoint leaves omitted fields untouched.
-    const xsrfCookie = cookies.find((c) => c.name === 'XSRF-TOKEN');
+    const data: Record<string, string> = {};
-    const xsrfToken = xsrfCookie ? decodeURIComponent(xsrfCookie.value) : '';
+    if (settings.timezone !== undefined) {
+        data.timezone = settings.timezone;
+    }
+    if (settings.week_start !== undefined) {
+        data.week_start = settings.week_start;
+    }
 
-    const response = await page.request.put(`${PLAYWRIGHT_BASE_URL}/user/profile-information`, {
+    const response = await ctx.request.put(`${PLAYWRIGHT_BASE_URL}/api/v1/users/${user.id}`, {
-        headers: {
+        data,
-            'X-XSRF-TOKEN': xsrfToken,
-            'Content-Type': 'application/json',
-            Accept: 'application/json',
-        },
-        data: {
-            name: userInfo.name,
-            email: userInfo.email,
-            timezone: settings.timezone ?? userInfo.timezone,
-            week_start: settings.week_start ?? userInfo.week_start,
-        },
     });
     expect(response.status()).toBe(200);
 }

e2e/utils/totp.ts

@@ -0,0 +1,58 @@
+import { createHmac } from 'node:crypto';
+
+const BASE32_ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';
+
+function base32Decode(input: string): Buffer {
+    const normalized = input
+        .toUpperCase()
+        .replace(/=+$/, '')
+        .replace(/[^A-Z2-7]/g, '');
+    let bits = 0;
+    let value = 0;
+    const bytes: number[] = [];
+    for (const char of normalized) {
+        value = (value << 5) | BASE32_ALPHABET.indexOf(char);
+        bits += 5;
+        if (bits >= 8) {
+            bytes.push((value >>> (bits - 8)) & 0xff);
+            bits -= 8;
+        }
+    }
+    return Buffer.from(bytes);
+}
+
+/**
+ * Generates a 6-digit TOTP code (RFC 6238, SHA-1, 30 second period) for the
+ * given base32 secret — the "Setup Key" shown while enabling 2FA.
+ */
+export function generateTotpCode(base32Secret: string, atMs: number = Date.now()): string {
+    const counter = Math.floor(atMs / 1000 / 30);
+    const counterBuffer = Buffer.alloc(8);
+    counterBuffer.writeBigUInt64BE(BigInt(counter));
+    const digest = createHmac('sha1', base32Decode(base32Secret)).update(counterBuffer).digest();
+    const offset = digest[digest.length - 1] & 0x0f;
+    const code =
+        ((digest[offset] & 0x7f) << 24) |
+        ((digest[offset + 1] & 0xff) << 16) |
+        ((digest[offset + 2] & 0xff) << 8) |
+        (digest[offset + 3] & 0xff);
+    return (code % 1_000_000).toString().padStart(6, '0');
+}
+
+/**
+ * Generates a syntactically valid TOTP code that is guaranteed to be rejected,
+ * by using a timestamp far outside the accepted verification window.
+ */
+export function generateInvalidTotpCode(base32Secret: string): string {
+    const validNow = [
+        generateTotpCode(base32Secret, Date.now() - 30_000),
+        generateTotpCode(base32Secret),
+        generateTotpCode(base32Secret, Date.now() + 30_000),
+    ];
+    for (let minutes = 10; ; minutes++) {
+        const candidate = generateTotpCode(base32Secret, Date.now() + minutes * 60_000);
+        if (!validNow.includes(candidate)) {
+            return candidate;
+        }
+    }
+}

lang/en/importer.php

@@ -5,7 +5,8 @@ declare(strict_types=1);
 return [
     'clockify_time_entries' => [
         'name' => 'Clockify Time Entries',
-        'description' => '1. First make sure that you set the Date format to "MM/DD/YYYY" and the Time format to "12-hour" in the user settings.<br>'.
+        'description' => '<strong>Important:</strong> If you also want to import your projects use the "Clockify Projects" importer before this one, since that export contains more details such as billable status, billable rates and estimated time.<br><br>'.
+            '1. First make sure that you set the Date format to "MM/DD/YYYY" and the Time format to "12-hour" in the user settings.<br>'.
             '2. In the same preferences page change the language of Clockfiy to English.<br>'.
             '3. Go to REPORTS -> TIME -> Detailed in the navigation on the left. <br>'.
             '4. Now select the date range that you want to export in the right top. '.
@@ -61,7 +62,8 @@ return [
     ],
     'harvest_time_entries' => [
         'name' => 'Harvest Time Entries',
-        'description' => '1. Go to Settings (right top corner)<br>2. Click on "Import/Export" in the left navigation'.
+        'description' => '<strong>Important:</strong> If you also want to import your projects use the "Harvest Projects" importer before this one, since that export contains more details such as billable status and estimated time.<br><br>'.
+            '1. Go to Settings (right top corner)<br>2. Click on "Import/Export" in the left navigation'.
             '<br>3. Now click on "Export all time" '.
             '<br><br>Before you import make sure that the Timezone settings in Harvest are the same as in solidtime.',
     ],

resources/js/Components/OrganizationSwitcher.vue

@@ -61,7 +61,7 @@ const switchToTeam = (organization: Organization) => {
 
                 <DropdownMenuItem as-child>
                     <Link
-                        :href="route('teams.show', page.props.auth.user.current_team.id)"
+                        :href="route('organizations.show', page.props.auth.user.current_team.id)"
                         class="inline-flex items-center gap-2.5 w-full">
                         <Cog6ToothIcon class="w-5 h-5 text-icon-default" />
                         <span>Organization Settings</span>
@@ -74,7 +74,7 @@ const switchToTeam = (organization: Organization) => {
 
                 <DropdownMenuItem as-child>
                     <Link
-                        :href="route('teams.create')"
+                        :href="route('organizations.create')"
                         class="inline-flex items-center gap-2.5 w-full">
                         <PlusCircleIcon class="w-5 h-5 text-icon-default" />
                         <span>Create new organization</span>

resources/js/Components/Timesheet/TimesheetCell.test.ts

@@ -62,4 +62,35 @@ describe('TimesheetCell', () => {
         expect(wrapper.emitted('update')).toBeUndefined();
         expect((input.element as HTMLInputElement).value).toBe(previousValue);
     });
+
+    it('shows a pending 0 (delete in flight) over the cell total', () => {
+        const wrapper = mount(TimesheetCell, {
+            props: {
+                cell: buildCell(2 * 3600),
+                dayIndex: 0,
+                date: '2026-04-13',
+                isToday: false,
+                hasRunningEntry: false,
+                pendingSeconds: 0,
+            },
+        });
+
+        // `??` (not `||`): a pending 0 must win over the 2h cell total.
+        expect((wrapper.get('input').element as HTMLInputElement).value).toBe('');
+    });
+
+    it('disables editing while the cell is saving', () => {
+        const wrapper = mount(TimesheetCell, {
+            props: {
+                cell: buildCell(2 * 3600),
+                dayIndex: 0,
+                date: '2026-04-13',
+                isToday: false,
+                hasRunningEntry: false,
+                saveStatus: 'saving',
+            },
+        });
+
+        expect((wrapper.get('input').element as HTMLInputElement).disabled).toBe(true);
+    });
 });

resources/js/Components/Timesheet/TimesheetCell.vue

@@ -1,5 +1,8 @@
 <script setup lang="ts">
+import { computed } from 'vue';
+import { CheckIcon } from '@heroicons/vue/16/solid';
 import DurationSecondsInput from '@/packages/ui/src/Input/DurationSecondsInput.vue';
+import LoadingSpinner from '@/packages/ui/src/LoadingSpinner.vue';
 import {
     Tooltip,
     TooltipContent,
@@ -7,18 +10,40 @@ import {
     TooltipTrigger,
 } from '@/packages/ui/src/tooltip';
 import type { TimesheetCell } from '@/utils/useTimesheetGrid';
+import type { CellSaveStatus } from '@/utils/timesheet/useTimesheetCellMutations';
 
-defineProps<{
+const props = defineProps<{
     cell?: TimesheetCell;
     dayIndex: number;
     date: string;
     isToday: boolean;
     hasRunningEntry: boolean;
+    saveStatus?: CellSaveStatus;
+    pendingSeconds?: number;
 }>();
 
 const emit = defineEmits<{
     update: [newSeconds: number];
 }>();
+
+// Show the optimistic value while saving; `??` (not `||`) so a pending 0 (delete) wins.
+const displaySeconds = computed(() => props.pendingSeconds ?? props.cell?.totalSeconds ?? 0);
+const isSaving = computed(() => props.saveStatus === 'saving');
+
+// Swap the border color (don't layer) to avoid same-specificity fights.
+const inputClass = computed(() => {
+    const border = props.saveStatus === 'error' ? 'border-red-500/70' : 'border-input-border';
+    return [
+        'w-[80px] mx-auto text-center font-medium',
+        'bg-transparent text-text-primary placeholder:text-text-quaternary',
+        'rounded-lg border shadow-none',
+        border,
+        'hover:bg-card-background',
+        'focus-visible:bg-tertiary focus-visible:border-transparent',
+        'focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none',
+        'disabled:cursor-wait disabled:opacity-70',
+    ].join(' ');
+});
 </script>
 
 <template>
@@ -46,18 +71,26 @@ const emit = defineEmits<{
                 <TooltipContent> Stop the running time entry to edit the timesheet </TooltipContent>
             </Tooltip>
         </TooltipProvider>
-        <DurationSecondsInput
+        <template v-else>
-            v-else
+            <span class="relative inline-flex items-center">
-            :model-value="cell?.totalSeconds ?? 0"
+                <DurationSecondsInput
-            default-unit="hours"
+                    :model-value="displaySeconds"
-            placeholder="-"
+                    default-unit="hours"
-            size="sm"
+                    placeholder="-"
-            input-class="w-[80px] mx-auto text-center font-medium
+                    size="sm"
-                bg-transparent text-text-primary placeholder:text-text-quaternary
+                    :disabled="isSaving"
-                rounded-lg border border-input-border shadow-none
+                    :input-class="inputClass"
-                hover:bg-card-background
+                    @commit="(seconds) => emit('update', seconds ?? 0)" />
-                focus-visible:bg-tertiary focus-visible:border-transparent
+                <span
-                focus-visible:ring-2 focus-visible:ring-ring focus-visible:outline-none"
+                    v-if="saveStatus === 'saving' || saveStatus === 'saved'"
-            @commit="(seconds) => emit('update', seconds ?? 0)" />
+                    class="pointer-events-none absolute left-full top-1/2 ml-1.5 flex -translate-y-1/2 items-center"
+                    :aria-label="saveStatus === 'saving' ? 'Saving' : 'Saved'">
+                    <LoadingSpinner
+                        v-if="saveStatus === 'saving'"
+                        class="h-3 w-3 m-0 text-text-tertiary" />
+                    <CheckIcon v-else class="h-3 w-3 text-text-tertiary" />
+                </span>
+            </span>
+        </template>
     </div>
 </template>

resources/js/Components/Timesheet/TimesheetGrid.vue

@@ -15,6 +15,7 @@ import type {
     Task,
 } from '@/packages/api/src';
 import type { TimesheetRow as TimesheetRowType, TimesheetRowKey } from '@/utils/useTimesheetGrid';
+import type { CellSaveStatus } from '@/utils/timesheet/useTimesheetCellMutations';
 
 const organization = inject<ComputedRef<Organization>>('organization');
 const dayjs = getDayJsInstance();
@@ -36,6 +37,8 @@ defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     createTag: (name: string) => Promise<Tag | undefined>;
     formatDuration: (seconds: number) => string;
+    cellStatuses: Record<string, CellSaveStatus>;
+    cellPendingSeconds: Record<string, number>;
 }>();
 
 const emit = defineEmits<{
@@ -60,7 +63,7 @@ const emit = defineEmits<{
                 class="grid min-w-full w-max border-y border-default-background-separator"
                 style="
                     grid-template-columns:
-                        minmax(420px, 1fr) repeat(7, minmax(96px, 120px)) minmax(100px, auto)
+                        minmax(420px, 1fr) repeat(7, minmax(116px, 120px)) minmax(100px, auto)
                         40px;
                 ">
                 <!-- Header row -->
@@ -100,6 +103,8 @@ const emit = defineEmits<{
                     :create-client="createClient"
                     :create-tag="createTag"
                     :format-duration="formatDuration"
+                    :cell-statuses="cellStatuses"
+                    :cell-pending-seconds="cellPendingSeconds"
                     @remove-row="$emit('remove-row', $event)"
                     @cell-update="
                         (dayIndex, seconds) => $emit('cell-update', row, dayIndex, seconds)

resources/js/Components/Timesheet/TimesheetRow.vue

@@ -15,6 +15,10 @@ import type {
     Organization,
 } from '@/packages/api/src';
 import type { TimesheetRow, TimesheetRowKey } from '@/utils/useTimesheetGrid';
+import {
+    makeCellStatusKey,
+    type CellSaveStatus,
+} from '@/utils/timesheet/useTimesheetCellMutations';
 import { Button } from '@/packages/ui/src/Buttons';
 
 const organization = inject<ComputedRef<Organization>>('organization');
@@ -34,6 +38,8 @@ const props = defineProps<{
     createClient: (client: CreateClientBody) => Promise<Client | undefined>;
     createTag: (name: string) => Promise<Tag | undefined>;
     formatDuration: (seconds: number) => string;
+    cellStatuses: Record<string, CellSaveStatus>;
+    cellPendingSeconds: Record<string, number>;
 }>();
 
 const emit = defineEmits<{
@@ -109,6 +115,8 @@ function hasRunningEntry(dayIndex: number): boolean {
             :date="day"
             :is-today="day === todayDate"
             :has-running-entry="hasRunningEntry(dayIndex)"
+            :save-status="cellStatuses[makeCellStatusKey(row.key, dayIndex)]"
+            :pending-seconds="cellPendingSeconds[makeCellStatusKey(row.key, dayIndex)]"
             @update="(seconds) => emit('cellUpdate', dayIndex, seconds)" />
 
         <!-- Row total -->

resources/js/Layouts/AppLayout.vue

@@ -280,10 +280,15 @@ const page = usePage<{
                                 v-if="canUpdateOrganization()"
                                 title="Settings"
                                 :icon="Cog6ToothIcon"
-                                :href="route('teams.show', page.props.auth.user.current_team.id)"
+                                :href="
+                                    route(
+                                        'organizations.show',
+                                        page.props.auth.user.current_team.id
+                                    )
+                                "
                                 :current="
                                     route().current(
-                                        'teams.show',
+                                        'organizations.show',
                                         page.props.auth.user.current_team.id
                                     )
                                 "></NavigationSidebarItem>
@@ -293,7 +298,7 @@ const page = usePage<{
                 <div class="justify-self-end">
                     <UpdateSidebarNotification></UpdateSidebarNotification>
                     <ul
-                        class="border-t border-default-background-separator pt-3 gap-1 pr-2 flex justify-between items-center">
+                        class="border-t border-default-background-separator pt-3 gap-1 flex justify-between items-center">
                         <UserSettingsIcon></UserSettingsIcon>
 
                         <NavigationSidebarItem

resources/js/Pages/Profile/Partials/DeleteUserForm.vue

@@ -1,15 +1,14 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import axios from 'axios';
 import ActionSection from '@/Components/ActionSection.vue';
 import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
 import DialogModal from '@/packages/ui/src/DialogModal.vue';
 import { Field, FieldError } from '@/packages/ui/src/field';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
-import { useDeleteUserMutation, useUserQuery } from '@/utils/useUserQuery';
+import { useDeleteUserMutation } from '@/utils/useUserQuery';
+import { getCurrentUserId } from '@/utils/useUser';
 
-const { user } = useUserQuery();
 const deleteUserMutation = useDeleteUserMutation();
 
 const confirmingUserDeletion = ref(false);
@@ -24,26 +23,26 @@ function confirmUserDeletion() {
 }
 
 async function deleteUser() {
-    if (!user.value || processing.value) return;
+    if (processing.value) return;
     processing.value = true;
     passwordError.value = '';
     try {
-        await axios.post(route('password.confirm'), { password: password.value });
+        await deleteUserMutation.mutateAsync({
-    } catch (error) {
+            userId: getCurrentUserId(),
-        processing.value = false;
+            body: { password: password.value },
-        if (axios.isAxiosError(error) && error.response?.status === 422) {
+        });
-            passwordError.value = error.response.data?.errors?.password?.[0] ?? 'Invalid password.';
-        } else {
-            passwordError.value = 'Could not confirm password. Please try again.';
-        }
-        passwordInput.value?.focus();
-        return;
-    }
-    try {
-        await deleteUserMutation.mutateAsync(user.value.id);
         window.location.href = '/';
-    } catch {
+    } catch (error) {
+        if (error && typeof error === 'object' && 'response' in error) {
+            const response = error.response as
+                | { status?: number; data?: { errors?: { password?: string[] } } }
+                | undefined;
+            if (response?.status === 422) {
+                passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
+            }
+        }
         processing.value = false;
+        passwordInput.value?.focus();
     }
 }
 

resources/js/Pages/Profile/Partials/UpdateProfileInformationForm.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, ref, watch } from 'vue';
 import { usePage } from '@inertiajs/vue3';
-import axios from 'axios';
 import ActionMessage from '@/Components/ActionMessage.vue';
 import FormSection from '@/Components/FormSection.vue';
 import { Field, FieldError, FieldLabel } from '@/packages/ui/src/field';
@@ -16,6 +15,7 @@ import {
     useUserQuery,
 } from '@/utils/useUserQuery';
 import type { UpdateUserBody, User } from '@/packages/api/src';
+import { getApiValidationFieldErrors } from '@/utils/apiValidation';
 
 const { user } = useUserQuery();
 const updateUser = useUpdateUserMutation();
@@ -58,17 +58,9 @@ const hasUploadedPhoto = computed(() => {
     return !!url && !url.includes('ui-avatars.com');
 });
 
-const fieldErrors = computed<Record<string, string>>(() => {
+const fieldErrors = computed<Record<string, string>>(() =>
-    const err = updateUser.error.value;
+    getApiValidationFieldErrors(updateUser.error.value)
-    if (!axios.isAxiosError(err) || err.response?.status !== 422) return {};
+);
-    const raw = err.response.data?.errors as Record<string, string[]> | undefined;
-    if (!raw) return {};
-    const flat: Record<string, string> = {};
-    for (const [key, messages] of Object.entries(raw)) {
-        if (Array.isArray(messages) && messages[0]) flat[key] = messages[0];
-    }
-    return flat;
-});
 
 function buildPayload(): UpdateUserBody {
     if (!user.value) return {};

resources/js/Pages/Teams/Partials/CreateTeamForm.vue

@@ -1,25 +1,68 @@
 <script setup lang="ts">
-import { useForm, usePage } from '@inertiajs/vue3';
+import { computed, ref, watch } from 'vue';
+import axios from 'axios';
+import { router, usePage } from '@inertiajs/vue3';
 import FormSection from '@/Components/FormSection.vue';
-import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
+import { Field, FieldError, FieldLabel } from '@/packages/ui/src/field';
 import PrimaryButton from '@/packages/ui/src/Buttons/PrimaryButton.vue';
 import TextInput from '@/packages/ui/src/Input/TextInput.vue';
 import type { User } from '@/types/models';
-import { initializeStores } from '@/utils/init';
+import { useOrganizationStore } from '@/utils/useOrganization';
+import { useNotificationsStore } from '@/utils/notification';
+import {
+    getApiValidationFieldErrors,
+    getApiValidationMessage,
+    isApiValidationError,
+} from '@/utils/apiValidation';
 
-const form = useForm({
+const name = ref('');
-    name: '',
+const processing = ref(false);
+const createError = ref<unknown>(null);
+const organizationStore = useOrganizationStore();
+const notifications = useNotificationsStore();
+
+const fieldErrors = computed<Record<string, string>>(() =>
+    getApiValidationFieldErrors(createError.value)
+);
+
+watch(name, () => {
+    createError.value = null;
 });
 
-const createTeam = () => {
+const createTeam = async () => {
-    form.post(route('teams.store'), {
+    processing.value = true;
-        errorBag: 'createTeam',
+    createError.value = null;
-        preserveScroll: true,
+    try {
-        onSuccess: () => {
+        const organization = await organizationStore.createOrganization(name.value);
-            initializeStores();
+        if (organization) {
-        },
+            notifications.addNotification('success', 'Organization created successfully');
-    });
+            // The backend already switched the current organization to the new one.
+            // Flush Inertia's prefetch cache and do a full reload so the new
+            // organization context is picked up everywhere.
+            router.flushAll();
+            router.visit(route('dashboard'));
+        }
+    } catch (error) {
+        createError.value = error;
+        if (isApiValidationError(error)) {
+            notifications.addNotification(
+                'error',
+                getApiValidationMessage(error, 'Failed to create organization')
+            );
+        } else if (axios.isAxiosError(error)) {
+            notifications.addNotification(
+                'error',
+                'Failed to create organization',
+                error.response?.data?.message ?? 'Please try again later.'
+            );
+        } else {
+            notifications.addNotification('error', 'Failed to create organization');
+        }
+    } finally {
+        processing.value = false;
+    }
 };
+
 const page = usePage<{
     auth: {
         user: User;
@@ -60,16 +103,17 @@ const page = usePage<{
                 <FieldLabel for="name">Organization Name</FieldLabel>
                 <TextInput
                     id="name"
-                    v-model="form.name"
+                    v-model="name"
                     type="text"
                     class="block w-full"
-                    autofocus />
+                    autofocus
-                <FieldError v-if="form.errors.name">{{ form.errors.name }}</FieldError>
+                    :aria-invalid="Boolean(fieldErrors.name)" />
+                <FieldError v-if="fieldErrors.name">{{ fieldErrors.name }}</FieldError>
             </Field>
         </template>
 
         <template #actions>
-            <PrimaryButton :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
+            <PrimaryButton :class="{ 'opacity-25': processing }" :disabled="processing">
                 Create
             </PrimaryButton>
         </template>

resources/js/Pages/Teams/Partials/DeleteTeamForm.vue

@@ -1,26 +1,58 @@
 <script setup lang="ts">
 import { ref } from 'vue';
-import { useForm } from '@inertiajs/vue3';
+import { router } from '@inertiajs/vue3';
 import ActionSection from '@/Components/ActionSection.vue';
-import ConfirmationModal from '@/Components/ConfirmationModal.vue';
 import DangerButton from '@/packages/ui/src/Buttons/DangerButton.vue';
+import DialogModal from '@/packages/ui/src/DialogModal.vue';
+import { Field, FieldError } from '@/packages/ui/src/field';
 import SecondaryButton from '@/packages/ui/src/Buttons/SecondaryButton.vue';
+import TextInput from '@/packages/ui/src/Input/TextInput.vue';
+import { useOrganizationStore } from '@/utils/useOrganization';
 
-const props = defineProps({
+const props = defineProps<{
-    team: Object,
+    team: { id: string };
-});
+}>();
 
 const confirmingTeamDeletion = ref(false);
-const form = useForm({});
+const passwordInput = ref<HTMLInputElement | null>(null);
+const password = ref('');
+const passwordError = ref('');
+const processing = ref(false);
+const organizationStore = useOrganizationStore();
 
 const confirmTeamDeletion = () => {
     confirmingTeamDeletion.value = true;
+    setTimeout(() => passwordInput.value?.focus(), 250);
 };
 
-const deleteTeam = () => {
+const deleteTeam = async () => {
-    form.delete(route('teams.destroy', props.team), {
+    if (processing.value) return;
-        errorBag: 'deleteTeam',
+    processing.value = true;
-    });
+    passwordError.value = '';
+    try {
+        await organizationStore.deleteOrganization(props.team.id, { password: password.value });
+        // The backend reassigns the user's current organization after deletion,
+        // so flush the prefetch cache and reload into the dashboard.
+        router.flushAll();
+        router.visit(route('dashboard'));
+    } catch (error) {
+        if (error && typeof error === 'object' && 'response' in error) {
+            const response = error.response as
+                | { status?: number; data?: { errors?: { password?: string[] } } }
+                | undefined;
+            if (response?.status === 422) {
+                passwordError.value = response.data?.errors?.password?.[0] ?? 'Invalid password.';
+            }
+        }
+        processing.value = false;
+        passwordInput.value?.focus();
+    }
+};
+
+const closeModal = () => {
+    confirmingTeamDeletion.value = false;
+    password.value = '';
+    passwordError.value = '';
 };
 </script>
 
@@ -42,30 +74,40 @@ const deleteTeam = () => {
             </div>
 
             <!-- Delete Organization Confirmation Modal -->
-            <ConfirmationModal
+            <DialogModal :show="confirmingTeamDeletion" @close="closeModal">
-                :show="confirmingTeamDeletion"
-                @close="confirmingTeamDeletion = false">
                 <template #title> Delete Organization </template>
 
                 <template #content>
                     Are you sure you want to delete this organization? Once a organization is
-                    deleted, all of its resources and data will be permanently deleted.
+                    deleted, all of its resources and data will be permanently deleted. Please enter
+                    your password to confirm you would like to permanently delete this organization.
+
+                    <Field class="mt-4">
+                        <TextInput
+                            ref="passwordInput"
+                            v-model="password"
+                            type="password"
+                            class="block w-3/4"
+                            placeholder="Password"
+                            autocomplete="current-password"
+                            @keyup.enter="deleteTeam" />
+
+                        <FieldError v-if="passwordError">{{ passwordError }}</FieldError>
+                    </Field>
                 </template>
 
                 <template #footer>
-                    <SecondaryButton @click="confirmingTeamDeletion = false">
+                    <SecondaryButton @click="closeModal"> Cancel </SecondaryButton>
-                        Cancel
-                    </SecondaryButton>
 
                     <DangerButton
                         class="ms-3"
-                        :class="{ 'opacity-25': form.processing }"
+                        :class="{ 'opacity-25': processing }"
-                        :disabled="form.processing"
+                        :disabled="processing"
                         @click="deleteTeam">
                         Delete Organization
                     </DangerButton>
                 </template>
-            </ConfirmationModal>
+            </DialogModal>
         </template>
     </ActionSection>
 </template>

resources/js/Pages/Teams/Partials/UpdateTeamNameForm.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { Link, useForm } from '@inertiajs/vue3';
+import { Link, router } from '@inertiajs/vue3';
+import { reactive, ref } from 'vue';
+import axios from 'axios';
 import ActionMessage from '@/Components/ActionMessage.vue';
 import FormSection from '@/Components/FormSection.vue';
 import { Field, FieldLabel, FieldError } from '@/packages/ui/src/field';
@@ -10,22 +12,66 @@ import type { Permissions } from '@/types/jetstream';
 import { CreditCardIcon } from '@heroicons/vue/20/solid';
 import { isBillingActivated } from '@/utils/billing';
 import { canManageBilling } from '@/utils/permissions';
+import { api } from '@/packages/api/src';
+import { useNotificationsStore } from '@/utils/notification';
+import { getApiValidationFieldErrors, isApiValidationError } from '@/utils/apiValidation';
 
 const props = defineProps<{
     team: Organization;
     permissions: Permissions;
 }>();
 
-const form = useForm({
+const form = reactive({
     name: props.team.name,
     currency: props.team.currency,
 });
 
-const updateTeamName = () => {
+const errors = ref<Record<string, string>>({});
-    form.put(route('teams.update', props.team.id), {
+const processing = ref(false);
-        errorBag: 'updateTeamName',
+const recentlySuccessful = ref(false);
-        preserveScroll: true,
+const notifications = useNotificationsStore();
-    });
+let recentlySuccessfulTimeout: ReturnType<typeof setTimeout> | undefined;
+
+const updateTeamName = async () => {
+    processing.value = true;
+    recentlySuccessful.value = false;
+    errors.value = {};
+    try {
+        await api.updateOrganization(
+            {
+                name: form.name,
+                currency: form.currency,
+            },
+            {
+                params: {
+                    organization: props.team.id,
+                },
+            }
+        );
+        notifications.addNotification('success', 'Organization updated successfully');
+        recentlySuccessful.value = true;
+        if (recentlySuccessfulTimeout) {
+            clearTimeout(recentlySuccessfulTimeout);
+        }
+        recentlySuccessfulTimeout = setTimeout(() => {
+            recentlySuccessful.value = false;
+        }, 2000);
+        router.reload({ only: ['auth', 'team'] });
+    } catch (error) {
+        if (isApiValidationError(error)) {
+            errors.value = getApiValidationFieldErrors(error);
+        } else if (axios.isAxiosError(error)) {
+            notifications.addNotification(
+                'error',
+                'Failed to update organization',
+                error.response?.data?.message ?? 'Please try again later.'
+            );
+        } else {
+            notifications.addNotification('error', 'Failed to update organization');
+        }
+    } finally {
+        processing.value = false;
+    }
 };
 </script>
 
@@ -74,7 +120,7 @@ const updateTeamName = () => {
                     class="block w-full"
                     :disabled="!permissions.canUpdateTeam" />
 
-                <FieldError v-if="form.errors.name">{{ form.errors.name }}</FieldError>
+                <FieldError v-if="errors.name">{{ errors.name }}</FieldError>
             </Field>
 
             <!-- Currency -->
@@ -94,14 +140,14 @@ const updateTeamName = () => {
                         {{ currencyKey }} - {{ currencyTranslated }}
                     </option>
                 </select>
-                <FieldError v-if="form.errors.currency">{{ form.errors.currency }}</FieldError>
+                <FieldError v-if="errors.currency">{{ errors.currency }}</FieldError>
             </Field>
         </template>
 
         <template v-if="permissions.canUpdateTeam" #actions>
-            <ActionMessage :on="form.recentlySuccessful" class="me-3"> Saved. </ActionMessage>
+            <ActionMessage :on="recentlySuccessful" class="me-3"> Saved. </ActionMessage>
 
-            <PrimaryButton :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
+            <PrimaryButton :class="{ 'opacity-25': processing }" :disabled="processing">
                 Save
             </PrimaryButton>
         </template>

resources/js/Pages/Teams/Show.vue

@@ -4,7 +4,7 @@ import DeleteTeamForm from '@/Pages/Teams/Partials/DeleteTeamForm.vue';
 import SectionBorder from '@/Components/SectionBorder.vue';
 import UpdateTeamNameForm from '@/Pages/Teams/Partials/UpdateTeamNameForm.vue';
 import type { Organization } from '@/types/models';
-import type { Permissions, Role } from '@/types/jetstream';
+import type { Permissions } from '@/types/jetstream';
 import OrganizationBillableRate from '@/Pages/Teams/Partials/OrganizationBillableRate.vue';
 import OrganizationFormatSettings from '@/Pages/Teams/Partials/OrganizationFormatSettings.vue';
 import OrganizationTimeEntrySettings from '@/Pages/Teams/Partials/OrganizationTimeEntrySettings.vue';
@@ -14,7 +14,6 @@ import { storeToRefs } from 'pinia';
 
 defineProps<{
     team: Organization;
-    availableRoles: Role[];
     permissions: Permissions;
 }>();
 
@@ -44,17 +43,17 @@ onMounted(async () => {
                 <template v-else>
                     <UpdateTeamNameForm :team="team" :permissions="permissions" />
 
-                    <SectionBorder />
+                    <SectionBorder v-if="permissions.canUpdateTeam" />
                     <OrganizationBillableRate v-if="permissions.canUpdateTeam" :team="team" />
-                    <SectionBorder />
 
+                    <SectionBorder v-if="permissions.canUpdateTeam" />
                     <OrganizationFormatSettings v-if="permissions.canUpdateTeam" :team="team" />
-                    <SectionBorder />
 
+                    <SectionBorder v-if="permissions.canUpdateTeam" />
                     <OrganizationTimeEntrySettings v-if="permissions.canUpdateTeam" />
-                    <SectionBorder />
 
-                    <template v-if="permissions.canDeleteTeam && !team.personal_team">
+                    <template v-if="permissions.canDeleteTeam">
+                        <SectionBorder />
                         <DeleteTeamForm class="mt-10 sm:mt-0" :team="team" />
                     </template>
                 </template>

resources/js/Pages/Timesheet.vue

@@ -90,7 +90,12 @@ const weekRangeDisplay = computed(() => {
 });
 
 // ── Cell / row mutation handlers ──────────────────────────────────
-const { handleCellUpdate } = useTimesheetCellMutations(weekDays, timeEntries, rows, removeSlot);
+const { handleCellUpdate, cellStatus, cellPendingSeconds } = useTimesheetCellMutations(
+    weekDays,
+    timeEntries,
+    rows,
+    removeSlot
+);
 
 const { handleRowIdentityChange, handleAddRow } = useTimesheetRowMutations(
     mutations,
@@ -167,6 +172,8 @@ async function createTag(name: string): Promise<Tag | undefined> {
                 :create-client="createClient"
                 :create-tag="createTag"
                 :format-duration="formatDuration"
+                :cell-statuses="cellStatus"
+                :cell-pending-seconds="cellPendingSeconds"
                 @remove-row="handleRemoveRow"
                 @cell-update="handleCellUpdate"
                 @project-task-change="

resources/js/packages/api/src/index.ts

@@ -114,6 +114,8 @@ export type ApiToken = ApiTokenIndexResponse['data'][0];
 
 export type DetailedInvoiceResponse = ZodiosResponseByAlias<SolidTimeApi, 'getInvoice'>;
 
+export type DetailedInvoice = DetailedInvoiceResponse['data'];
+
 export type InvoiceIndexEntry = ZodiosResponseByAlias<SolidTimeApi, 'getInvoices'>['data'][0];
 
 export type UpdateInvoiceSettings = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoiceSettings'>;
@@ -124,6 +126,8 @@ export type UpdateInvoiceBody = ZodiosBodyByAlias<SolidTimeApi, 'updateInvoice'>
 
 export type User = ZodiosResponseByAlias<SolidTimeApi, 'getMe'>['data'];
 export type UpdateUserBody = ZodiosBodyByAlias<SolidTimeApi, 'updateUser'>;
+export type DeleteUserBody = ZodiosBodyByAlias<SolidTimeApi, 'deleteUser'>;
+export type DeleteOrganizationBody = ZodiosBodyByAlias<SolidTimeApi, 'deleteOrganization'>;
 
 const api = createApiClient('/api', { validate: 'none' });
 

resources/js/packages/api/src/openapi.json.client.ts

@@ -37,6 +37,7 @@ const ClientStoreRequest = z.object({ name: z.string().min(1).max(255) }).passth
 const ClientUpdateRequest = z
     .object({ name: z.string().min(1).max(255), is_archived: z.boolean().optional() })
     .passthrough();
+const DestroyWithPasswordRequest = z.object({ password: z.string() }).passthrough();
 const ImportRequest = z.object({ type: z.string(), data: z.string() }).passthrough();
 const InvitationResource = z
     .object({ id: z.string(), email: z.string(), role: z.string() })
@@ -330,6 +331,7 @@ const OrganizationResource = z
 const OrganizationUpdateRequest = z
     .object({
         name: z.string().max(255),
+        currency: z.string(),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
         employees_can_manage_tasks: z.boolean(),
@@ -803,6 +805,39 @@ const endpoints = makeApi([
             z.object({ code: z.string(), name: z.string(), symbol: z.string() }).passthrough()
         ),
     },
+    {
+        method: 'post',
+        path: '/v1/organizations',
+        alias: 'createOrganization',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ name: z.string().max(255) }).passthrough(),
+            },
+        ],
+        response: z.object({ data: OrganizationResource }).passthrough(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .passthrough(),
+            },
+        ],
+    },
     {
         method: 'get',
         path: '/v1/organizations/:organization',
@@ -877,6 +912,42 @@ const endpoints = makeApi([
             },
         ],
     },
+    {
+        method: 'delete',
+        path: '/v1/organizations/:organization',
+        alias: 'deleteOrganization',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: DestroyWithPasswordRequest,
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.void(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+        ],
+    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/charts/daily-tracked-hours',
@@ -1898,6 +1969,54 @@ const endpoints = makeApi([
             },
         ],
     },
+    {
+        method: 'post',
+        path: '/v1/organizations/:organization/invoices/:invoice/copy',
+        alias: 'copyInvoice',
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ reference: z.string() }).passthrough(),
+            },
+            {
+                name: 'organization',
+                type: 'Path',
+                schema: z.string(),
+            },
+            {
+                name: 'invoice',
+                type: 'Path',
+                schema: z.string(),
+            },
+        ],
+        response: z.object({ data: DetailedInvoiceResource }).passthrough(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 404,
+                description: `Not found`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .passthrough(),
+            },
+        ],
+    },
     {
         method: 'get',
         path: '/v1/organizations/:organization/invoices/:invoice',
@@ -4447,6 +4566,42 @@ The report is considered public if the `is_public` field is set to &#x
             },
         ],
     },
+    {
+        method: 'put',
+        path: '/v1/users/me/current-organization',
+        alias: 'updateMyCurrentOrganization',
+        description: `Switches the organization that the user is currently working in. The user
+must be a member of the given organization. This endpoint is independent of
+the organization.`,
+        requestFormat: 'json',
+        parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: z.object({ organization_id: z.string().uuid() }).passthrough(),
+            },
+        ],
+        response: z.object({ data: UserResource }).passthrough(),
+        errors: [
+            {
+                status: 401,
+                description: `Unauthenticated`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 403,
+                description: `Authorization error`,
+                schema: z.object({ message: z.string() }).passthrough(),
+            },
+            {
+                status: 422,
+                description: `Validation error`,
+                schema: z
+                    .object({ message: z.string(), errors: z.record(z.array(z.string())) })
+                    .passthrough(),
+            },
+        ],
+    },
     {
         method: 'put',
         path: '/v1/users/:user',
@@ -4493,6 +4648,11 @@ The report is considered public if the `is_public` field is set to &#x
         description: `This endpoint is independent of the organization.`,
         requestFormat: 'json',
         parameters: [
+            {
+                name: 'body',
+                type: 'Body',
+                schema: DestroyWithPasswordRequest,
+            },
             {
                 name: 'user',
                 type: 'Path',

resources/js/packages/ui/styles.css

@@ -199,7 +199,7 @@ body {
         --muted-foreground: var(--color-text-tertiary);
         --accent: var(--color-bg-tertiary);
         --accent-foreground: var(--color-text-primary);
-        --destructive: 0 62.8% 30.6%;
+        --destructive: 0 72% 60%;
         --destructive-foreground: var(--color-text-primary);
         --border: var(--color-border-primary);
         --input: var(--color-border-tertiary);

resources/js/types/jetstream.ts

@@ -1,11 +1,8 @@
 import type { User } from '@/types/models';
 
 export interface Permissions {
-    canAddTeamMembers: boolean;
     canDeleteTeam: boolean;
-    canRemoveTeamMembers: boolean;
     canUpdateTeam: boolean;
-    canUpdateTeamMembers: boolean;
 }
 
 export interface Session {

resources/js/utils/apiValidation.ts

@@ -0,0 +1,31 @@
+import axios, { type AxiosError } from 'axios';
+
+type ApiValidationResponse = {
+    message?: string;
+    errors?: Record<string, string[]>;
+};
+
+export function isApiValidationError(error: unknown): error is AxiosError<ApiValidationResponse> {
+    return axios.isAxiosError<ApiValidationResponse>(error) && error.response?.status === 422;
+}
+
+export function getApiValidationFieldErrors(error: unknown): Record<string, string> {
+    if (!isApiValidationError(error)) {
+        return {};
+    }
+
+    const fieldErrors: Record<string, string> = {};
+    for (const [field, messages] of Object.entries(error.response?.data?.errors ?? {})) {
+        if (Array.isArray(messages) && messages[0]) {
+            fieldErrors[field] = messages[0];
+        }
+    }
+    return fieldErrors;
+}
+
+export function getApiValidationMessage(error: unknown, fallback: string): string {
+    if (!isApiValidationError(error)) {
+        return fallback;
+    }
+    return error.response?.data?.message ?? fallback;
+}

resources/js/utils/commandPaletteCommands.ts

@@ -210,7 +210,7 @@ export function createNavigationCommands(
             icon: Cog6ToothIcon,
             keywords: ['settings', 'organization', 'configuration'],
             group: 'navigation',
-            action: () => navigate('teams.show', { team: currentTeamId() }),
+            action: () => navigate('organizations.show', { organizationId: currentTeamId() }),
             permission: permissions.canUpdateOrganization,
             priority: GROUP_PRIORITIES.navigation - 3,
         },

resources/js/utils/timesheet/useTimesheetCellMutations.test.ts

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { ref } from 'vue';
 import { createPinia, setActivePinia } from 'pinia';
-import { useTimesheetCellMutations } from './useTimesheetCellMutations';
+import { useTimesheetCellMutations, makeCellStatusKey } from './useTimesheetCellMutations';
 import { api } from '@/packages/api/src';
 import type { TimesheetRow, TimesheetCell } from '@/utils/useTimesheetGrid';
 import type { TimeEntry } from '@/packages/api/src';
@@ -549,3 +549,119 @@ describe('useTimesheetCellMutations.handleCellUpdate', () => {
         });
     });
 });
+
+describe('useTimesheetCellMutations save status', () => {
+    // Timer handles keep old fade-outs from clearing newer status, and
+    // the same-cell saving guard prevents concurrent writes from stale rows.
+
+    it('does not let a stale fade-out timer clear a newer edit on the same cell', async () => {
+        const { cellMutations } = setup([]);
+        const row = buildEmptyRow('p-1');
+        const key = makeCellStatusKey(row.key, 0);
+
+        await cellMutations.handleCellUpdate(row, 0, HOUR);
+        expect(cellMutations.cellStatus.value[key]).toBe('saved');
+
+        // Re-edit the same cell partway through the first "saved" window.
+        vi.advanceTimersByTime(1000);
+        await cellMutations.handleCellUpdate(row, 0, 2 * HOUR);
+        expect(cellMutations.cellPendingSeconds.value[key]).toBe(2 * HOUR);
+
+        // Advance past the FIRST timer's deadline: it must not wipe the newer state.
+        vi.advanceTimersByTime(2000);
+        expect(cellMutations.cellStatus.value[key]).toBe('saved');
+        expect(cellMutations.cellPendingSeconds.value[key]).toBe(2 * HOUR);
+    });
+
+    it('ignores another commit while the same cell is saving', async () => {
+        const { cellMutations } = setup([]);
+        const row = buildEmptyRow('p-1');
+        const key = makeCellStatusKey(row.key, 0);
+
+        let release!: () => void;
+        const gateA = new Promise<void>((res) => {
+            release = () => res();
+        });
+        apiMocks.createTimeEntry.mockImplementationOnce(async () => {
+            await gateA;
+            return { data: { id: 'a' } } as never;
+        });
+
+        const save = cellMutations.handleCellUpdate(row, 0, HOUR);
+        expect(cellMutations.cellStatus.value[key]).toBe('saving');
+        expect(cellMutations.cellPendingSeconds.value[key]).toBe(HOUR);
+
+        // The second commit would be planned from the same stale row, so it is ignored.
+        await cellMutations.handleCellUpdate(row, 0, 2 * HOUR);
+        expect(apiMocks.createTimeEntry).toHaveBeenCalledTimes(1);
+        expect(cellMutations.cellPendingSeconds.value[key]).toBe(HOUR);
+
+        release();
+        await save;
+        expect(cellMutations.cellStatus.value[key]).toBe('saved');
+        expect(cellMutations.cellPendingSeconds.value[key]).toBe(HOUR);
+    });
+
+    it('marks error and drops the optimistic value when the save fails', async () => {
+        const { cellMutations } = setup([]);
+        const row = buildEmptyRow('p-1');
+        const key = makeCellStatusKey(row.key, 0);
+
+        apiMocks.createTimeEntry.mockRejectedValueOnce(new Error('boom'));
+
+        await cellMutations.handleCellUpdate(row, 0, HOUR);
+
+        expect(cellMutations.cellStatus.value[key]).toBe('error');
+        expect(cellMutations.cellPendingSeconds.value[key]).toBeUndefined();
+        expect(addNotification).toHaveBeenCalledWith(
+            'error',
+            'Failed to update timesheet',
+            expect.any(String)
+        );
+    });
+
+    it('marks error and drops the optimistic value when the day is full', async () => {
+        // Block all but the last 2h, then ask for 3h → NoFreeWindowError.
+        const blocker = entry('2026-04-10T00:00:00Z', '2026-04-10T22:00:00Z', { id: 'blocker' });
+        const { cellMutations } = setup([blocker]);
+        const row = buildEmptyRow('p-1');
+        const key = makeCellStatusKey(row.key, 0);
+
+        await cellMutations.handleCellUpdate(row, 0, 3 * HOUR);
+
+        expect(cellMutations.cellStatus.value[key]).toBe('error');
+        expect(cellMutations.cellPendingSeconds.value[key]).toBeUndefined();
+        expect(addNotification).toHaveBeenCalledWith(
+            'error',
+            "This day can't fit any more work",
+            expect.any(String)
+        );
+    });
+
+    it('creates no status when the committed value is unchanged', async () => {
+        const cellEntry = entry('2026-04-10T09:00:00Z', '2026-04-10T10:00:00Z');
+        const { cellMutations } = setup([cellEntry]);
+        const row = buildRow('p-1', [cellEntry]);
+        const key = makeCellStatusKey(row.key, 0);
+
+        await cellMutations.handleCellUpdate(row, 0, HOUR);
+
+        expect(cellMutations.cellStatus.value[key]).toBeUndefined();
+        expect(cellMutations.cellPendingSeconds.value[key]).toBeUndefined();
+    });
+
+    it('tracks save status independently for each cell', async () => {
+        const { cellMutations } = setup([]);
+        const row = buildEmptyRow('p-1');
+        const mondayKey = makeCellStatusKey(row.key, 0);
+        const tuesdayKey = makeCellStatusKey(row.key, 1);
+
+        await cellMutations.handleCellUpdate(row, 0, HOUR);
+        await cellMutations.handleCellUpdate(row, 1, 2 * HOUR);
+
+        expect(cellMutations.cellStatus.value[mondayKey]).toBe('saved');
+        expect(cellMutations.cellStatus.value[tuesdayKey]).toBe('saved');
+        expect(cellMutations.cellPendingSeconds.value[mondayKey]).toBe(HOUR);
+        expect(cellMutations.cellPendingSeconds.value[tuesdayKey]).toBe(2 * HOUR);
+    });
+});

resources/js/utils/timesheet/useTimesheetCellMutations.ts

@@ -1,4 +1,4 @@
-import type { Ref } from 'vue';
+import { ref, type Ref } from 'vue';
 import { useQueryClient } from '@tanstack/vue-query';
 import { api, type CreateTimeEntryBody, type TimeEntry } from '@/packages/api/src';
 import { formatHumanReadableDuration, getDayJsInstance } from '@/packages/ui/src/utils/time';
@@ -19,6 +19,17 @@ import {
     type FreeWindow,
 } from './cellMath';
 
+export type CellSaveStatus = 'saving' | 'saved' | 'error';
+
+/** Map key for a cell's save state (row + day). */
+export function makeCellStatusKey(rowKey: TimesheetRowKey, dayIndex: number): string {
+    return `${rowKey}:${dayIndex}`;
+}
+
+/** How long the saved/error state stays visible before fading. */
+const SAVED_VISIBLE_MS = 2800;
+const ERROR_VISIBLE_MS = 2500;
+
 /**
  * Cell-level edit dispatcher. Picks one of four strategies based on
  * the diff between current and requested totals:
@@ -48,15 +59,58 @@ export function useTimesheetCellMutations(
     const queryClient = useQueryClient();
     const notifications = useNotificationsStore();
 
+    // Save status + the optimistic value shown while saving, so a saved cell
+    // doesn't flicker back to its old total before the refetch lands.
+    const cellStatus = ref<Record<string, CellSaveStatus>>({});
+    const cellPendingSeconds = ref<Record<string, number>>({});
+    const statusClearTimers: Record<string, ReturnType<typeof setTimeout>> = {};
+
+    function clearStatusTimer(key: string): void {
+        clearTimeout(statusClearTimers[key]);
+        delete statusClearTimers[key];
+    }
+
+    function beginSaving(key: string, seconds: number): void {
+        clearStatusTimer(key);
+        cellPendingSeconds.value[key] = seconds;
+        cellStatus.value[key] = 'saving';
+    }
+
+    function markSaved(key: string): void {
+        clearStatusTimer(key);
+        cellStatus.value[key] = 'saved';
+        statusClearTimers[key] = setTimeout(() => {
+            delete cellStatus.value[key];
+            delete cellPendingSeconds.value[key];
+            delete statusClearTimers[key];
+        }, SAVED_VISIBLE_MS);
+    }
+
+    function markError(key: string): void {
+        clearStatusTimer(key);
+        cellStatus.value[key] = 'error';
+        // Drop the optimistic value so the cell shows server truth after refetch.
+        delete cellPendingSeconds.value[key];
+        statusClearTimers[key] = setTimeout(() => {
+            delete cellStatus.value[key];
+            delete statusClearTimers[key];
+        }, ERROR_VISIBLE_MS);
+    }
+
     async function handleCellUpdate(
         row: TimesheetRow,
         dayIndex: number,
         newTotalSeconds: number
     ): Promise<void> {
+        const statusKey = makeCellStatusKey(row.key, dayIndex);
+        if (cellStatus.value[statusKey] === 'saving') return;
+
         const cell = row.cells.get(dayIndex);
         const existingSeconds = cell?.totalSeconds ?? 0;
         if (newTotalSeconds === existingSeconds) return;
 
+        beginSaving(statusKey, newTotalSeconds);
+
         // Capture row state before the mutation: a row that was empty
         // and shares identity with another slot collapses after the
         // first entry lands, so the entry naturally identity-routes to
@@ -74,7 +128,9 @@ export function useTimesheetCellMutations(
                     'Another row with the same project, task, billable status and tags already exists.'
                 );
             }
+            markSaved(statusKey);
         } catch (err) {
+            markError(statusKey);
             if (err instanceof NoFreeWindowError) {
                 const friendlyDuration = formatHumanReadableDuration(
                     err.requiredSeconds,
@@ -93,7 +149,6 @@ export function useTimesheetCellMutations(
                 'Failed to update timesheet',
                 'Please try again later.'
             );
-            throw err;
         } finally {
             queryClient.invalidateQueries({ queryKey: ['timeEntries'] });
         }
@@ -316,5 +371,5 @@ export function useTimesheetCellMutations(
         return best;
     }
 
-    return { handleCellUpdate };
+    return { handleCellUpdate, cellStatus, cellPendingSeconds };
 }

resources/js/utils/useOrganization.ts

@@ -2,37 +2,45 @@ import { router } from '@inertiajs/vue3';
 import { initializeStores } from '@/utils/init';
 import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
+import axios from 'axios';
 import type {
     Organization,
     OrganizationResponse,
+    DeleteOrganizationBody,
     UpdateOrganizationBody,
 } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
 import { getCurrentOrganizationId } from '@/utils/useUser';
 import { api } from '@/packages/api/src';
 
-export function switchOrganization(organizationId: string) {
+export async function switchOrganization(organizationId: string) {
-    // Clear Inertia's prefetch cache to prevent stale pages from the old
+    const { handleApiRequestNotifications } = useNotificationsStore();
-    // organization being served when navigating after the switch.
+    try {
-    router.flushAll();
+        await handleApiRequestNotifications(
+            () => api.updateMyCurrentOrganization({ organization_id: organizationId }),
+            undefined,
+            'Failed to switch organization'
+        );
+    } catch {
+        // The error notification is surfaced by the request handler.
+        return;
+    }
 
-    router.put(
+    // The current organization changed server-side. Clear Inertia's prefetch
-        route('current-team.update'),
+    // cache and reload into the dashboard so the new organization context
-        {
+    // (auth.user.current_team) is picked up everywhere.
-            team_id: organizationId,
+    router.flushAll();
+    router.visit(route('dashboard'), {
+        preserveState: false,
+        onSuccess: () => {
+            initializeStores();
         },
-        {
+    });
-            preserveState: false,
-            onSuccess: () => {
-                initializeStores();
-            },
-        }
-    );
 }
 
 export const useOrganizationStore = defineStore('organization', () => {
     const organizationResponse = ref<OrganizationResponse | null>(null);
-    const { handleApiRequestNotifications } = useNotificationsStore();
+    const { addNotification, handleApiRequestNotifications } = useNotificationsStore();
 
     async function fetchOrganization() {
         const organization = getCurrentOrganizationId();
@@ -67,9 +75,42 @@ export const useOrganizationStore = defineStore('organization', () => {
         }
     }
 
+    async function createOrganization(name: string): Promise<Organization | null> {
+        const response = await api.createOrganization({ name });
+        return response?.data ?? null;
+    }
+
+    async function deleteOrganization(organizationId: string, body: DeleteOrganizationBody) {
+        try {
+            await api.deleteOrganization(body, {
+                params: {
+                    organization: organizationId,
+                },
+            });
+            addNotification('success', 'Organization deleted successfully');
+        } catch (error) {
+            if (!axios.isAxiosError(error) || error.response?.status !== 422) {
+                addNotification(
+                    'error',
+                    'Failed to delete organization',
+                    axios.isAxiosError(error)
+                        ? (error.response?.data?.message ?? 'Please try again later.')
+                        : 'Please try again later.'
+                );
+            }
+            throw error;
+        }
+    }
+
     const organization = computed<Organization | null>(() => {
         return organizationResponse.value?.data || null;
     });
 
-    return { organization, fetchOrganization, updateOrganization };
+    return {
+        organization,
+        fetchOrganization,
+        updateOrganization,
+        createOrganization,
+        deleteOrganization,
+    };
 });

resources/js/utils/useUserQuery.ts

@@ -1,7 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query';
 import { computed } from 'vue';
 import axios from 'axios';
-import { api, type UpdateUserBody, type User } from '@/packages/api/src';
+import { api, type DeleteUserBody, type UpdateUserBody, type User } from '@/packages/api/src';
 import { useNotificationsStore } from '@/utils/notification';
 
 const ME_QUERY_KEY = ['me'] as const;
@@ -61,9 +61,9 @@ export function useDeleteUserMutation() {
     const { addNotification } = useNotificationsStore();
 
     return useMutation({
-        mutationFn: async (userId: string) => {
+        mutationFn: async ({ userId, body }: { userId: string; body: DeleteUserBody }) => {
             try {
-                await api.deleteUser(undefined, { params: { user: userId } });
+                await api.deleteUser(body, { params: { user: userId } });
             } catch (error) {
                 if (!axios.isAxiosError(error) || error.response?.status !== 422) {
                     addNotification(

resources/js/ziggy.d.ts

@@ -114,6 +114,13 @@ declare module 'ziggy-js' {
         'other-browser-sessions.destroy': [];
         'current-user-photo.destroy': [];
         'current-user.destroy': [];
+        'organizations.create': [];
+        'organizations.show': [
+            {
+                'name': 'organizationId';
+                'required': true;
+            },
+        ];
         'teams.create': [];
         'teams.store': [];
         'teams.show': [

resources/js/ziggy.js

@@ -197,6 +197,12 @@ const Ziggy = {
             'methods': ['DELETE'],
         },
         'current-user.destroy': { 'uri': 'user', 'methods': ['DELETE'] },
+        'organizations.create': { 'uri': 'organizations/create', 'methods': ['GET', 'HEAD'] },
+        'organizations.show': {
+            'uri': 'organizations/{organizationId}',
+            'methods': ['GET', 'HEAD'],
+            'parameters': ['organizationId'],
+        },
         'teams.create': { 'uri': 'teams/create', 'methods': ['GET', 'HEAD'] },
         'teams.store': { 'uri': 'teams', 'methods': ['POST'] },
         'teams.show': {

resources/testfiles/clockify_projects_import_test_2.csv

@@ -0,0 +1,3 @@
+"Project","Client","Status","Visibility","Billability","Tasks","Tracked (h)","Estimated (h)","Remaining (h)","Overage (h)","Tracked (USD)","Estimated (USD)","Remaining (USD)","Overage (USD)","Progress(%)","Recurring estimate","Billable (h)","Non-billable (h)","Billable Rate (USD)","Amount (USD)","Cost Rate (USD)","Expenses (USD)","Billable expenses (USD)","Non-billable expenses (USD)","Additional fields","Project members","Project manager","Note"
+"Active Project","Big Company","Active","Public","Yes","Task 1, Task 2","0.00","100.00","","","","","","","","","0.00","0.00","100.01","0.00","","0.00","0.00","0.00","","Constantin Graf","",""
+"Archived Project","","Archived","Public","Yes","","0.00","","","","","","","","","","0.00","0.00","","0.00","","0.00","0.00","0.00","","Constantin Graf","",""

resources/testfiles/clockify_time_entries_import_test_4.csv

@@ -0,0 +1,3 @@
+"Project","Client","Description","Task","User","Group","Email","Tags","Start Date","Start Time","End Date","End Time","Duration (h)","Duration (decimal)","Billable Rate (USD)","Billable Amount (USD)"
+"Project without Client","","","","Peter Tester","","peter.test@email.test","Development, Backend","03/04/2024","10:23:52 AM","03/04/2024","10:23:52 AM","00:00:00","0.00","0.00","0.00"
+"Project for Big Company","Big Company","Working hard","Task 1","Peter Tester","","peter.test@email.test","","03/04/2024","10:23 AM","03/04/2024","11:23:01 AM","01:00:01","0.00","0.00","0.00"

routes/web.php

@@ -2,13 +2,14 @@
 
 declare(strict_types=1);
 
-use App\Enums\Role;
 use App\Http\Controllers\Web\DashboardController;
 use App\Http\Controllers\Web\HomeController;
 use App\Http\Controllers\Web\OrganizationController;
 use App\Http\Controllers\Web\OrganizationInvitationController;
+use App\Http\Controllers\Web\OtherBrowserSessionsController;
 use App\Http\Controllers\Web\UserController;
 use App\Http\Controllers\Web\UserProfileController;
+use App\Service\PermissionStore;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
@@ -32,6 +33,7 @@ Route::get('/shared-report', function () {
 
 Route::middleware([
     'auth:web',
+    'auth.session',
     'verified',
 ])->group(function (): void {
     Route::get('/dashboard', [DashboardController::class, 'dashboard'])->name('dashboard');
@@ -74,7 +76,14 @@ Route::middleware([
 
     Route::get('/members', function () {
         return Inertia::render('Members', [
-            'availableRoles' => Role::values(),
+            'availableRoles' => collect(PermissionStore::roleDefinitions())
+                ->map(fn (array $definition, string $key): array => [
+                    'key' => $key,
+                    'name' => $definition['name'],
+                    'description' => $definition['description'],
+                ])
+                ->values()
+                ->all(),
         ]);
     })->name('members');
 
@@ -95,6 +104,8 @@ Route::middleware([
         return to_route('organizations.show', [$organizationId]);
     })->name('teams.show');
     Route::get('/user/profile', [UserProfileController::class, 'show'])->name('profile.show');
+    Route::delete('/user/other-browser-sessions', [OtherBrowserSessionsController::class, 'destroy'])
+        ->name('other-browser-sessions.destroy');
 });
 
 Route::get('/team-invitations/{invitation}', [OrganizationInvitationController::class, 'accept'])

tests/Feature/BrowserSessionsTest.php

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Tests\Feature;
-
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class BrowserSessionsTest extends TestCase
-{
-    use RefreshDatabase;
-
-    public function test_other_browser_sessions_can_be_logged_out(): void
-    {
-        $this->actingAs($user = User::factory()->create());
-
-        $response = $this->delete('/user/other-browser-sessions', [
-            'password' => 'password',
-        ]);
-
-        $response->assertSessionHasNoErrors();
-    }
-}

tests/Feature/ProfileInformationTest.php

@@ -5,12 +5,9 @@ declare(strict_types=1);
 namespace Tests\Feature;
 
 use App\Enums\Weekday;
-use App\Mail\VerifyUpdatedEmailMail;
 use App\Models\User;
 use App\Service\TimezoneService;
 use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\URL;
 use Tests\TestCase;
 
 class ProfileInformationTest extends TestCase
@@ -39,66 +36,4 @@ class ProfileInformationTest extends TestCase
         $user = $user->fresh();
         $this->assertEquals($user->name, $user->name);
     }
-
-    public function test_pending_email_verification_redirects_with_danger_banner_when_email_already_in_use(): void
-    {
-        // Arrange
-        User::factory()->create([
-            'email' => 'taken@example.com',
-            'is_placeholder' => false,
-        ]);
-        $user = User::factory()->create([
-            'email' => 'current@example.com',
-            'pending_email' => 'taken@example.com',
-        ]);
-        $this->actingAs($user);
-        $verificationUrl = URL::temporarySignedRoute(
-            'users.verify-email-change',
-            now()->addMinutes(60),
-            [
-                'user' => $user->getKey(),
-                'email' => 'taken@example.com',
-            ],
-            false
-        );
-
-        // Act
-        $response = $this->get($verificationUrl);
-
-        // Assert
-        $response->assertRedirect(route('dashboard'));
-        $response->assertSessionHas('bannerStyle', 'danger');
-        $response->assertSessionHas('bannerText', 'The email address is already in use.');
-        $user = $user->fresh();
-        $this->assertEquals('current@example.com', $user->email);
-        $this->assertEquals('taken@example.com', $user->pending_email);
-    }
-
-    public function test_stale_pending_email_verification_link_is_rejected(): void
-    {
-        // Arrange
-        $user = User::factory()->create([
-            'email' => 'current@example.com',
-            'pending_email' => 'newer@example.com',
-        ]);
-        $this->actingAs($user);
-        $verificationUrl = URL::temporarySignedRoute(
-            'users.verify-email-change',
-            now()->addMinutes(60),
-            [
-                'user' => $user->getKey(),
-                'email' => 'older@example.com',
-            ],
-            false
-        );
-
-        // Act
-        $response = $this->get($verificationUrl);
-
-        // Assert
-        $response->assertForbidden();
-        $user = $user->fresh();
-        $this->assertEquals('current@example.com', $user->email);
-        $this->assertEquals('newer@example.com', $user->pending_email);
-    }
 }

tests/Feature/RegistrationTest.php

@@ -61,6 +61,7 @@ class RegistrationTest extends TestCaseWithDatabase
         $member = Member::query()->whereBelongsTo($user, 'user')->whereBelongsTo($organization, 'organization')->firstOrFail();
         $this->assertSame(Role::Owner->value, $member->role);
         Event::assertNotDispatched(NewsletterRegistered::class);
+        $this->assertSame($organization->getKey(), $user->current_team_id);
     }
 
     public function test_user_registration_fails_if_registration_is_deactivated(): void

tests/Unit/Endpoint/Api/V1/OrganizationEndpointTest.php

@@ -382,6 +382,58 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract
         ]);
     }
 
+    public function test_update_endpoint_can_update_the_currency_of_the_organization(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'organizations:update',
+        ]);
+        $this->assertBillableRateServiceIsUnused();
+        $data->organization->currency = 'EUR';
+        $data->organization->save();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
+            'name' => $data->organization->name,
+            'currency' => 'USD',
+        ]);
+
+        // Assert
+        $response->assertStatus(200);
+        $response->assertJsonPath('data.currency', 'USD');
+        $this->assertDatabaseHas(Organization::class, [
+            'id' => $data->organization->getKey(),
+            'currency' => 'USD',
+        ]);
+    }
+
+    public function test_update_endpoint_fails_if_currency_is_invalid(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'organizations:update',
+        ]);
+        $this->assertBillableRateServiceIsUnused();
+        $data->organization->currency = 'EUR';
+        $data->organization->save();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->putJson(route('api.v1.organizations.update', [$data->organization->getKey()]), [
+            'name' => $data->organization->name,
+            'currency' => 'NOT_A_CURRENCY',
+        ]);
+
+        // Assert
+        $response->assertStatus(422);
+        $response->assertJsonValidationErrors(['currency']);
+        $this->assertDatabaseHas(Organization::class, [
+            'id' => $data->organization->getKey(),
+            'currency' => 'EUR',
+        ]);
+    }
+
     public function test_delete_endpoint_if_user_does_not_have_permission(): void
     {
         // Arrange
@@ -389,7 +441,9 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->deleteJson(route('api.v1.organizations.destroy', [$data->organization->getKey()]));
+        $response = $this->deleteJson(route('api.v1.organizations.destroy', [$data->organization->getKey()]), [
+            'password' => 'password',
+        ]);
 
         // Assert
         $response->assertForbidden();
@@ -404,12 +458,54 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->deleteJson(route('api.v1.organizations.destroy', ['not-uuid']));
+        $response = $this->deleteJson(route('api.v1.organizations.destroy', ['not-uuid']), [
+            'password' => 'password',
+        ]);
 
         // Assert
         $response->assertNotFound();
     }
 
+    public function test_delete_endpoint_fails_without_password(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'organizations:delete',
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->deleteJson(route('api.v1.organizations.destroy', [$data->organization->getKey()]));
+
+        // Assert
+        $response->assertUnprocessable();
+        $response->assertJsonValidationErrors(['password']);
+        $this->assertDatabaseHas(Organization::class, [
+            'id' => $data->organization->getKey(),
+        ]);
+    }
+
+    public function test_delete_endpoint_fails_with_wrong_password(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'organizations:delete',
+        ]);
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->deleteJson(route('api.v1.organizations.destroy', [$data->organization->getKey()]), [
+            'password' => 'wrong-password',
+        ]);
+
+        // Assert
+        $response->assertUnprocessable();
+        $response->assertJsonValidationErrors(['password']);
+        $this->assertDatabaseHas(Organization::class, [
+            'id' => $data->organization->getKey(),
+        ]);
+    }
+
     public function test_delete_endpoint_can_delete_organization(): void
     {
         // Arrange
@@ -420,7 +516,9 @@ class OrganizationEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->deleteJson(route('api.v1.organizations.destroy', [$data->organization->getKey()]));
+        $response = $this->deleteJson(route('api.v1.organizations.destroy', [$data->organization->getKey()]), [
+            'password' => 'password',
+        ]);
 
         // Assert
         $response->assertNoContent();

tests/Unit/Endpoint/Api/V1/UserEndpointTest.php

@@ -649,7 +649,9 @@ class UserEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($otherData->user);
 
         // Act
-        $response = $this->deleteJson(route('api.v1.users.destroy', $data->user->getKey()));
+        $response = $this->deleteJson(route('api.v1.users.destroy', $data->user->getKey()), [
+            'password' => 'password',
+        ]);
 
         // Assert
         $response->assertForbidden();
@@ -674,13 +676,15 @@ class UserEndpointTest extends ApiEndpointTestAbstract
         Passport::actingAs($data->user);
 
         // Act
-        $response = $this->deleteJson(route('api.v1.users.destroy', 'not-valid'));
+        $response = $this->deleteJson(route('api.v1.users.destroy', 'not-valid'), [
+            'password' => 'password',
+        ]);
 
         // Assert
         $response->assertNotFound();
     }
 
-    public function test_delete_removes_user(): void
+    public function test_delete_fails_without_password(): void
     {
         // Arrange
         $data = $this->createUserWithPermission();
@@ -689,6 +693,40 @@ class UserEndpointTest extends ApiEndpointTestAbstract
         // Act
         $response = $this->deleteJson(route('api.v1.users.destroy', $data->user->getKey()));
 
+        // Assert
+        $response->assertUnprocessable();
+        $response->assertJsonValidationErrors(['password']);
+        $this->assertDatabaseHas(User::class, ['id' => $data->user->getKey()]);
+    }
+
+    public function test_delete_fails_with_wrong_password(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->deleteJson(route('api.v1.users.destroy', $data->user->getKey()), [
+            'password' => 'wrong-password',
+        ]);
+
+        // Assert
+        $response->assertUnprocessable();
+        $response->assertJsonValidationErrors(['password']);
+        $this->assertDatabaseHas(User::class, ['id' => $data->user->getKey()]);
+    }
+
+    public function test_delete_removes_user(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission();
+        Passport::actingAs($data->user);
+
+        // Act
+        $response = $this->deleteJson(route('api.v1.users.destroy', $data->user->getKey()), [
+            'password' => 'password',
+        ]);
+
         // Assert
         $response->assertNoContent();
         $this->assertDatabaseMissing(User::class, ['id' => $data->user->getKey()]);

tests/Unit/Endpoint/Web/MembersEndpointTest.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Endpoint\Web;
+
+use Inertia\Testing\AssertableInertia as Assert;
+
+class MembersEndpointTest extends EndpointTestAbstract
+{
+    public function test_members_passes_available_roles_as_objects_with_key_name_and_description(): void
+    {
+        // Arrange
+        $data = $this->createUserWithPermission([
+            'members:view',
+        ]);
+        $this->actingAs($data->user);
+
+        // Act
+        $response = $this->get(route('members'));
+
+        // Assert
+        $response->assertOk();
+        $response->assertInertia(fn (Assert $page) => $page
+            ->component('Members')
+            ->has('availableRoles', 5, fn (Assert $role) => $role
+                ->has('key')
+                ->has('name')
+                ->has('description')
+            )
+            ->where('availableRoles.0.key', 'owner')
+            ->where('availableRoles.0.name', 'Owner')
+        );
+    }
+}

tests/Unit/Endpoint/Web/OrganizationEndpointTest.php

@@ -4,12 +4,14 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Endpoint\Web;
 
+use App\Enums\Role;
 use App\Http\Controllers\Web\OrganizationController;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\User;
 use Inertia\Testing\AssertableInertia as Assert;
 use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 #[CoversClass(OrganizationController::class)]
 class OrganizationEndpointTest extends EndpointTestAbstract
@@ -65,14 +67,37 @@ class OrganizationEndpointTest extends EndpointTestAbstract
             ->where('team.owner.name', $data->owner->name)
             ->has('team.owner.profile_photo_url')
             ->has('currencies')
-            ->where('availableRoles', [])
+        );
-            ->where('availablePermissions', [])
+    }
-            ->where('defaultPermissions', [])
+
-            ->where('permissions.canAddTeamMembers', true)
+    /**
-            ->where('permissions.canDeleteTeam', true)
+     * @return array<string, array{role: Role, canUpdateTeam: bool, canDeleteTeam: bool}>
-            ->where('permissions.canRemoveTeamMembers', true)
+     */
-            ->where('permissions.canUpdateTeam', true)
+    public static function showPermissionsPerRoleProvider(): array
-            ->where('permissions.canUpdateTeamMembers', true)
+    {
+        return [
+            'owner can update and delete' => ['role' => Role::Owner, 'canUpdateTeam' => true, 'canDeleteTeam' => true],
+            'admin can update but not delete' => ['role' => Role::Admin, 'canUpdateTeam' => true, 'canDeleteTeam' => false],
+            'employee can neither update nor delete' => ['role' => Role::Employee, 'canUpdateTeam' => false, 'canDeleteTeam' => false],
+        ];
+    }
+
+    #[DataProvider('showPermissionsPerRoleProvider')]
+    public function test_organization_show_returns_permissions_based_on_role(Role $role, bool $canUpdateTeam, bool $canDeleteTeam): void
+    {
+        // Arrange
+        $data = $this->createUserWithRole($role);
+        $this->actingAs($data->user);
+
+        // Act
+        $response = $this->get(route('organizations.show', [$data->organization->getKey()]));
+
+        // Assert
+        $response->assertOk();
+        $response->assertInertia(fn (Assert $page) => $page
+            ->component('Teams/Show')
+            ->where('permissions.canUpdateTeam', $canUpdateTeam)
+            ->where('permissions.canDeleteTeam', $canDeleteTeam)
         );
     }
 

tests/Unit/Endpoint/Web/OtherBrowserSessionsEndpointTest.php

@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Endpoint\Web;
+
+use App\Http\Controllers\Web\OtherBrowserSessionsController;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Hash;
+use PHPUnit\Framework\Attributes\CoversClass;
+
+#[CoversClass(OtherBrowserSessionsController::class)]
+class OtherBrowserSessionsEndpointTest extends EndpointTestAbstract
+{
+    public function test_destroy_logs_out_other_browser_sessions_with_the_correct_password(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+        $originalPasswordHash = $user->password;
+        $this->actingAs($user);
+
+        // Act
+        $response = $this->delete('/user/other-browser-sessions', [
+            'password' => 'password',
+        ]);
+
+        // Assert
+        $response->assertRedirect();
+        $response->assertSessionHasNoErrors();
+        // logoutOtherDevices re-hashes the password (same plaintext, new hash) to invalidate other sessions.
+        $this->assertNotSame($originalPasswordHash, $user->fresh()->password);
+        $this->assertTrue(Hash::check('password', $user->fresh()->password));
+    }
+
+    public function test_destroy_fails_with_an_incorrect_password(): void
+    {
+        // Arrange
+        $user = User::factory()->create();
+        $originalPasswordHash = $user->password;
+        $this->actingAs($user);
+
+        // Act
+        $response = $this->delete('/user/other-browser-sessions', [
+            'password' => 'wrong-password',
+        ]);
+
+        // Assert
+        $response->assertSessionHasErrors('password');
+        // No side effects when the password is incorrect: the password must not be re-hashed.
+        $this->assertSame($originalPasswordHash, $user->fresh()->password);
+    }
+
+    public function test_destroy_requires_authentication(): void
+    {
+        // Act
+        $response = $this->delete('/user/other-browser-sessions', [
+            'password' => 'password',
+        ]);
+
+        // Assert
+        $response->assertRedirect(route('login'));
+    }
+
+    public function test_destroy_deletes_the_other_database_session_records_of_the_current_user(): void
+    {
+        // Arrange
+        config(['session.driver' => 'database']);
+        $user = User::factory()->create();
+        $otherUser = User::factory()->create();
+        $this->actingAs($user);
+
+        DB::table('sessions')->insert([
+            [
+                'id' => 'other-session-of-current-user',
+                'user_id' => $user->getKey(),
+                'ip_address' => '192.0.2.10',
+                'user_agent' => '',
+                'payload' => '',
+                'last_activity' => now()->subMinutes(5)->timestamp,
+            ],
+            [
+                'id' => 'session-of-another-user',
+                'user_id' => $otherUser->getKey(),
+                'ip_address' => '192.0.2.30',
+                'user_agent' => '',
+                'payload' => '',
+                'last_activity' => now()->timestamp,
+            ],
+        ]);
+
+        // Act
+        $response = $this->delete('/user/other-browser-sessions', [
+            'password' => 'password',
+        ]);
+
+        // Assert
+        $response->assertSessionHasNoErrors();
+        // The current user's other sessions are removed, while another user's session is untouched.
+        $this->assertDatabaseMissing('sessions', ['id' => 'other-session-of-current-user']);
+        $this->assertDatabaseHas('sessions', ['id' => 'session-of-another-user']);
+    }
+}

tests/Unit/Endpoint/Web/UserEndpointTest.php

@@ -0,0 +1,253 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Endpoint\Web;
+
+use App\Http\Controllers\Web\UserController;
+use App\Models\User;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\URL;
+use PHPUnit\Framework\Attributes\CoversClass;
+
+#[CoversClass(UserController::class)]
+class UserEndpointTest extends EndpointTestAbstract
+{
+    public function test_pending_email_verification_updates_email_and_redirects_with_success_banner(): void
+    {
+        // Arrange
+        $this->travelTo(Carbon::parse('2024-01-02 12:00:00', 'UTC'));
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'new@example.com',
+            'email_verified_at' => null,
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => 'NEW@EXAMPLE.COM',
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertRedirect(route('dashboard'));
+        $response->assertSessionHas('bannerStyle', 'success');
+        $response->assertSessionHas('bannerText', 'Your email address has been updated successfully.');
+        $user->refresh();
+        $this->assertSame('new@example.com', $user->email);
+        $this->assertNull($user->pending_email);
+        $this->assertTrue(now()->equalTo($user->email_verified_at));
+    }
+
+    public function test_pending_email_verification_is_rejected_for_another_authenticated_user(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'new@example.com',
+        ]);
+        $this->actingAs(User::factory()->create());
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => 'new@example.com',
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertForbidden();
+        $user->refresh();
+        $this->assertSame('current@example.com', $user->email);
+        $this->assertSame('new@example.com', $user->pending_email);
+    }
+
+    public function test_pending_email_verification_without_email_is_rejected(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'new@example.com',
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            ['user' => $user->getKey()],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertForbidden();
+        $user->refresh();
+        $this->assertSame('current@example.com', $user->email);
+        $this->assertSame('new@example.com', $user->pending_email);
+    }
+
+    public function test_pending_email_verification_with_non_string_email_is_rejected(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'new@example.com',
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => ['new@example.com'],
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertForbidden();
+        $user->refresh();
+        $this->assertSame('current@example.com', $user->email);
+        $this->assertSame('new@example.com', $user->pending_email);
+    }
+
+    public function test_stale_pending_email_verification_link_is_rejected(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'newer@example.com',
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => 'older@example.com',
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertForbidden();
+        $user->refresh();
+        $this->assertSame('current@example.com', $user->email);
+        $this->assertSame('newer@example.com', $user->pending_email);
+    }
+
+    public function test_pending_email_verification_redirects_with_danger_banner_when_email_already_in_use(): void
+    {
+        // Arrange
+        User::factory()->create([
+            'email' => 'taken@example.com',
+            'is_placeholder' => false,
+        ]);
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'taken@example.com',
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => 'taken@example.com',
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertRedirect(route('dashboard'));
+        $response->assertSessionHas('bannerStyle', 'danger');
+        $response->assertSessionHas('bannerText', 'The email address is already in use.');
+        $user->refresh();
+        $this->assertSame('current@example.com', $user->email);
+        $this->assertSame('taken@example.com', $user->pending_email);
+    }
+
+    public function test_pending_email_verification_ignores_placeholder_users_with_the_same_email(): void
+    {
+        // Arrange
+        User::factory()->placeholder()->create([
+            'email' => 'new@example.com',
+        ]);
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'new@example.com',
+            'email_verified_at' => null,
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => 'new@example.com',
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl);
+
+        // Assert
+        $response->assertRedirect(route('dashboard'));
+        $response->assertSessionHas('bannerStyle', 'success');
+        $user->refresh();
+        $this->assertSame('new@example.com', $user->email);
+        $this->assertNull($user->pending_email);
+        $this->assertNotNull($user->email_verified_at);
+    }
+
+    public function test_pending_email_verification_with_invalid_signature_is_rejected(): void
+    {
+        // Arrange
+        $user = User::factory()->create([
+            'email' => 'current@example.com',
+            'pending_email' => 'new@example.com',
+        ]);
+        $this->actingAs($user);
+        $verificationUrl = URL::temporarySignedRoute(
+            'users.verify-email-change',
+            now()->addMinutes(60),
+            [
+                'user' => $user->getKey(),
+                'email' => 'new@example.com',
+            ],
+            false
+        );
+
+        // Act
+        $response = $this->get($verificationUrl.'&invalid');
+
+        // Assert
+        $response->assertForbidden();
+        $user->refresh();
+        $this->assertSame('current@example.com', $user->email);
+        $this->assertSame('new@example.com', $user->pending_email);
+    }
+}

tests/Unit/Filament/Resources/OrganizationResourceTest.php

@@ -4,12 +4,17 @@ declare(strict_types=1);
 
 namespace Tests\Unit\Filament\Resources;
 
+use App\Enums\Role;
+use App\Events\OrganizationInvitationAdding;
 use App\Filament\Resources\OrganizationResource;
+use App\Mail\OrganizationInvitationMail;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
 use App\Models\User;
 use App\Service\DeletionService;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Mail;
 use Livewire\Livewire;
 use Mockery\MockInterface;
 use PHPUnit\Framework\Attributes\UsesClass;
@@ -112,4 +117,34 @@ class OrganizationResourceTest extends FilamentTestCase
         $response->assertSuccessful();
         $response->assertCanSeeTableRecords($organizationInvitations);
     }
+
+    public function test_can_create_related_invitation(): void
+    {
+        // Arrange
+        Event::fake([
+            OrganizationInvitationAdding::class,
+        ]);
+        Mail::fake();
+        $organization = Organization::factory()->create();
+
+        // Act
+        $response = Livewire::test(OrganizationResource\RelationManagers\InvitationsRelationManager::class, [
+            'ownerRecord' => $organization,
+            'pageClass' => OrganizationResource\Pages\EditOrganization::class,
+        ])->callTableAction('create', data: [
+            'email' => 'new-user@example.com',
+            'role' => Role::Employee->value,
+        ]);
+
+        // Assert
+        $response->assertSuccessful();
+        $response->assertHasNoTableActionErrors();
+        $this->assertDatabaseHas(OrganizationInvitation::class, [
+            'organization_id' => $organization->getKey(),
+            'email' => 'new-user@example.com',
+            'role' => Role::Employee->value,
+        ]);
+        Event::assertDispatched(OrganizationInvitationAdding::class);
+        Mail::assertQueued(OrganizationInvitationMail::class);
+    }
 }

tests/Unit/Middleware/EnsureEmailIsVerifiedMiddlewareTest.php

@@ -73,13 +73,14 @@ class EnsureEmailIsVerifiedMiddlewareTest extends MiddlewareTestAbstract
         $response->assertOk();
     }
 
-    public function test_users_with_unverified_email_can_access_route_in_local_environment(): void
+    public function test_users_with_unverified_email_can_access_route_in_local_environment_if_local_email_verification_is_disabled(): void
     {
         // Arrange
         $user = User::factory()->unverified()->create();
         $route = $this->createTestRoute();
         $this->actingAs($user);
         $this->app->detectEnvironment(fn () => 'local');
+        config(['app.local_email_verification' => false]);
 
         // Act
         $response = $this->get($route);
@@ -87,4 +88,36 @@ class EnsureEmailIsVerifiedMiddlewareTest extends MiddlewareTestAbstract
         // Assert
         $response->assertOk();
     }
+
+    public function tests_users_with_unverified_email_are_redirected_in_non_local_environment_even_if_local_email_verification_is_disabled(): void
+    {
+        // Arrange
+        $user = User::factory()->unverified()->create();
+        $route = $this->createTestRoute();
+        $this->actingAs($user);
+        $this->assertSame('testing', config('app.env'));
+        config(['app.local_email_verification' => false]);
+
+        // Act
+        $response = $this->get($route);
+
+        // Assert
+        $response->assertRedirect(route('verification.notice'));
+    }
+
+    public function test_users_with_unverified_email_are_redirected_in_local_environment_if_local_email_verification_is_enabled(): void
+    {
+        // Arrange
+        $user = User::factory()->unverified()->create();
+        $route = $this->createTestRoute();
+        $this->actingAs($user);
+        $this->app->detectEnvironment(fn () => 'local');
+        config(['app.local_email_verification' => true]);
+
+        // Act
+        $response = $this->get($route);
+
+        // Assert
+        $response->assertRedirect(route('verification.notice'));
+    }
 }

tests/Unit/Service/Dto/UserAgentDtoTest.php

@@ -0,0 +1,131 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\Service\Dto;
+
+use App\Service\Dto\UserAgentDto;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Tests\TestCase;
+
+#[CoversClass(UserAgentDto::class)]
+class UserAgentDtoTest extends TestCase
+{
+    public function test_chrome_on_windows_is_detected_as_a_desktop_browser(): void
+    {
+        // Arrange
+        $userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
+        $agent = new UserAgentDto;
+        $agent->setUserAgent($userAgent);
+
+        // Act
+        $platform = $agent->platform();
+        $browser = $agent->browser();
+        $isDesktop = $agent->isDesktop();
+
+        // Assert
+        $this->assertSame('Windows', $platform);
+        $this->assertSame('Chrome', $browser);
+        $this->assertTrue($isDesktop);
+    }
+
+    public function test_edge_is_detected_before_chrome(): void
+    {
+        // Arrange
+        $userAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36 Edg/120.0.0.0';
+        $agent = new UserAgentDto;
+        $agent->setUserAgent($userAgent);
+
+        // Act
+        $browser = $agent->browser();
+
+        // Assert
+        $this->assertSame('Edge', $browser);
+    }
+
+    public function test_iphone_safari_is_detected_as_a_non_desktop_browser(): void
+    {
+        // Arrange
+        $userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1';
+        $agent = new UserAgentDto;
+        $agent->setUserAgent($userAgent);
+
+        // Act
+        $platform = $agent->platform();
+        $browser = $agent->browser();
+        $isDesktop = $agent->isDesktop();
+
+        // Assert
+        $this->assertSame('iOS', $platform);
+        $this->assertSame('Safari', $browser);
+        $this->assertFalse($isDesktop);
+    }
+
+    public function test_ipad_is_detected_as_non_desktop(): void
+    {
+        // Arrange
+        $userAgent = 'Mozilla/5.0 (iPad; CPU OS 17_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Mobile/15E148 Safari/604.1';
+        $agent = new UserAgentDto;
+        $agent->setUserAgent($userAgent);
+
+        // Act
+        $isDesktop = $agent->isDesktop();
+
+        // Assert
+        $this->assertFalse($isDesktop);
+    }
+
+    public function test_unknown_user_agent_has_no_platform_or_browser_and_is_a_desktop(): void
+    {
+        // Arrange
+        $agent = new UserAgentDto;
+        $agent->setUserAgent('CustomClient/1.0');
+
+        // Act
+        $platform = $agent->platform();
+        $browser = $agent->browser();
+        $isDesktop = $agent->isDesktop();
+
+        // Assert
+        $this->assertNull($platform);
+        $this->assertNull($browser);
+        $this->assertTrue($isDesktop);
+    }
+
+    public function test_cloudfront_desktop_header_is_detected_as_desktop(): void
+    {
+        // Arrange
+        $agent = new UserAgentDto;
+        $agent->setUserAgent('Amazon CloudFront');
+        $agent->setHttpHeaders([
+            'HTTP_CLOUDFRONT_IS_DESKTOP_VIEWER' => 'true',
+        ]);
+
+        // Act
+        $isDesktop = $agent->isDesktop();
+
+        // Assert
+        $this->assertTrue($isDesktop);
+    }
+
+    public function test_cached_values_are_resolved_for_the_current_user_agent(): void
+    {
+        // Arrange
+        $agent = new UserAgentDto;
+        $agent->setUserAgent('Mozilla/5.0 (Windows NT 10.0; Win64; x64) Chrome/120.0.0.0 Safari/537.36');
+        $agent->platform();
+        $agent->browser();
+        $agent->isDesktop();
+        $agent->setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 17_0 like Mac OS X) Version/17.0 Mobile/15E148 Safari/604.1');
+
+        // Act
+        $platform = $agent->platform();
+        $browser = $agent->browser();
+        $isDesktop = $agent->isDesktop();
+
+        // Assert
+        $this->assertSame('iOS', $platform);
+        $this->assertSame('Safari', $browser);
+        $this->assertFalse($isDesktop);
+    }
+}

tests/Unit/Service/Import/Importers/ClockifyProjectsImporterTest.php

@@ -5,6 +5,8 @@ declare(strict_types=1);
 namespace Tests\Unit\Service\Import\Importers;
 
 use App\Models\Organization;
+use App\Models\Project;
+use App\Models\Task;
 use App\Service\Import\Importers\ClockifyProjectsImporter;
 use App\Service\Import\Importers\DefaultImporter;
 use App\Service\Import\Importers\ImportException;
@@ -50,4 +52,47 @@ class ClockifyProjectsImporterTest extends ImporterTestAbstract
         // Assert
         $this->checkTestScenarioProjectsOnlyAfterImport();
     }
+
+    public function test_import_sets_archived_at_based_on_status_column(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new ClockifyProjectsImporter;
+        $importer->init($organization);
+        $data = Storage::disk('testfiles')->get('clockify_projects_import_test_2.csv');
+
+        // Act
+        $importer->importData($data, $timezone);
+
+        // Assert
+        $activeProject = Project::query()->where('organization_id', $organization->id)->where('name', 'Active Project')->firstOrFail();
+        $this->assertNull($activeProject->archived_at);
+        $this->assertFalse($activeProject->is_archived);
+
+        $archivedProject = Project::query()->where('organization_id', $organization->id)->where('name', 'Archived Project')->firstOrFail();
+        $this->assertNotNull($archivedProject->archived_at);
+        $this->assertTrue($archivedProject->is_archived);
+    }
+
+    public function test_import_supports_renamed_tasks_column(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new ClockifyProjectsImporter;
+        $importer->init($organization);
+        // Newer Clockify exports rename the "Task" column to "Tasks".
+        $data = Storage::disk('testfiles')->get('clockify_projects_import_test_2.csv');
+
+        // Act
+        $importer->importData($data, $timezone);
+
+        // Assert
+        $activeProject = Project::query()->where('organization_id', $organization->id)->where('name', 'Active Project')->firstOrFail();
+        $this->assertEqualsCanonicalizing(
+            ['Task 1', 'Task 2'],
+            Task::query()->where('project_id', $activeProject->id)->pluck('name')->all(),
+        );
+    }
 }

tests/Unit/Service/Import/Importers/ClockifyTimeEntriesImporterTest.php

@@ -41,6 +41,30 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
         $this->assertSame(1, $report->clientsCreated);
     }
 
+    public function test_import_of_test_file_without_billable_works_and_defaults_to_non_billable(): void
+    {
+        // Arrange
+        $organization = Organization::factory()->create();
+        $timezone = 'Europe/Vienna';
+        $importer = new ClockifyTimeEntriesImporter;
+        $importer->init($organization);
+        $data = Storage::disk('testfiles')->get('clockify_time_entries_import_test_4.csv');
+
+        // Act
+        $importer->importData($data, $timezone);
+        $report = $importer->getReport();
+
+        // Assert
+        $testScenario = $this->checkTestScenarioAfterImportExcludingTimeEntries(false, true);
+        $this->checkTimeEntries($testScenario, false, true);
+        $this->assertSame(2, $report->timeEntriesCreated);
+        $this->assertSame(2, $report->tagsCreated);
+        $this->assertSame(1, $report->tasksCreated);
+        $this->assertSame(1, $report->usersCreated);
+        $this->assertSame(2, $report->projectsCreated);
+        $this->assertSame(1, $report->clientsCreated);
+    }
+
     public function test_import_of_test_with_special_characters_description_succeeds(): void
     {
         // Arrange

tests/Unit/Service/Import/Importers/ImporterTestAbstract.php

@@ -26,7 +26,7 @@ class ImporterTestAbstract extends TestCase
     /**
      * @return object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}
      */
-    protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false): object
+    protected function checkTestScenarioAfterImportExcludingTimeEntries(bool $detailed = false, bool $billableDefault = false): object
     {
         $users = User::all();
         $this->assertCount(2, $users);
@@ -80,12 +80,12 @@ class ImporterTestAbstract extends TestCase
             $this->assertSame('#ef5350', $project1->color);
             $this->assertSame(null, $project1->billable_rate);
             // Project for Big Company
-            $this->assertSame(true, $project2->is_billable);
+            $this->assertSame(! $billableDefault, $project2->is_billable);
             $this->assertSame(false, $project2->is_public);
             $this->assertSame('#ec407a', $project2->color);
             $this->assertSame(10001, $project2->billable_rate);
             // Project (Archived)
-            $this->assertSame(true, $project3->is_billable);
+            $this->assertSame(! $billableDefault, $project3->is_billable);
             $this->assertSame(true, $project3->is_public);
             $this->assertSame('#6a407f', $project3->color);
             $this->assertSame(null, $project3->billable_rate);
@@ -176,7 +176,7 @@ class ImporterTestAbstract extends TestCase
     /**
      * @param  object{user1: User, project1: Project, project2: Project, tag1: Tag, tag2: Tag}  $testScenario
      */
-    protected function checkTimeEntries(object $testScenario, bool $secondRun = false): void
+    protected function checkTimeEntries(object $testScenario, bool $secondRun = false, bool $billableDefault = false): void
     {
         $timeEntries = TimeEntry::all();
         if ($secondRun) {
@@ -197,7 +197,7 @@ class ImporterTestAbstract extends TestCase
         $this->assertSame('Working hard', $timeEntry2->description);
         $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
         $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
-        $this->assertTrue($timeEntry2->billable);
+        $this->assertSame(! $billableDefault, $timeEntry2->billable);
         $this->assertTrue($timeEntry2->is_imported);
         $this->assertSame([], $timeEntry2->tags);
     }

vite.config.js

@@ -14,6 +14,7 @@ async function getConfig() {
     const additionalPlugins = await collectModulePlugins('extensions');
 
     return defineConfig({
+        base: './',
         build: {
             sourcemap: true, // Source map generation must be turned on
         },