allow employee manage task setting to organization

.dockerignore

@@ -1,54 +0,0 @@
-.git
-**/.git
-.gitmodules
-**/.gitmodules
-.github
-.DS_Store
-.fleet
-.idea
-.vscode
-*.log
-npm-debug.log
-yarn-error.log
-k8s
-docs
-e2e
-tests
-
-docker-compose.yml
-docker/local
-
-.phpunit.cache
-.phpunit.result.cache
-coverage
-test-results
-playwright-report
-blob-report
-playwright/.cache
-openapi.json
-playwright
-playwright.config.ts
-vitest.config.ts
-phpunit.xml
-phpstan.neon
-pint.json
-eslint.config.mjs
-tsconfig.json
-jsconfig.json
-postcss.config.js
-tailwind.config.js
-
-node_modules
-extensions/*/node_modules
-
-Homestead.json
-Homestead.yaml
-auth.json
-.env.backup
-.rnd
-
-_ide_helper.php
-.phpstorm.meta.php
-
-storage/logs/*
-storage/*.key

.env.ci

@@ -34,12 +34,7 @@ SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
 # Mail
-MAIL_MAILER=smtp
-MAIL_HOST=localhost
-MAIL_PORT=1025
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_MAILER=log
 MAIL_FROM_ADDRESS="no-reply@solidtime.test"
 MAIL_FROM_NAME="solidtime"
 MAIL_REPLY_TO_ADDRESS="hello@solidtime.test"
@@ -60,7 +55,4 @@ AUDITING_ENABLED=true
 TELESCOPE_ENABLED=false
 
 # Services
-GOTENBERG_URL=http://localhost:3000
-
-# Octane
-OCTANE_SERVER=frankenphp
+GOTENBERG_URL=http://0.0.0.0:3000

.env.example

@@ -77,9 +77,6 @@ TELESCOPE_ENABLED=false
 # Services
 GOTENBERG_URL=http://gotenberg:3000
 
-# Octane
-OCTANE_SERVER=frankenphp
-
 # Local setup
 NGINX_HOST_NAME=solidtime.test
 NETWORK_NAME=reverse-proxy-docker-traefik_routing

.github/workflows/build-onpremise.yml

@@ -8,8 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-onpremise.yml'
-      - '.dockerignore'
-      - 'extensions/manifest.json'
       - 'docker/prod/**'
   workflow_dispatch:
 
@@ -37,7 +35,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -48,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@v2"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
-          pattern: "v*[0-9].*[0-9].*[0-9]"
+          prefix: "v"
 
       - name: "Get version"
         id: release-version
@@ -93,23 +91,14 @@ jobs:
         if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
-      - name: "Read extension manifest"
-        id: extension-manifest
-        run: |
-          {
-            echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
-            echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
-          } >> "$GITHUB_OUTPUT"
-
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
-          repository: ${{ steps.extension-manifest.outputs.invoicing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
+          repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
 
@@ -135,27 +124,27 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKER_REPO }}
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: registry.on-premise.solidtime.io
           username: ${{ secrets.ONPREMISE_USERNAME }}
           password: ${{ secrets.ONPREMISE_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Build and push by digest"
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/prod/Dockerfile
@@ -174,7 +163,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: "Upload digest"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
@@ -188,25 +177,25 @@ jobs:
       - build
     steps:
       - name: "Download digests"
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: "Login to solidtime OnPremise Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         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@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Docker meta"
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKER_REPO }}

.github/workflows/build-private.yml

@@ -8,8 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-private.yml'
-      - '.dockerignore'
-      - 'extensions/manifest.json'
       - 'docker/prod/**'
   workflow_dispatch:
 permissions:
@@ -24,7 +22,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -35,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@v2"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
-          pattern: "v*[0-9].*[0-9].*[0-9]"
+          prefix: "v"
 
       - name: "Get version"
         id: version
@@ -70,27 +68,14 @@ jobs:
         run: cat .env
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
-      - name: "Read extension manifest"
-        id: extension-manifest
-        run: |
-          {
-            echo "billing_repository=$(jq -r '.Billing.repository' extensions/manifest.json)"
-            echo "billing_ref=$(jq -r '.Billing.ref' extensions/manifest.json)"
-            echo "services_repository=$(jq -r '.Services.repository' extensions/manifest.json)"
-            echo "services_ref=$(jq -r '.Services.ref' extensions/manifest.json)"
-            echo "invoicing_repository=$(jq -r '.Invoicing.repository' extensions/manifest.json)"
-            echo "invoicing_ref=$(jq -r '.Invoicing.ref' extensions/manifest.json)"
-          } >> "$GITHUB_OUTPUT"
-
       - name: "Checkout billing extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
-          repository: ${{ steps.extension-manifest.outputs.billing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.billing_ref }}
+          repository: solidtime-io/extension-billing
           path: extensions/Billing
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_BILLING_EXTENSION }}
 
@@ -108,10 +93,9 @@ jobs:
         run: cd extensions/Billing && npm ci
 
       - name: "Checkout services extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
-          repository: ${{ steps.extension-manifest.outputs.services_repository }}
-          ref: ${{ steps.extension-manifest.outputs.services_ref }}
+          repository: solidtime-io/extension-services
           path: extensions/Services
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_SERVICES_EXTENSION }}
 
@@ -127,10 +111,9 @@ jobs:
         run: cd extensions/Services && npm ci
 
       - name: "Checkout invoicing extension"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
-          repository: ${{ steps.extension-manifest.outputs.invoicing_repository }}
-          ref: ${{ steps.extension-manifest.outputs.invoicing_ref }}
+          repository: solidtime-io/extension-invoicing
           path: extensions/Invoicing
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY_INVOICING_EXTENSION }}
 
@@ -177,7 +160,7 @@ jobs:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: rg.fr-par.scw.cloud/solidtime
           username: nologin
@@ -185,7 +168,7 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: rg.fr-par.scw.cloud/solidtime/solidtime
           tags: |
@@ -196,13 +179,13 @@ jobs:
             type=sha,format=long
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Build and push"
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           build-args: |

.github/workflows/build-public.yml

@@ -8,7 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/build-public.yml'
-      - '.dockerignore'
       - 'docker/prod/**'
   workflow_dispatch:
 
@@ -37,7 +36,7 @@ jobs:
 
     steps:
       - name: "Check out code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # Required for WyriHaximus/github-action-get-previous-tag
 
@@ -48,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@v2"
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
         with:
-          pattern: "v*[0-9].*[0-9].*[0-9]"
+          prefix: "v"
 
       - name: "Get version"
         id: release-version
@@ -93,7 +92,7 @@ jobs:
         if: steps.cache-vendor.outputs.cache-hit != 'true' # Skip if cache hit
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
@@ -110,34 +109,34 @@ jobs:
 
       - name: "Docker meta"
         id: "meta"
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKERHUB_REPO }}
             ${{ env.GHCR_REPO }}
 
       - name: "Login to Docker Hub Container Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GitHub Container Registry"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Build and push by digest"
         id: build
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: docker/prod/Dockerfile
@@ -156,7 +155,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: "Upload digest"
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: digests-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
@@ -170,31 +169,31 @@ jobs:
       - build
     steps:
       - name: "Download digests"
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v4
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: "Login to Docker Hub"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: "Login to GHCR"
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: "Docker meta"
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: |
             ${{ env.DOCKERHUB_REPO }}

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

@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
 
       - 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@v7
+        uses: actions/upload-artifact@v4
         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@v7
+        uses: actions/checkout@v4
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2
@@ -24,7 +24,7 @@ jobs:
         run: composer install -n --prefer-dist
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 

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

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

.github/workflows/npm-lint.yml

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

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

@@ -11,11 +11,11 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
       - name: Install root project dependencies
         run: npm ci
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'

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

@@ -11,9 +11,9 @@ jobs:
       id-token: write
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
       # Setup .npmrc file to publish to npm
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
           registry-url: 'https://registry.npmjs.org'

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

@@ -1,27 +0,0 @@
-name: NPM Test Unit
-
-on: [push]
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    env:
-      TZ: UTC
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Use Node.js"
-        uses: actions/setup-node@v7
-        with:
-          node-version: '20.x'
-
-      - name: "Install npm dependencies"
-        run: npm ci
-
-      - name: "Run vitest"
-        run: npm run test:unit

.github/workflows/npm-typecheck.yml

@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
 
       - name: "Setup PHP (for Ziggy)"
         uses: shivammathur/setup-php@v2
@@ -23,7 +23,7 @@ jobs:
         run: composer install -n --prefer-dist
 
       - name: "Use Node.js"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 

.github/workflows/phpstan.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
 
       - 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@v7
+        uses: actions/checkout@v4
 
       - name: "Setup PHP"
         uses: shivammathur/setup-php@v2
@@ -48,7 +48,7 @@ jobs:
       - name: "Run composer install"
         run: composer install -n --prefer-dist
 
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
@@ -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@v7.0.0
+        uses: codecov/codecov-action@v5.4.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           slug: solidtime-io/solidtime

.github/workflows/pint.yml

@@ -9,9 +9,9 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
 
       - name: "Check code style"
-        uses: aglipanci/laravel-pint-action@2.6
+        uses: aglipanci/laravel-pint-action@2.5
         with:
           configPath: "pint.json"

.github/workflows/playwright.yml

@@ -6,18 +6,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
-        shardTotal: [8]
 
     services:
       mailpit:
         image: 'axllent/mailpit:latest'
-        ports:
-          - 1025:1025
-          - 8025:8025
       pgsql_test:
         image: postgres:15
         env:
@@ -35,10 +27,10 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v7
+        uses: actions/checkout@v4
 
       - name: "Setup node"
-        uses: actions/setup-node@v7
+        uses: actions/setup-node@v4
         with:
           node-version: '20.x'
 
@@ -65,63 +57,22 @@ jobs:
       - name: "Build Frontend"
         run: npm run build
 
-      - name: "Install FrankenPHP"
-        run: |
-          ARCH="$(uname -m)"
-          curl -fsSL "https://github.com/dunglas/frankenphp/releases/latest/download/frankenphp-linux-${ARCH}" -o /usr/local/bin/frankenphp
-          chmod +x /usr/local/bin/frankenphp
-
-      - name: "Run Laravel Octane Server"
-        run: php artisan octane:start --server=frankenphp --host=127.0.0.1 --port=8000 --workers=4 --max-requests=500 > /dev/null 2>&1 &
-        env:
-          OCTANE_SERVER: frankenphp
+      - name: "Run Laravel Server"
+        run: php artisan serve > /dev/null 2>&1 &
 
       - name: "Install Playwright Browsers"
         run: npx playwright install --with-deps
 
       - name: "Run Playwright tests"
-        run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }}
+        run: npx playwright test
         env:
           PLAYWRIGHT_BASE_URL: 'http://127.0.0.1:8000'
-          MAILPIT_BASE_URL: 'http://localhost:8025'
 
-      - name: "Upload blob report"
-        uses: actions/upload-artifact@v7
+      - name: "Upload test results"
+        uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: blob-report-${{ matrix.shardIndex }}
-          path: blob-report/
-          retention-days: 7
-
-  merge-reports:
-    if: always()
-    needs: [test]
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@v7
-
-      - name: "Setup node"
-        uses: actions/setup-node@v7
-        with:
-          node-version: '20.x'
-
-      - name: "Install dependencies"
-        run: npm ci
-
-      - name: "Download blob reports"
-        uses: actions/download-artifact@v8
-        with:
-          path: all-blob-reports
-          pattern: blob-report-*
-          merge-multiple: true
-
-      - name: "Merge reports"
-        run: npx playwright merge-reports --reporter html ./all-blob-reports
-
-      - name: "Upload merged HTML report"
-        uses: actions/upload-artifact@v7
-        with:
-          name: playwright-report
-          path: playwright-report/
+          name: test-results
+          path: test-results/
           retention-days: 30
+

.gitignore

@@ -26,10 +26,9 @@ yarn-error.log
 /blob-report/
 /playwright/.cache/
 /coverage
-/extensions/*
+/extensions
 !/extensions/.gitkeep
 !/extensions/extensions_autoload.php
-!/extensions/manifest.json
 /auth.json
 /modules_statuses.json
 /k8s
@@ -43,4 +42,3 @@ yarn-error.log
 /data
 /config/caddy
 /config/composer
-/AGENTS.md

.npmrc

@@ -1 +0,0 @@
-min-release-age=7

README.md

@@ -1,4 +1,4 @@
-# solidtime - The modern Open-Source TimeTracker
+# solidtime - The modern Open-Source Time Tracker
 
 [![GitHub License](https://img.shields.io/github/license/solidtime-io/solidtime?style=flat-square)](https://github.com/solidtime-io/solidtime/blob/main/LICENSE.md)
 [![Codecov](https://img.shields.io/codecov/c/github/solidtime-io/solidtime?style=flat-square&logo=codecov)](https://codecov.io/gh/solidtime-io/solidtime)
@@ -37,8 +37,6 @@ If you have a **feature request**, please [**create a discussion**](https://gith
 
 Please open an issue or start a discussion and wait for approval before submitting a pull request. This does not apply to tiny fixes or changes however, please keep in mind that we might not merge PRs for various reasons. 
 
-**If you submit an AI slop pull request (especially without following the proper procedure), you will be banned from future contributions to solidtime.**
-
 Please read the [CONTRIBUTING.md](./CONTRIBUTING.md) before sumbitting a Pull Request.
 
 We do accept contributions in the [documentation repository](https://github.com/solidtime-io/docs) f.e. to add new self-hosting guides.

SECURITY.md

@@ -3,18 +3,3 @@
 ## Reporting a Vulnerability
 
 If you discover a security vulnerability regarding this project, please e-mail me to [security@solidtime.io](mailto:security@solidtime.io)!
-
-## Out of scope
-
-
-Reports we typically won't issue an advisory for:
-
-* Theoretical findings without a working PoC
-* Raw scanner output without manual validation
-* Missing/weak security headers in isolation (CSP, X-Frame-Options, HSTS, etc.)
-* SPF/DKIM/DMARC on non-mail-sending domains; missing DNSSEC/CAA; TLS cipher preferences
-* Self-XSS; CSRF on non-state-changing endpoints (logout, theme)
-* CSV / spreadsheet formula injection in exports — treated as a spreadsheet-application issue
-* Org owners or admins acting destructively within their own organization
-* Anything requiring direct DB, shell, or filesystem access on a self-hosted instance
-* Missing OAuth Scope enforcement (this is not implemented yet, but AI scanners flag it which is why it is included in this list until we actually support it)

app/Actions/Fortify/CreateNewUser.php

@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\ValidationException;
 use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
+use Laravel\Jetstream\Jetstream;
 use Log;
 
 class CreateNewUser implements CreatesNewUsers
@@ -54,7 +55,7 @@ class CreateNewUser implements CreatesNewUsers
                 }),
             ],
             'password' => $this->passwordRules(),
-            'terms' => ['accepted', 'required'],
+            'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '',
             'newsletter_consent' => [
                 'boolean',
             ],

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -4,9 +4,13 @@ declare(strict_types=1);
 
 namespace App\Actions\Fortify;
 
-use App\Exceptions\MovedToApiException;
+use App\Enums\Weekday;
 use App\Models\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
+use Korridor\LaravelModelValidationRules\Rules\UniqueEloquent;
 use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
 
 class UpdateUserProfileInformation implements UpdatesUserProfileInformation
@@ -20,6 +24,56 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
      */
     public function update(User $user, array $input): void
     {
-        throw new MovedToApiException;
+        Validator::make($input, [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'email' => [
+                'required',
+                'email',
+                'max:255',
+                UniqueEloquent::make(User::class, 'email')->ignore($user->id)->query(function (Builder $query) {
+                    /** @var Builder<User> $query */
+                    return $query->where('is_placeholder', '=', false);
+                }),
+            ],
+            'photo' => [
+                'nullable',
+                'mimes:jpg,jpeg,png',
+                'max:1024',
+            ],
+            'timezone' => [
+                'required',
+                'timezone:all',
+            ],
+            'week_start' => [
+                'required',
+                Rule::enum(Weekday::class),
+            ],
+        ])->validateWithBag('updateProfileInformation');
+
+        if (isset($input['photo'])) {
+            $user->updateProfilePhoto($input['photo']);
+        }
+
+        if ($input['email'] !== $user->email) {
+            $user->forceFill([
+                'name' => $input['name'],
+                'email' => $input['email'],
+                'email_verified_at' => null,
+                'timezone' => $input['timezone'],
+                'week_start' => $input['week_start'],
+            ])->save();
+
+            $user->sendEmailVerificationNotification();
+        } else {
+            $user->forceFill([
+                'name' => $input['name'],
+                'timezone' => $input['timezone'],
+                'week_start' => $input['week_start'],
+            ])->save();
+        }
     }
 }

app/Actions/Jetstream/AddOrganizationMember.php

@@ -0,0 +1,94 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Enums\Role;
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\MemberService;
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Rules\In;
+use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
+use Laravel\Jetstream\Contracts\AddsTeamMembers;
+
+class AddOrganizationMember implements AddsTeamMembers
+{
+    /**
+     * Add a new team member to the given team.
+     */
+    public function add(User $owner, Organization $organization, string $email, ?string $role = null): void
+    {
+        Gate::forUser($owner)->authorize('addTeamMember', $organization); // TODO: refactor after owner refactoring
+
+        $this->validate($organization, $email, $role);
+
+        $newOrganizationMember = User::query()
+            ->where('email', $email)
+            ->where('is_placeholder', '=', false)
+            ->firstOrFail();
+
+        app(MemberService::class)->addMember($newOrganizationMember, $organization, Role::from($role));
+    }
+
+    /**
+     * Validate the add member operation.
+     */
+    protected function validate(Organization $organization, string $email, ?string $role): void
+    {
+        Validator::make([
+            'email' => $email,
+            'role' => $role,
+        ], $this->rules())->after(
+            $this->ensureUserIsNotAlreadyOnTeam($organization, $email)
+        )->validateWithBag('addTeamMember');
+    }
+
+    /**
+     * Get the validation rules for adding a team member.
+     *
+     * @return array<string, array<ValidationRule|Rule|string|In>>
+     */
+    protected function rules(): array
+    {
+        return [
+            'email' => [
+                'required',
+                'email',
+                ExistsEloquent::make(User::class, 'email', function (Builder $builder) {
+                    /** @var Builder<User> $builder */
+                    return $builder->where('is_placeholder', '=', false);
+                })->withMessage(__('We were unable to find a registered user with this email address.')),
+            ],
+            'role' => [
+                'required',
+                'string',
+                Rule::in([
+                    Role::Admin->value,
+                    Role::Manager->value,
+                    Role::Employee->value,
+                ]),
+            ],
+        ];
+    }
+
+    /**
+     * Ensure that the user is not already on the team.
+     */
+    protected function ensureUserIsNotAlreadyOnTeam(Organization $team, string $email): Closure
+    {
+        return function ($validator) use ($team, $email): void {
+            $validator->errors()->addIf(
+                $team->hasRealUserWithEmail($email),
+                'email',
+                __('This user already belongs to the team.')
+            );
+        };
+    }
+}

app/Actions/Jetstream/CreateOrganization.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Events\AfterCreateOrganization;
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\IpLookup\IpLookupServiceContract;
+use App\Service\OrganizationService;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\CreatesTeams;
+use Laravel\Jetstream\Jetstream;
+
+class CreateOrganization implements CreatesTeams
+{
+    /**
+     * Validate and create a new team for the given user.
+     *
+     * @param  array<string, string>  $input
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
+     */
+    public function create(User $user, array $input): Organization
+    {
+        Gate::forUser($user)->authorize('create', Jetstream::newTeamModel());
+
+        Validator::make($input, [
+            'name' => ['required', 'string', 'max:255'],
+        ])->validateWithBag('createTeam');
+
+        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup(request()->ip());
+
+        $currency = null;
+        if ($ipLookupResponse !== null) {
+            $currency = $ipLookupResponse->currency;
+        }
+
+        $organization = app(OrganizationService::class)->createOrganization(
+            $input['name'],
+            $user,
+            false,
+            $currency
+        );
+
+        $user->switchTeam($organization);
+
+        // Note: The refresh is necessary for currently unknown reasons. Do not remove it.
+        $organization = $organization->refresh();
+        AfterCreateOrganization::dispatch($organization);
+
+        return $organization;
+    }
+}

app/Actions/Jetstream/DeleteOrganization.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Service\DeletionService;
+use Laravel\Jetstream\Contracts\DeletesTeams;
+
+class DeleteOrganization implements DeletesTeams
+{
+    /**
+     * Delete the given team.
+     */
+    public function delete(Organization $organization): void
+    {
+        /** @see ValidateOrganizationDeletion */
+        app(DeletionService::class)->deleteOrganization($organization);
+    }
+}

app/Actions/Jetstream/DeleteUser.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\Api\ApiException;
+use App\Models\User;
+use App\Service\DeletionService;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\DeletesUsers;
+
+class DeleteUser implements DeletesUsers
+{
+    /**
+     * Delete the given user.
+     *
+     * @throws ValidationException
+     */
+    public function delete(User $user): void
+    {
+        try {
+            app(DeletionService::class)->deleteUser($user);
+        } catch (ApiException $exception) {
+            throw ValidationException::withMessages([
+                'password' => $exception->getTranslatedMessage(),
+            ]);
+        }
+    }
+}

app/Actions/Jetstream/InviteOrganizationMember.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\MovedToApiException;
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+use Laravel\Jetstream\Contracts\InvitesTeamMembers;
+
+class InviteOrganizationMember implements InvitesTeamMembers
+{
+    /**
+     * Invite a new team member to the given team.
+     *
+     * @throws Exception
+     */
+    public function invite(User $user, Organization $organization, string $email, ?string $role = null): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/RemoveOrganizationMember.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Exceptions\MovedToApiException;
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+use Laravel\Jetstream\Contracts\RemovesTeamMembers;
+
+class RemoveOrganizationMember implements RemovesTeamMembers
+{
+    /**
+     * Remove the team member from the given team.
+     *
+     * @throws Exception
+     */
+    public function remove(User $user, Organization $organization, User $teamMember): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/UpdateMemberRole.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Enums\Role;
+use App\Exceptions\MovedToApiException;
+use App\Models\Member;
+use App\Models\Organization;
+use App\Models\User;
+use Exception;
+
+class UpdateMemberRole
+{
+    /**
+     * Update the role for the given team member.
+     *
+     * @throws Exception
+     */
+    public function update(User $actingUser, Organization $organization, string $userId, string $role): void
+    {
+        throw new MovedToApiException;
+    }
+}

app/Actions/Jetstream/UpdateOrganization.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Models\User;
+use App\Rules\CurrencyRule;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\ValidationException;
+use Laravel\Jetstream\Contracts\UpdatesTeamNames;
+
+class UpdateOrganization implements UpdatesTeamNames
+{
+    /**
+     * Validate and update the given team's name.
+     *
+     * @param  array<string, string>  $input
+     *
+     * @throws AuthorizationException
+     * @throws ValidationException
+     */
+    public function update(User $user, Organization $organization, array $input): void
+    {
+        Gate::forUser($user)->authorize('update', $organization);
+
+        Validator::make($input, [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+            ],
+            'currency' => [
+                'required',
+                'string',
+                new CurrencyRule,
+            ],
+        ])->validateWithBag('updateTeamName');
+
+        $organization->forceFill([
+            'name' => $input['name'],
+            'currency' => $input['currency'],
+        ])->save();
+    }
+}

app/Actions/Jetstream/ValidateOrganizationDeletion.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Jetstream;
+
+use App\Models\Organization;
+use App\Models\User;
+use App\Service\PermissionStore;
+use Illuminate\Auth\Access\AuthorizationException;
+
+class ValidateOrganizationDeletion
+{
+    /**
+     * Validate that the team can be deleted by the given user.
+     *
+     * @param  User  $user  Authenticated user
+     * @param  Organization  $organization  Organization to be deleted
+     *
+     * @throws AuthorizationException
+     */
+    public function validate(User $user, Organization $organization): void
+    {
+        if (! app(PermissionStore::class)->userHas($organization, $user, 'organizations:delete')) {
+            throw new AuthorizationException;
+        }
+    }
+}

app/Console/Commands/Admin/UserCreateCommand.php

@@ -69,7 +69,7 @@ class UserCreateCommand extends Command
             );
         });
         /** @var Organization|null $organization */
-        $organization = $user->ownedOrganizations->first();
+        $organization = $user->ownedTeams->first();
         if ($organization === null) {
             throw new LogicException('User does not have an organization');
         }

app/Enums/Role.php

@@ -4,12 +4,8 @@ declare(strict_types=1);
 
 namespace App\Enums;
 
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
 enum Role: string
 {
-    use LaravelEnumHelper;
-
     case Owner = 'owner';
     case Admin = 'admin';
     case Manager = 'manager';

app/Enums/TagMatchType.php

@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Enums;
-
-use Datomatic\LaravelEnumHelper\LaravelEnumHelper;
-
-enum TagMatchType: string
-{
-    use LaravelEnumHelper;
-
-    case Contains = 'contains';
-
-    case NotContains = 'not_contains';
-}

app/Events/MemberAdded.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Events;
-
-use App\Models\Member;
-use App\Models\Organization;
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-
-/**
- * Replaces legacy TeamMemberAdded event.
- */
-class MemberAdded
-{
-    use Dispatchable;
-
-    public Member $member;
-
-    public Organization $organization;
-
-    public User $user;
-
-    public function __construct(Member $member, Organization $organization, User $user)
-    {
-        $this->member = $member;
-        $this->organization = $organization;
-        $this->user = $user;
-    }
-}

app/Events/MemberAdding.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Events;
-
-use App\Enums\Role;
-use App\Models\Organization;
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-
-/**
- * Replaces legacy AddingTeamMember event.
- */
-class MemberAdding
-{
-    use Dispatchable;
-
-    public User $user;
-
-    public Organization $organization;
-
-    public Role $role;
-
-    public function __construct(User $user, Organization $organization, Role $role)
-    {
-        $this->user = $user;
-        $this->organization = $organization;
-        $this->role = $role;
-    }
-}

app/Events/OrganizationInvitationAdding.php

@@ -1,38 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Events;
-
-use App\Enums\Role;
-use App\Models\Organization;
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-
-/**
- * Replaces legacy InvitingTeamMember event.
- */
-class OrganizationInvitationAdding
-{
-    use Dispatchable;
-
-    public Organization $organization;
-
-    public string $email;
-
-    public Role $role;
-
-    public User $inviter;
-
-    public function __construct(
-        Organization $organization,
-        string $email,
-        Role $role,
-        User $inviter
-    ) {
-        $this->role = $role;
-        $this->email = $email;
-        $this->organization = $organization;
-        $this->inviter = $inviter;
-    }
-}

app/Exceptions/Api/UserResendEmailVerificationNoPendingEmailApiException.php

@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Exceptions\Api;
-
-class UserResendEmailVerificationNoPendingEmailApiException extends ApiException
-{
-    public const string KEY = 'user_resend_email_verification_no_pending_email';
-}

app/Filament/Resources/FailedJobResource.php

@@ -50,7 +50,7 @@ class FailedJobResource extends Resource
                 TextInput::make('queue')->disabled(),
 
                 // make text a little bit smaller because often a complete Stack Trace is shown:
-                Textarea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
+                TextArea::make('exception')->disabled()->columnSpan(4)->extraInputAttributes(['style' => 'font-size: 80%;']),
                 PrettyJsonField::make('payload')->disabled()->columnSpan(4),
             ])->columns(4);
     }

app/Filament/Resources/OrganizationInvitationResource.php

@@ -39,7 +39,7 @@ class OrganizationInvitationResource extends Resource
                     ->required(),
                 Select::make('role')
                     ->options(Role::class),
-                Select::make('organization_id')
+                Forms\Components\Select::make('organization_id')
                     ->label('Organization')
                     ->relationship(name: 'organization', titleAttribute: 'name')
                     ->searchable(['name'])

app/Filament/Resources/OrganizationResource.php

@@ -55,7 +55,7 @@ class OrganizationResource extends Resource
                     ->label('Is personal?')
                     ->hiddenOn(['create'])
                     ->required(),
-                Select::make('user_id')
+                Forms\Components\Select::make('user_id')
                     ->label('Owner')
                     ->relationship(name: 'owner', titleAttribute: 'email')
                     ->searchable(['name', 'email'])
@@ -76,7 +76,7 @@ class OrganizationResource extends Resource
                 Select::make('time_format')
                     ->options(TimeFormat::toSelectArray())
                     ->required(),
-                Select::make('currency')
+                Forms\Components\Select::make('currency')
                     ->label('Currency')
                     ->options(function (): array {
                         $currencies = ISOCurrencyProvider::getInstance()->getAvailableCurrencies();
@@ -114,22 +114,22 @@ class OrganizationResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
                 Tables\Columns\IconColumn::make('personal_team')
                     ->boolean()
                     ->label('Is personal?')
                     ->sortable(),
-                TextColumn::make('owner.email')
+                Tables\Columns\TextColumn::make('owner.email')
                     ->sortable(),
-                TextColumn::make('currency'),
+                Tables\Columns\TextColumn::make('currency'),
                 TextColumn::make('billable_rate')
                     ->money(fn (Organization $resource) => $resource->currency, divideBy: 100),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
@@ -223,7 +223,7 @@ class OrganizationResource extends Resource
 
                                 return $select;
                             }),
-                        Select::make('timezone')
+                        Forms\Components\Select::make('timezone')
                             ->label('Timezone')
                             ->options(fn (): array => app(TimezoneService::class)->getSelectOptions())
                             ->searchable()

app/Filament/Resources/OrganizationResource/RelationManagers/InvitationsRelationManager.php

@@ -21,7 +21,7 @@ use Illuminate\Validation\Rule;
 
 class InvitationsRelationManager extends RelationManager
 {
-    protected static string $relationship = 'organizationInvitations';
+    protected static string $relationship = 'teamInvitations';
 
     protected static ?string $title = 'Invitations';
 
@@ -64,7 +64,7 @@ class InvitationsRelationManager extends RelationManager
                         $ownerRecord = $this->getOwnerRecord();
 
                         return app(InvitationService::class)
-                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']), auth()->user());
+                            ->inviteUser($ownerRecord, $data['email'], Role::from($data['role']));
                     }),
             ])
             ->actions([

app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php

@@ -49,13 +49,13 @@ class UsersRelationManager extends RelationManager
         return $table
             ->recordTitleAttribute('name')
             ->columns([
-                TextColumn::make('name'),
-                TextColumn::make('role'),
+                Tables\Columns\TextColumn::make('name'),
+                Tables\Columns\TextColumn::make('role'),
                 TextColumn::make('billable_rate')
                     ->money($organization->currency, divideBy: 100),
             ])
             ->headerActions([
-                AttachAction::make()
+                Tables\Actions\AttachAction::make()
                     ->recordTitle(fn (User $record): string => "{$record->name} ({$record->email})")
                     ->form(fn (AttachAction $action): array => [
                         $action->getRecordSelect(),

app/Filament/Resources/ReportResource.php

@@ -63,11 +63,11 @@ class ReportResource extends Resource
                         return $record->getRawOriginal('properties');
                     })
                     ->disabled(),
-                DateTimePicker::make('created_at')
+                Forms\Components\DateTimePicker::make('created_at')
                     ->label('Created At')
                     ->hiddenOn(['create'])
                     ->disabled(),
-                DateTimePicker::make('updated_at')
+                Forms\Components\DateTimePicker::make('updated_at')
                     ->label('Updated At')
                     ->hiddenOn(['create'])
                     ->disabled(),
@@ -78,10 +78,10 @@ class ReportResource extends Resource
     {
         return $table
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('description')
+                Tables\Columns\TextColumn::make('description')
                     ->searchable()
                     ->sortable(),
                 ToggleColumn::make('is_public')
@@ -90,10 +90,10 @@ class ReportResource extends Resource
                 TextColumn::make('organization.name')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),

app/Filament/Resources/TimeEntryResource.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\TimeEntryResource\Pages;
-use App\Models\Member;
 use App\Models\TimeEntry;
 use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Components\Select;
@@ -17,7 +16,6 @@ use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Filters\SelectFilter;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
 
 class TimeEntryResource extends Resource
 {
@@ -53,23 +51,15 @@ class TimeEntryResource extends Resource
                     ->rules([
                         'after_or_equal:start',
                     ]),
-                Select::make('member_id')
-                    ->relationship(
-                        name: 'member',
-                        titleAttribute: 'id',
-                        modifyQueryUsing: fn (Builder $query) => $query->with(['user', 'organization'])
-                    )
-                    ->getOptionLabelFromRecordUsing(fn (Member $record): string => $record->user->email.' ('.$record->organization->name.')')
-                    ->searchable()
+                Select::make('user_id')
+                    ->relationship(name: 'user', titleAttribute: 'email')
+                    ->searchable(['name', 'email'])
                     ->required(),
                 Select::make('project_id')
                     ->relationship(name: 'project', titleAttribute: 'name')
                     ->searchable(['name'])
                     ->nullable(),
-                Select::make('task_id')
-                    ->relationship(name: 'task', titleAttribute: 'name')
-                    ->searchable(['name'])
-                    ->nullable(),
+                // TODO
             ]);
     }
 
@@ -93,11 +83,11 @@ class TimeEntryResource extends Resource
                             ($record->end?->toDateTimeString('minute') ?? '...').')';
                     })
                     ->label('Time'),
-                TextColumn::make('organization.name')
+                Tables\Columns\TextColumn::make('organization.name')
                     ->sortable(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->sortable(),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->sortable(),
             ])
             ->filters([

app/Filament/Resources/TimeEntryResource/Pages/CreateTimeEntry.php

@@ -5,28 +5,9 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TimeEntryResource\Pages;
 
 use App\Filament\Resources\TimeEntryResource;
-use App\Models\Member;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateTimeEntry extends CreateRecord
 {
     protected static string $resource = TimeEntryResource::class;
-
-    /**
-     * @param  array<string, mixed>  $data
-     * @return array<string, mixed>
-     */
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        if (isset($data['member_id'])) {
-            /** @var Member|null $member */
-            $member = Member::query()->find($data['member_id']);
-            if ($member !== null) {
-                $data['user_id'] = $member->user_id;
-                $data['organization_id'] = $member->organization_id;
-            }
-        }
-
-        return $data;
-    }
 }

app/Filament/Resources/TimeEntryResource/Pages/EditTimeEntry.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Filament\Resources\TimeEntryResource\Pages;
 
 use App\Filament\Resources\TimeEntryResource;
-use App\Models\Member;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
@@ -20,22 +19,4 @@ class EditTimeEntry extends EditRecord
                 ->icon('heroicon-m-trash'),
         ];
     }
-
-    /**
-     * @param  array<string, mixed>  $data
-     * @return array<string, mixed>
-     */
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        if (isset($data['member_id'])) {
-            /** @var Member|null $member */
-            $member = Member::query()->find($data['member_id']);
-            if ($member !== null) {
-                $data['user_id'] = $member->user_id;
-                $data['organization_id'] = $member->organization_id;
-            }
-        }
-
-        return $data;
-    }
 }

app/Filament/Resources/UserResource.php

@@ -12,7 +12,6 @@ use App\Filament\Resources\UserResource\RelationManagers\OwnedOrganizationsRelat
 use App\Models\User;
 use App\Service\DeletionService;
 use App\Service\TimezoneService;
-use App\Service\UserService;
 use Brick\Money\ISOCurrencyProvider;
 use Exception;
 use Filament\Forms;
@@ -48,17 +47,17 @@ class UserResource extends Resource
         return $form
             ->columns(1)
             ->schema([
-                TextInput::make('id')
+                Forms\Components\TextInput::make('id')
                     ->label('ID')
                     ->disabled()
                     ->visibleOn(['update', 'show'])
                     ->readOnly()
                     ->maxLength(255),
-                TextInput::make('name')
+                Forms\Components\TextInput::make('name')
                     ->label('Name')
                     ->required()
                     ->maxLength(255),
-                TextInput::make('email')
+                Forms\Components\TextInput::make('email')
                     ->label('Email')
                     ->required()
                     ->rules($record?->is_placeholder ? [] : [
@@ -66,7 +65,7 @@ class UserResource extends Resource
                             ->ignore($record?->getKey()),
                     ])
                     ->rule([
-                        'email:rfc,strict',
+                        'email',
                     ])
                     ->maxLength(255),
                 Forms\Components\Toggle::make('is_placeholder')
@@ -180,7 +179,7 @@ class UserResource extends Resource
             ])
             ->actions([
                 Impersonate::make()->before(function (User $record): void {
-                    if ($record->currentOrganization === null) {
+                    if ($record->currentTeam === null) {
                         $organization = $record->organizations()->where('personal_team', '=', true)->first();
                         if ($organization === null) {
                             $organization = $record->organizations()->first();
@@ -188,7 +187,8 @@ class UserResource extends Resource
                         if ($organization === null) {
                             throw new Exception('User has no organization');
                         }
-                        app(UserService::class)->switchCurrentOrganization($record, $organization);
+                        $record->currentTeam()->associate($organization);
+                        $record->save();
                     }
                 }),
                 Tables\Actions\EditAction::make(),

app/Filament/Resources/UserResource/RelationManagers/OwnedOrganizationsRelationManager.php

@@ -16,7 +16,7 @@ class OwnedOrganizationsRelationManager extends RelationManager
 {
     protected static ?string $title = 'Owned Organizations';
 
-    protected static string $relationship = 'ownedOrganizations';
+    protected static string $relationship = 'ownedTeams';
 
     public function form(Form $form): Form
     {

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

@@ -20,7 +20,7 @@ class ApiTokenController extends Controller
     /**
      * List all api token of the currently authenticated user
      *
-     * This endpoint is independent of the organization.
+     * This endpoint is independent of organization.
      *
      * @operationId getApiTokens
      *
@@ -35,7 +35,6 @@ class ApiTokenController extends Controller
                 /** @var Builder<Client> $query */
                 $query->whereJsonContains('grant_types', 'personal_access');
             })
-            ->orderBy('created_at', 'desc')
             ->get();
 
         return new ApiTokenCollection($tokens);

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

@@ -102,7 +102,7 @@ class ChartController extends Controller
         $this->checkPermission($organization, 'charts:view:own');
         $user = $this->user();
 
-        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 100);
+        $dailyTrackedHours = $dashboardService->getDailyTrackedHours($user, $organization, 60);
 
         return response()->json($dailyTrackedHours);
     }

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

@@ -43,8 +43,7 @@ class ClientController extends Controller
 
         $clientsQuery = Client::query()
             ->whereBelongsTo($organization, 'organization')
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id');
+            ->orderBy('created_at', 'desc');
 
         if (! $canViewAllClients) {
             $clientsQuery->visibleByEmployee($user);

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

@@ -40,9 +40,7 @@ class InvitationController extends Controller
     {
         $this->checkPermission($organization, 'invitations:view');
 
-        $invitations = $organization->organizationInvitations()
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id')
+        $invitations = $organization->teamInvitations()
             ->paginate(config('app.pagination_per_page_default'));
 
         return InvitationCollection::make($invitations);
@@ -64,7 +62,7 @@ class InvitationController extends Controller
         $email = $request->getEmail();
         $role = $request->getRole();
 
-        $invitationService->inviteUser($organization, $email, $role, $this->user());
+        $invitationService->inviteUser($organization, $email, $role);
 
         return response()->json(null, 204);
     }

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

@@ -60,8 +60,6 @@ class MemberController extends Controller
         $members = Member::query()
             ->whereBelongsTo($organization, 'organization')
             ->with(['user'])
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return MemberCollection::make($members);
@@ -193,7 +191,7 @@ class MemberController extends Controller
             throw new ThisPlaceholderCanNotBeInvitedUseTheMergeToolInsteadException;
         }
 
-        $invitationService->inviteUser($organization, $user->email, Role::Employee, $this->user());
+        $invitationService->inviteUser($organization, $user->email, Role::Employee);
 
         return response()->json(null, 204);
     }

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

@@ -5,19 +5,11 @@ declare(strict_types=1);
 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;
 use App\Models\Organization;
 use App\Service\BillableRateService;
-use App\Service\DeletionService;
-use App\Service\IpLookup\IpLookupServiceContract;
-use App\Service\OrganizationService;
-use App\Service\UserService;
 use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
 
 class OrganizationController extends Controller
 {
@@ -51,9 +43,6 @@ 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();
         }
@@ -91,46 +80,4 @@ class OrganizationController extends Controller
 
         return new OrganizationResource($organization, true);
     }
-
-    /**
-     * Create organization
-     *
-     * @operationId createOrganization
-     */
-    public function store(OrganizationStoreRequest $request, OrganizationService $organizationService): OrganizationResource
-    {
-        $user = $this->user();
-        $ipLookupResponse = app(IpLookupServiceContract::class)->lookup($request->ip());
-
-        $currency = $ipLookupResponse?->currency;
-
-        $organization = $organizationService->createOrganization(
-            $request->getName(),
-            $user,
-            false,
-            $currency
-        );
-
-        app(UserService::class)->switchCurrentOrganization($user, $organization);
-
-        AfterCreateOrganization::dispatch($organization);
-
-        return new OrganizationResource($organization, true);
-    }
-
-    /**
-     * Delete organization
-     *
-     * @operationId deleteOrganization
-     *
-     * @throws AuthorizationException
-     */
-    public function destroy(Organization $organization, OrganizationDestroyRequest $request, DeletionService $deletionService): JsonResponse
-    {
-        $this->checkPermission($organization, 'organizations:delete');
-
-        $deletionService->deleteOrganization($organization);
-
-        return response()->json(null, 204);
-    }
 }

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

@@ -60,10 +60,7 @@ class ProjectController extends Controller
             $projectsQuery->whereNull('archived_at');
         }
 
-        $projects = $projectsQuery
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id')
-            ->paginate(config('app.pagination_per_page_default'));
+        $projects = $projectsQuery->paginate(config('app.pagination_per_page_default'));
 
         $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
 
@@ -79,7 +76,7 @@ class ProjectController extends Controller
      */
     public function show(Organization $organization, Project $project): JsonResource
     {
-        $this->checkPermission($organization, 'projects:view:all', $project);
+        $this->checkPermission($organization, 'projects:view', $project);
 
         // Note: There is currently no need to check if a user is a member of the project,
         // since this is only relevant for users with the role "employee" and they can not access this endpoint.

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

@@ -6,7 +6,6 @@ namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\InactiveUserCanNotBeUsedApiException;
 use App\Exceptions\Api\UserIsAlreadyMemberOfProjectApiException;
-use App\Http\Requests\V1\ProjectMember\ProjectMemberIndexRequest;
 use App\Http\Requests\V1\ProjectMember\ProjectMemberStoreRequest;
 use App\Http\Requests\V1\ProjectMember\ProjectMemberUpdateRequest;
 use App\Http\Resources\V1\ProjectMember\ProjectMemberCollection;
@@ -42,14 +41,12 @@ class ProjectMemberController extends Controller
      *
      * @operationId getProjectMembers
      */
-    public function index(Organization $organization, Project $project, ProjectMemberIndexRequest $request): ProjectMemberCollection
+    public function index(Organization $organization, Project $project): ProjectMemberCollection
     {
         $this->checkPermission($organization, 'project-members:view', $project);
 
         $projectMembers = ProjectMember::query()
             ->whereBelongsTo($project, 'project')
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return new ProjectMemberCollection($projectMembers);

app/Http/Controllers/Api/V1/Public/ReportController.php

@@ -59,7 +59,7 @@ class ReportController extends Controller
         $filter->addBillable($properties->billable);
         $filter->addMemberIdsFilter($properties->memberIds?->toArray());
         $filter->addProjectIdsFilter($properties->projectIds?->toArray());
-        $filter->addTagIdsFilter($properties->tagIds?->toArray(), $properties->tagMatchType);
+        $filter->addTagIdsFilter($properties->tagIds?->toArray());
         $filter->addTaskIdsFilter($properties->taskIds?->toArray());
         $filter->addClientIdsFilter($properties->clientIds?->toArray());
         $timeEntriesQuery = $filter->get();

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Enums\Weekday;
-use App\Http\Requests\V1\Report\ReportIndexRequest;
 use App\Http\Requests\V1\Report\ReportStoreRequest;
 use App\Http\Requests\V1\Report\ReportUpdateRequest;
 use App\Http\Resources\V1\Report\DetailedReportResource;
@@ -41,13 +40,12 @@ class ReportController extends Controller
      *
      * @operationId getReports
      */
-    public function index(Organization $organization, ReportIndexRequest $request): ReportCollection
+    public function index(Organization $organization): ReportCollection
     {
         $this->checkPermission($organization, 'reports:view');
 
         $reports = Report::query()
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->whereBelongsTo($organization, 'organization')
             ->paginate(config('app.pagination_per_page_default'));
 
@@ -97,7 +95,6 @@ class ReportController extends Controller
         $properties->setClientIds($request->input('properties.client_ids', null));
         $properties->setProjectIds($request->input('properties.project_ids', null));
         $properties->setTagIds($request->input('properties.tag_ids', null));
-        $properties->setTagMatchType($request->getPropertyTagMatchType());
         $properties->setTaskIds($request->input('properties.task_ids', null));
         $properties->weekStart = $request->has('properties.week_start') ? Weekday::from($request->input('properties.week_start')) : $user->week_start;
         $timezone = $user->timezone;
@@ -153,9 +150,6 @@ class ReportController extends Controller
                 $report->share_secret = null;
                 $report->public_until = null;
             }
-        } elseif ($report->is_public && $request->has('public_until')) {
-            // Allow updating expiration date on already-public reports
-            $report->public_until = $request->getPublicUntil();
         }
         $report->save();
 

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

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Controllers\Api\V1;
 
 use App\Exceptions\Api\EntityStillInUseApiException;
-use App\Http\Requests\V1\Tag\TagIndexRequest;
 use App\Http\Requests\V1\Tag\TagStoreRequest;
 use App\Http\Requests\V1\Tag\TagUpdateRequest;
 use App\Http\Resources\V1\Tag\TagCollection;
@@ -35,14 +34,13 @@ class TagController extends Controller
      *
      * @throws AuthorizationException
      */
-    public function index(Organization $organization, TagIndexRequest $request): TagCollection
+    public function index(Organization $organization): TagCollection
     {
         $this->checkPermission($organization, 'tags:view');
 
         $tags = Tag::query()
             ->whereBelongsTo($organization, 'organization')
             ->orderBy('created_at', 'desc')
-            ->orderBy('id')
             ->paginate(config('app.pagination_per_page_default'));
 
         return new TagCollection($tags);

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

@@ -82,10 +82,7 @@ class TaskController extends Controller
             $query->whereNull('done_at');
         }
 
-        $tasks = $query
-            ->orderBy('created_at', 'desc')
-            ->orderBy('id')
-            ->paginate(config('app.pagination_per_page_default'));
+        $tasks = $query->paginate(config('app.pagination_per_page_default'));
 
         return new TaskCollection($tasks);
     }

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

@@ -53,13 +53,12 @@ use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 use Maatwebsite\Excel\Facades\Excel;
 use Spatie\TemporaryDirectory\TemporaryDirectory;
 
 class TimeEntryController extends Controller
 {
-    private function assertNoOverlap(Organization $organization, Member $member, Carbon $start, ?Carbon $end, ?TimeEntry $exclude = null): void
+    private function assertNoOverlap(Organization $organization, Member $member, \Illuminate\Support\Carbon $start, ?\Illuminate\Support\Carbon $end, ?TimeEntry $exclude = null): void
     {
         if (! $organization->prevent_overlapping_time_entries) {
             return;
@@ -67,7 +66,7 @@ class TimeEntryController extends Controller
 
         $query = TimeEntry::query()
             ->where('organization_id', $organization->getKey())
-            ->where('member_id', $member->getKey())
+            ->where('user_id', $member->user_id)
             ->when($exclude !== null, function (Builder $q) use ($exclude): void {
                 $q->where('id', '!=', $exclude->getKey());
             })
@@ -107,8 +106,8 @@ class TimeEntryController extends Controller
     /**
      * Get time entries in organization
      *
-     * If you only need time entries for a specific user, you can filter by `member_id`.
-     * Users with the permission `time-entries:view:own` can only use this endpoint with their own member ID in the member_id filter.
+     * If you only need time entries for a specific user, you can filter by `user_id`.
+     * Users with the permission `time-entries:view:own` can only use this endpoint with their own user ID in the user_id filter.
      *
      * @return TimeEntryCollection<TimeEntryResource>
      *
@@ -118,17 +117,16 @@ class TimeEntryController extends Controller
      */
     public function index(Organization $organization, TimeEntryIndexRequest $request): JsonResource
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
         }
 
         $canAccessPremiumFeatures = $this->canAccessPremiumFeatures($organization);
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $memberFilter, $canAccessPremiumFeatures);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
 
         $totalCount = $timeEntriesQuery->count();
 
@@ -159,7 +157,7 @@ class TimeEntryController extends Controller
             if ($timeEntries->count() === 0) {
                 Log::warning('User has has more than '.$limit.' time entries on one date', [
                     'date' => $lastDate->toDateString(),
-                    'member_id' => $request->input('member_id'),
+                    'user_id' => $request->input('user_id'),
                     'auth_user_id' => Auth::id(),
                     'limit' => $limit,
                 ]);
@@ -195,8 +193,7 @@ class TimeEntryController extends Controller
         $timeEntriesQuery = TimeEntry::query()
             ->whereBelongsTo($organization, 'organization')
             ->select($select)
-            ->orderBy('time_entries.start', 'desc')
-            ->orderBy('time_entries.id');
+            ->orderBy('start', 'desc');
 
         $filter = new TimeEntryFilter($timeEntriesQuery);
         $filter->addStartFilter($request->input('start'));
@@ -205,7 +202,7 @@ class TimeEntryController extends Controller
         $filter->addMemberIdFilter($member);
         $filter->addMemberIdsFilter($request->input('member_ids'));
         $filter->addProjectIdsFilter($request->input('project_ids'));
-        $filter->addTagIdsFilter($request->input('tag_ids'), $request->getTagMatchType());
+        $filter->addTagIdsFilter($request->input('tag_ids'));
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
@@ -222,10 +219,9 @@ class TimeEntryController extends Controller
      */
     public function indexExport(Organization $organization, TimeEntryIndexExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -242,7 +238,7 @@ class TimeEntryController extends Controller
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
-        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $memberFilter, $canAccessPremiumFeatures);
+        $timeEntriesQuery = $this->getTimeEntriesQuery($organization, $request, $member, $canAccessPremiumFeatures);
         $timeEntriesQuery->with([
             'task',
             'client',
@@ -250,7 +246,7 @@ class TimeEntryController extends Controller
             'user',
             'tagsRelation',
         ]);
-        $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'-'.Str::uuid().'.'.$format->getFileExtension();
+        $filename = 'time-entries-export-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
         $path = $folderPath.'/'.$filename;
         $localizationService = LocalizationService::forOrganization($organization);
@@ -265,7 +261,7 @@ class TimeEntryController extends Controller
             if ($viewFile === false) {
                 throw new \LogicException('View file not found');
             }
-            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+            $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
             $aggregatedData = $timeEntryAggregationService->getAggregatedTimeEntries(
                 $timeEntriesAggregateQuery,
                 null,
@@ -372,10 +368,9 @@ class TimeEntryController extends Controller
      */
     public function aggregate(Organization $organization, TimeEntryAggregateRequest $request, TimeEntryAggregationService $timeEntryAggregationService): array
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -386,7 +381,7 @@ class TimeEntryController extends Controller
 
         $group1Type = $request->getGroup();
         $group2Type = $request->getSubGroup();
-        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -422,10 +417,9 @@ class TimeEntryController extends Controller
      */
     public function aggregateExport(Organization $organization, TimeEntryAggregateExportRequest $request, TimeEntryAggregationService $timeEntryAggregationService): JsonResponse
     {
-        $member = $this->member($organization);
-        /** @var Member|null $memberFilter */
-        $memberFilter = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($memberFilter !== null && $memberFilter->getKey() === $member->getKey()) {
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($member !== null && $member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:view:own');
         } else {
             $this->checkPermission($organization, 'time-entries:view:all');
@@ -441,7 +435,7 @@ class TimeEntryController extends Controller
 
         $group = $request->getGroup();
         $subGroup = $request->getSubGroup();
-        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $memberFilter);
+        $timeEntriesAggregateQuery = $this->getTimeEntriesAggregateQuery($organization, $request, $member);
         $roundingType = $canAccessPremiumFeatures ? $request->getRoundingType() : null;
         $roundingMinutes = $canAccessPremiumFeatures ? $request->getRoundingMinutes() : null;
 
@@ -475,7 +469,7 @@ class TimeEntryController extends Controller
         $timezone = app(TimezoneService::class)->getTimezoneFromUser($this->user());
         $localizationService = LocalizationService::forOrganization($organization);
 
-        $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'-'.Str::uuid().'.'.$format->getFileExtension();
+        $filename = 'time-entries-report-'.now()->format('Y-m-d_H-i-s').'.'.$format->getFileExtension();
         $folderPath = 'exports';
         $path = $folderPath.'/'.$filename;
 
@@ -564,7 +558,7 @@ class TimeEntryController extends Controller
         $filter->addMemberIdFilter($member);
         $filter->addMemberIdsFilter($request->input('member_ids'));
         $filter->addProjectIdsFilter($request->input('project_ids'));
-        $filter->addTagIdsFilter($request->input('tag_ids'), $request->getTagMatchType());
+        $filter->addTagIdsFilter($request->input('tag_ids'));
         $filter->addTaskIdsFilter($request->input('task_ids'));
         $filter->addClientIdsFilter($request->input('client_ids'));
         $filter->addBillableFilter($request->input('billable'));
@@ -584,7 +578,7 @@ class TimeEntryController extends Controller
     {
         /** @var Member $member */
         $member = Member::query()->findOrFail($request->input('member_id'));
-        if ($member->getKey() === $this->member($organization)->getKey()) {
+        if ($member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:create:own');
         } else {
             $this->checkPermission($organization, 'time-entries:create:all');
@@ -631,13 +625,12 @@ class TimeEntryController extends Controller
      */
     public function update(Organization $organization, TimeEntry $timeEntry, TimeEntryUpdateRequest $request): JsonResource
     {
-        $member = $this->member($organization);
-        /** @var Member|null $newMember */
-        $newMember = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
-        if ($timeEntry->member_id === $member->getKey() && ($newMember === null || $newMember->getKey() === $member->getKey())) {
-            $this->checkPermission($organization, 'time-entries:update:own', $timeEntry);
+        /** @var Member|null $member */
+        $member = $request->has('member_id') ? Member::query()->findOrFail($request->input('member_id')) : null;
+        if ($timeEntry->member->user_id === Auth::id() && ($member === null || $member->user_id === Auth::id())) {
+            $this->checkPermission($organization, 'time-entries:update:own');
         } else {
-            $this->checkPermission($organization, 'time-entries:update:all', $timeEntry);
+            $this->checkPermission($organization, 'time-entries:update:all');
         }
 
         if ($timeEntry->end !== null && $request->has('end') && $request->input('end') === null) {
@@ -666,10 +659,6 @@ class TimeEntryController extends Controller
         }
 
         $timeEntry->fill($request->validated());
-        if ($newMember !== null) {
-            $timeEntry->member()->associate($newMember);
-            $timeEntry->user()->associate($newMember->user);
-        }
         $timeEntry->description = $request->input('description', $timeEntry->description) ?? '';
         $timeEntry->setComputedAttributeValue('billable_rate');
         $timeEntry->save();
@@ -699,7 +688,6 @@ class TimeEntryController extends Controller
      */
     public function updateMultiple(Organization $organization, TimeEntryUpdateMultipleRequest $request): JsonResponse
     {
-        $member = $this->member($organization);
         $this->checkAnyPermission($organization, ['time-entries:update:all', 'time-entries:update:own']);
         $canAccessAll = $this->hasPermission($organization, 'time-entries:update:all');
 
@@ -724,9 +712,6 @@ class TimeEntryController extends Controller
             throw new AuthorizationException;
         }
 
-        /** @var Member|null $newMember */
-        $newMember = isset($changes['member_id']) ? Member::query()->findOrFail($changes['member_id']) : null;
-
         $project = null;
         $client = null;
         $overwriteClient = false;
@@ -753,7 +738,7 @@ class TimeEntryController extends Controller
 
                 continue;
             }
-            if (! $canAccessAll && $timeEntry->member_id !== $member->getKey()) {
+            if (! $canAccessAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;
@@ -763,10 +748,6 @@ class TimeEntryController extends Controller
             $oldTask = $timeEntry->task;
 
             $timeEntry->fill($changes);
-            if ($newMember !== null) {
-                $timeEntry->member()->associate($newMember);
-                $timeEntry->user_id = $newMember->user_id;
-            }
             // If project is changed, but task is not, we remove the old task from the time entry
             if ($oldProject !== null && $project !== null && $oldProject->isNot($project) && $task === null) {
                 $timeEntry->task()->disassociate();
@@ -807,8 +788,7 @@ class TimeEntryController extends Controller
      */
     public function destroy(Organization $organization, TimeEntry $timeEntry): JsonResponse
     {
-        $member = $this->member($organization);
-        if ($timeEntry->member_id === $member->getKey()) {
+        if ($timeEntry->member->user_id === Auth::id()) {
             $this->checkPermission($organization, 'time-entries:delete:own', $timeEntry);
         } else {
             $this->checkPermission($organization, 'time-entries:delete:all', $timeEntry);
@@ -865,7 +845,7 @@ class TimeEntryController extends Controller
                 continue;
             }
 
-            if (! $canDeleteAll && $timeEntry->member_id !== $this->member($organization)->getKey()) {
+            if (! $canDeleteAll && $timeEntry->user_id !== Auth::id()) {
                 $error->push($id);
 
                 continue;

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

@@ -1,33 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Api\V1;
-
-use App\Service\TimezoneService;
-use Illuminate\Http\JsonResponse;
-
-class TimeZoneController extends Controller
-{
-    /**
-     * Get all timezones
-     *
-     * @response object{key: string}[]
-     *
-     * @operationId getTimezones
-     */
-    public function index(): JsonResponse
-    {
-        $timezones = app(TimezoneService::class)->getTimezones();
-
-        $response = [];
-
-        foreach ($timezones as $timezone) {
-            $response[] = (object) [
-                'key' => $timezone,
-            ];
-        }
-
-        return response()->json($response);
-    }
-}

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

@@ -4,30 +4,15 @@ declare(strict_types=1);
 
 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;
-use App\Mail\VerifyUpdatedEmailMail;
-use App\Models\Organization;
-use App\Models\User;
-use App\Service\DeletionService;
-use App\Service\UserService;
-use App\Support\Base64File;
 use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 
 class UserController extends Controller
 {
     /**
      * Get the current user
      *
-     * This endpoint is independent of the organization.
+     * This endpoint is independent of organization.
      *
      * @operationId getMe
      *
@@ -39,169 +24,4 @@ class UserController extends Controller
 
         return new UserResource($user);
     }
-
-    /**
-     * Update the current organization of the current user
-     *
-     * 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.
-     *
-     * @operationId updateMyCurrentOrganization
-     *
-     * @throws AuthorizationException
-     */
-    public function updateMyCurrentOrganization(UserUpdateCurrentOrganizationRequest $request, UserService $userService): UserResource
-    {
-        $user = $this->user();
-
-        /** @var Organization|null $organization */
-        $organization = $user->organizations()
-            ->whereKey($request->getOrganizationId())
-            ->first();
-
-        if ($organization === null) {
-            throw new AuthorizationException;
-        }
-
-        $userService->switchCurrentOrganization($user, $organization);
-
-        return new UserResource($user->refresh());
-    }
-
-    /**
-     * Update the current user
-     *
-     * This endpoint is independent of the organization.
-     *
-     * @operationId updateUser
-     */
-    public function update(User $user, UserUpdateRequest $request): UserResource
-    {
-        if ($user->getKey() !== $this->user()->getKey()) {
-            throw new AuthorizationException;
-        }
-
-        if ($request->hasPhotoKey()) {
-            $photoDisk = (string) config('filesystems.public');
-            $previousPhotoPath = $user->profile_photo_path;
-            $newPhoto = $request->getPhoto();
-
-            if ($newPhoto === null) {
-                $user->profile_photo_path = null;
-            } else {
-                $decoded = Base64File::decode($newPhoto);
-                assert($decoded !== null);
-                $extension = Base64File::extension($decoded['mime_type']);
-                assert($extension !== null);
-
-                $photoPath = 'profile-photos/'.Str::uuid().'.'.$extension;
-                Storage::disk($photoDisk)->put($photoPath, $decoded['data'], 'public');
-                $user->profile_photo_path = $photoPath;
-            }
-
-            if ($previousPhotoPath !== null) {
-                Storage::disk($photoDisk)->delete($previousPhotoPath);
-            }
-        }
-
-        $emailToVerify = null;
-        $email = $request->getEmail();
-        if ($email !== null && $email !== Str::lower($user->email)) {
-            $emailToVerify = $email;
-            $user->pending_email = $email;
-        }
-
-        if ($request->getName() !== null) {
-            $user->name = $request->getName();
-        }
-
-        if ($request->getTimezone() !== null) {
-            $user->timezone = $request->getTimezone();
-        }
-
-        if ($request->getWeekStart() !== null) {
-            $user->week_start = $request->getWeekStart();
-        }
-
-        $user->save();
-
-        if ($emailToVerify !== null) {
-            Mail::to($emailToVerify)->send(new VerifyUpdatedEmailMail($user, $emailToVerify));
-        }
-
-        return new UserResource($user);
-    }
-
-    /**
-     * Reset the pending email for a user.
-     *
-     * This endpoint is independent of the organization.
-     *
-     * @operationId resetUserPendingEmail
-     *
-     * @throws AuthorizationException Thrown when the authenticated user does not match the user whose email is pending verification.
-     */
-    public function resetPendingEmail(User $user): JsonResponse
-    {
-        if ($user->getKey() !== $this->user()->getKey()) {
-            throw new AuthorizationException;
-        }
-
-        $user->pending_email = null;
-        $user->save();
-
-        return response()->json(null, 204);
-    }
-
-    /**
-     * Resend the pending email update verification email.
-     *
-     * This endpoint is independent of the organization.
-     *
-     * @operationId resendUserEmailVerification
-     *
-     * @throws AuthorizationException Thrown when the authenticated user does not match the user whose email is pending verification.
-     * @throws UserResendEmailVerificationNoPendingEmailApiException Thrown when the user does not have a pending email to verify.
-     */
-    public function resendEmailVerification(User $user): JsonResponse
-    {
-        if ($user->getKey() !== $this->user()->getKey()) {
-            throw new AuthorizationException;
-        }
-
-        if ($user->pending_email === null) {
-            throw new UserResendEmailVerificationNoPendingEmailApiException;
-        }
-
-        Mail::to($user->pending_email)
-            ->queue(new VerifyUpdatedEmailMail($user, $user->pending_email));
-
-        return response()->json(null, 204);
-    }
-
-    /**
-     * Handles the deletion of a user.
-     *
-     * This endpoint is independent of the organization.
-     *
-     * @operationId deleteUser
-     *
-     * @param  User  $user  The user instance to be deleted.
-     * @param  DeletionService  $deletionService  The service responsible for performing the user deletion.
-     * @return JsonResponse A JSON response with a 204 No Content status upon successful deletion.
-     *
-     * @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, UserDestroyRequest $request, DeletionService $deletionService): JsonResponse
-    {
-        if ($user->getKey() !== $this->user()->getKey()) {
-            throw new AuthorizationException;
-        }
-
-        $deletionService->deleteUser($user);
-
-        return response()->json(null, 204);
-    }
 }

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

@@ -14,7 +14,7 @@ class UserMembershipController extends Controller
     /**
      * Get the memberships of the current user
      *
-     * This endpoint is independent of the organization.
+     * This endpoint is independent of organization.
      *
      * @operationId getMyMemberships
      *

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

@@ -17,7 +17,7 @@ class UserTimeEntryController extends Controller
     /**
      * Get the active time entry of the current user
      *
-     * This endpoint is independent of the organization.
+     * This endpoint is independent of organization.
      *
      * @operationId getMyActiveTimeEntry
      */

app/Http/Controllers/Controller.php

@@ -59,7 +59,7 @@ class Controller extends BaseController
     protected function currentOrganization(): Organization
     {
         $user = $this->user();
-        $organization = $user->currentOrganization;
+        $organization = $user->currentTeam;
         if ($organization === null) {
             $organization = $user->organizations()->first();
         }

app/Http/Controllers/Web/Controller.php

@@ -4,21 +4,4 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
-use App\Models\Organization;
-use App\Service\PermissionStore;
-use Illuminate\Auth\Access\AuthorizationException;
-
-abstract class Controller extends \App\Http\Controllers\Controller
-{
-    public function __construct(
-        protected PermissionStore $permissionStore,
-    ) {}
-
-    /**
-     * @throws AuthorizationException
-     */
-    protected function hasPermission(Organization $organization, string $permission): bool
-    {
-        return $this->permissionStore->has($organization, $permission);
-    }
-}
+abstract class Controller extends \App\Http\Controllers\Controller {}

app/Http/Controllers/Web/DashboardController.php

@@ -4,13 +4,30 @@ declare(strict_types=1);
 
 namespace App\Http\Controllers\Web;
 
+use App\Enums\Role;
+use App\Service\DashboardService;
+use App\Service\PermissionStore;
+use Illuminate\Auth\Access\AuthorizationException;
 use Inertia\Inertia;
 use Inertia\Response;
 
 class DashboardController extends Controller
 {
-    public function dashboard(): Response
+    /**
+     * @throws AuthorizationException
+     */
+    public function dashboard(DashboardService $dashboardService, PermissionStore $permissionStore): Response
     {
+        $user = $this->user();
+        $organization = $this->currentOrganization();
+
+        $latestTeamActivity = null;
+        if ($permissionStore->has($organization, 'time-entries:view:all')) {
+            $latestTeamActivity = $dashboardService->latestTeamActivity($organization);
+        }
+
+        $showBillableRate = $this->member($organization)->role !== Role::Employee->value || $organization->employees_can_see_billable_rates;
+
         return Inertia::render('Dashboard');
     }
 }

app/Http/Controllers/Web/OrganizationController.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Web;
-
-use App\Models\Organization;
-use Brick\Money\Currency;
-use Brick\Money\ISOCurrencyProvider;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use Inertia\Inertia;
-use Inertia\Response;
-
-class OrganizationController extends Controller
-{
-    /**
-     * Show the team creation screen.
-     */
-    public function create(Request $request): Response
-    {
-        return Inertia::render('Teams/Create');
-    }
-
-    /**
-     * Show the organizatio details screen.
-     *
-     * @param  string  $organizationId  The organization ID
-     */
-    public function show(string $organizationId): Response|RedirectResponse
-    {
-        $organization = Str::isUuid($organizationId) ? Organization::find($organizationId) : null;
-        if ($organization === null) {
-            return redirect()->route('dashboard');
-        }
-        if (! $this->hasPermission($organization, 'organizations:view')) {
-            return redirect()->route('dashboard');
-        }
-
-        $owner = $organization->owner;
-
-        return Inertia::render('Teams/Show', [
-            'team' => [
-                'id' => $organization->getKey(),
-                'name' => $organization->name,
-                'currency' => $organization->currency,
-                'owner' => [
-                    'id' => $owner->getKey(),
-                    'name' => $owner->name,
-                    'profile_photo_url' => $owner->profile_photo_url,
-                ],
-            ],
-            'currencies' => array_map(function (Currency $currency): string {
-                return $currency->getName();
-            }, ISOCurrencyProvider::getInstance()->getAvailableCurrencies()),
-            'permissions' => [
-                'canDeleteTeam' => $this->hasPermission($organization, 'organizations:delete'),
-                'canUpdateTeam' => $this->hasPermission($organization, 'organizations:update'),
-            ],
-        ]);
-    }
-}

app/Http/Controllers/Web/OrganizationInvitationController.php

@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Web;
-
-use App\Enums\Role;
-use App\Models\OrganizationInvitation;
-use App\Models\User;
-use App\Service\MemberService;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\Auth;
-use RuntimeException;
-
-class OrganizationInvitationController extends Controller
-{
-    public function accept(OrganizationInvitation $invitation, MemberService $memberService): RedirectResponse
-    {
-        $email = strtolower($invitation->email);
-        $role = Role::tryFrom($invitation->role);
-        if ($role === null || $role === Role::Owner || $role === Role::Placeholder) {
-            throw new RuntimeException('Invalid role');
-        }
-
-        $organization = $invitation->organization;
-        $invitee = User::query()
-            ->where('email', $email)
-            ->where('is_placeholder', '=', false)
-            ->first();
-
-        // No account yet — finish on registration.
-        if ($invitee === null) {
-            if ($invitation->accepted_at === null) {
-                $invitation->accepted_at = now();
-                $invitation->save();
-            }
-
-            return redirect(route('register'))
-                ->with('bannerText', __('Please create an account to finish joining the :organization organization.', [
-                    'organization' => $organization->name,
-                ]))
-                ->with('bannerStyle', 'info');
-        }
-
-        $alreadyMember = $memberService->isEmailAlreadyMember($organization, $email);
-        if (! $alreadyMember) {
-            $memberService->addMember($invitee, $organization, $role);
-            $invitation->delete();
-        }
-
-        // Logged out — banner on /login.
-        if (! Auth::check()) {
-            return redirect(route('login'))
-                ->with('bannerText', __('Great! You have accepted the invitation to join the :organization organization. Please log in to access it.', [
-                    'organization' => $organization->name,
-                ]))
-                ->with('bannerStyle', 'success');
-        }
-
-        // Logged in — banner on /dashboard.
-        if ($alreadyMember) {
-            return redirect(route('dashboard'))
-                ->with('bannerText', __('You are already a member of the :organization organization.', [
-                    'organization' => $organization->name,
-                ]))
-                ->with('bannerStyle', 'danger');
-        }
-
-        return redirect(route('dashboard'))
-            ->with('bannerText', __('Great! You have accepted the invitation to join the :organization organization.', [
-                'organization' => $organization->name,
-            ]))
-            ->with('bannerStyle', 'success');
-    }
-}

app/Http/Controllers/Web/OtherBrowserSessionsController.php

@@ -1,54 +0,0 @@
-<?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/Controllers/Web/UserController.php

@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Web;
-
-use App\Models\User;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
-
-class UserController extends Controller
-{
-    public function verifyEmailChange(Request $request, User $user): RedirectResponse
-    {
-        if ($request->user()?->getAuthIdentifier() !== $user->getKey()) {
-            abort(403);
-        }
-
-        $email = $request->query('email');
-        if (! is_string($email)) {
-            abort(403);
-        }
-
-        $email = Str::lower($email);
-
-        if ($user->pending_email !== $email) {
-            abort(403);
-        }
-
-        $emailAlreadyInUse = User::query()
-            ->where('email', '=', $email)
-            ->where('is_placeholder', '=', false)
-            ->whereKeyNot($user->getKey())
-            ->exists();
-
-        if ($emailAlreadyInUse) {
-            return redirect(route('dashboard'))
-                ->with('bannerStyle', 'danger')
-                ->with('bannerText', __('The email address is already in use.'));
-        }
-
-        $user->email = $email;
-        $user->pending_email = null;
-        $user->email_verified_at = Carbon::now();
-        $user->save();
-
-        return redirect(route('dashboard'))
-            ->with('bannerStyle', 'success')
-            ->with('bannerText', __('Your email address has been updated successfully.'));
-    }
-}

app/Http/Controllers/Web/UserProfileController.php

@@ -1,142 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Controllers\Web;
-
-use App\Enums\Weekday;
-use App\Service\Dto\UserAgentDto;
-use App\Service\TimezoneService;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Controller;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Inertia\Inertia;
-use Inertia\Response;
-use Laravel\Fortify\Actions\DisableTwoFactorAuthentication;
-use Laravel\Fortify\Features;
-
-class UserProfileController extends Controller
-{
-    /**
-     * Validate the two-factor authentication state for the request.
-     */
-    protected function validateTwoFactorAuthenticationState(Request $request): void
-    {
-        if (! Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm')) {
-            return;
-        }
-
-        $currentTime = time();
-
-        // Notate totally disabled state in session...
-        if ($this->twoFactorAuthenticationDisabled($request)) {
-            $request->session()->put('two_factor_empty_at', $currentTime);
-        }
-
-        // If was previously totally disabled this session but is now confirming, notate time...
-        if ($this->hasJustBegunConfirmingTwoFactorAuthentication($request)) {
-            $request->session()->put('two_factor_confirming_at', $currentTime);
-        }
-
-        // If the profile is reloaded and is not confirmed but was previously in confirming state, disable...
-        if ($this->neverFinishedConfirmingTwoFactorAuthentication($request, $currentTime)) {
-            app(DisableTwoFactorAuthentication::class)(Auth::user());
-
-            $request->session()->put('two_factor_empty_at', $currentTime);
-            $request->session()->remove('two_factor_confirming_at');
-        }
-    }
-
-    /**
-     * Determine if two-factor authentication is totally disabled.
-     *
-     * @return bool
-     */
-    protected function twoFactorAuthenticationDisabled(Request $request)
-    {
-        return is_null($request->user()->two_factor_secret) &&
-            is_null($request->user()->two_factor_confirmed_at);
-    }
-
-    /**
-     * Determine if two-factor authentication is just now being confirmed within the last request cycle.
-     *
-     * @return bool
-     */
-    protected function hasJustBegunConfirmingTwoFactorAuthentication(Request $request)
-    {
-        return ! is_null($request->user()->two_factor_secret) &&
-            is_null($request->user()->two_factor_confirmed_at) &&
-            $request->session()->has('two_factor_empty_at') &&
-            is_null($request->session()->get('two_factor_confirming_at'));
-    }
-
-    /**
-     * Determine if two-factor authentication was never totally confirmed once confirmation started.
-     *
-     * @return bool
-     */
-    protected function neverFinishedConfirmingTwoFactorAuthentication(Request $request, int $currentTime)
-    {
-        return ! array_key_exists('code', $request->session()->getOldInput()) &&
-            is_null($request->user()->two_factor_confirmed_at) &&
-            $request->session()->get('two_factor_confirming_at', 0) !== $currentTime;
-    }
-
-    /**
-     * Show the general profile settings screen.
-     */
-    public function show(Request $request): Response
-    {
-        $this->validateTwoFactorAuthenticationState($request);
-
-        return Inertia::render('Profile/Show', [
-            'timezones' => app(TimezoneService::class)->getSelectOptions(),
-            'weekdays' => Weekday::toSelectArray(),
-            'confirmsTwoFactorAuthentication' => Features::optionEnabled(Features::twoFactorAuthentication(), 'confirm'),
-            'sessions' => $this->sessions($request),
-        ]);
-    }
-
-    /**
-     * Get the current sessions.
-     *
-     * @return array<int, object{agent: array{is_desktop: bool, platform: string|null, browser: string|null}, ip_address: string, is_current_device: bool, last_active: string}&\stdClass>
-     */
-    public function sessions(Request $request): array
-    {
-        if (config('session.driver') !== 'database') {
-            return [];
-        }
-
-        return collect(
-            DB::connection(config('session.connection'))->table(config('session.table', 'sessions'))
-                ->where('user_id', $request->user()->getAuthIdentifier())
-                ->orderBy('last_activity', 'desc')
-                ->get()
-        )->map(function (object $session) use ($request): object {
-            $agent = $this->createAgent(is_string($session->user_agent) ? $session->user_agent : '');
-
-            return (object) [
-                'agent' => [
-                    'is_desktop' => $agent->isDesktop(),
-                    'platform' => $agent->platform(),
-                    'browser' => $agent->browser(),
-                ],
-                'ip_address' => is_string($session->ip_address) ? $session->ip_address : '',
-                'is_current_device' => $session->id === $request->session()->getId(),
-                'last_active' => Carbon::createFromTimestamp($session->last_activity)->diffForHumans(),
-            ];
-        })->all();
-    }
-
-    /**
-     * Create a new agent instance from the given session.
-     */
-    protected function createAgent(string $userAgent): UserAgentDto
-    {
-        return tap(new UserAgentDto, fn ($agent) => $agent->setUserAgent($userAgent));
-    }
-}

app/Http/Kernel.php

@@ -4,37 +4,9 @@ declare(strict_types=1);
 
 namespace App\Http;
 
-use App\Http\Middleware\Authenticate;
 use App\Http\Middleware\CheckOrganizationBlocked;
-use App\Http\Middleware\EncryptCookies;
-use App\Http\Middleware\EnsureEmailIsVerified;
-use App\Http\Middleware\ForceHttps;
 use App\Http\Middleware\ForceJsonResponse;
-use App\Http\Middleware\HandleInertiaRequests;
-use App\Http\Middleware\PreventRequestsDuringMaintenance;
-use App\Http\Middleware\RedirectIfAuthenticated;
-use App\Http\Middleware\ShareInertiaData;
-use App\Http\Middleware\TrimStrings;
-use App\Http\Middleware\TrustProxies;
-use App\Http\Middleware\ValidateSignature;
-use App\Http\Middleware\VerifyCsrfToken;
-use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;
-use Illuminate\Auth\Middleware\Authorize;
-use Illuminate\Auth\Middleware\RequirePassword;
-use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
-use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
-use Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests;
-use Illuminate\Foundation\Http\Middleware\ValidatePostSize;
-use Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets;
-use Illuminate\Http\Middleware\HandleCors;
-use Illuminate\Http\Middleware\SetCacheHeaders;
-use Illuminate\Routing\Middleware\SubstituteBindings;
-use Illuminate\Routing\Middleware\ThrottleRequests;
-use Illuminate\Session\Middleware\AuthenticateSession;
-use Illuminate\Session\Middleware\StartSession;
-use Illuminate\View\Middleware\ShareErrorsFromSession;
-use Laravel\Passport\Http\Middleware\CreateFreshApiToken;
 
 class Kernel extends HttpKernel
 {
@@ -46,13 +18,13 @@ class Kernel extends HttpKernel
      * @var array<int, class-string|string>
      */
     protected $middleware = [
-        ForceHttps::class,
-        TrustProxies::class,
-        HandleCors::class,
-        PreventRequestsDuringMaintenance::class,
-        ValidatePostSize::class,
-        TrimStrings::class,
-        ConvertEmptyStringsToNull::class,
+        \App\Http\Middleware\ForceHttps::class,
+        \App\Http\Middleware\TrustProxies::class,
+        \Illuminate\Http\Middleware\HandleCors::class,
+        \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
+        \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+        \App\Http\Middleware\TrimStrings::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**
@@ -62,21 +34,21 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            EncryptCookies::class,
-            AddQueuedCookiesToResponse::class,
-            StartSession::class,
-            ShareErrorsFromSession::class,
-            VerifyCsrfToken::class,
-            SubstituteBindings::class,
-            HandleInertiaRequests::class,
-            ShareInertiaData::class,
-            AddLinkHeadersForPreloadedAssets::class,
-            CreateFreshApiToken::class,
+            \App\Http\Middleware\EncryptCookies::class,
+            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+            \Illuminate\Session\Middleware\StartSession::class,
+            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+            \App\Http\Middleware\VerifyCsrfToken::class,
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\HandleInertiaRequests::class,
+            \App\Http\Middleware\ShareInertiaData::class,
+            \Illuminate\Http\Middleware\AddLinkHeadersForPreloadedAssets::class,
+            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
         ],
 
         'api' => [
-            ThrottleRequests::class.':api',
-            SubstituteBindings::class,
+            \Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
+            \Illuminate\Routing\Middleware\SubstituteBindings::class,
             ForceJsonResponse::class,
         ],
 
@@ -92,17 +64,17 @@ class Kernel extends HttpKernel
      * @var array<string, class-string|string>
      */
     protected $middlewareAliases = [
-        'auth' => Authenticate::class,
-        'auth.basic' => AuthenticateWithBasicAuth::class,
-        'auth.session' => AuthenticateSession::class,
-        'cache.headers' => SetCacheHeaders::class,
-        'can' => Authorize::class,
-        'guest' => RedirectIfAuthenticated::class,
-        'password.confirm' => RequirePassword::class,
-        'precognitive' => HandlePrecognitiveRequests::class,
-        'signed' => ValidateSignature::class,
-        'throttle' => ThrottleRequests::class,
-        'verified' => EnsureEmailIsVerified::class,
+        'auth' => \App\Http\Middleware\Authenticate::class,
+        'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
+        'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
+        'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
+        'can' => \Illuminate\Auth\Middleware\Authorize::class,
+        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+        'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
+        'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
+        'signed' => \App\Http\Middleware\ValidateSignature::class,
+        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
+        'verified' => \App\Http\Middleware\EnsureEmailIsVerified::class,
         'check-organization-blocked' => CheckOrganizationBlocked::class,
     ];
 }

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() || config('app.local_email_verification')) {
+        if (! app()->isLocal()) {
             if ($request->user() === null ||
                 (! $request->user()->hasVerifiedEmail())) {
                 return $request->expectsJson()

app/Http/Middleware/ForceHttps.php

@@ -14,7 +14,7 @@ class ForceHttps
     /**
      * Handle an incoming request.
      *
-     * @param  Closure(Request): (Response)  $next
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
      */
     public function handle(Request $request, Closure $next, string ...$guards): Response
     {

app/Http/Middleware/ForceJsonResponse.php

@@ -13,7 +13,7 @@ class ForceJsonResponse
     /**
      * Handle an incoming request.
      *
-     * @param  Closure(Request): (Response)  $next
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
      */
     public function handle(Request $request, Closure $next, string ...$guards): Response
     {

app/Http/Middleware/HandleInertiaRequests.php

@@ -46,7 +46,7 @@ class HandleInertiaRequests extends Middleware
         /** @var BillingContract $billing */
         $billing = app(BillingContract::class);
 
-        $currentOrganization = $request->user()?->currentOrganization;
+        $currentOrganization = $request->user()?->currentTeam;
 
         return array_merge(parent::share($request), [
             'has_billing_extension' => $hasBilling,
@@ -60,8 +60,6 @@ class HandleInertiaRequests extends Middleware
             ] : null,
             'flash' => [
                 'message' => fn () => $request->session()->get('message'),
-                'bannerText' => fn () => $request->session()->get('bannerText'),
-                'bannerStyle' => fn () => $request->session()->get('bannerStyle'),
             ],
         ]);
     }

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -15,7 +15,7 @@ class RedirectIfAuthenticated
     /**
      * Handle an incoming request.
      *
-     * @param  Closure(Request): (Response)  $next
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
      */
     public function handle(Request $request, Closure $next, string ...$guards): Response
     {

app/Http/Middleware/ShareInertiaData.php

@@ -9,10 +9,12 @@ use App\Models\User;
 use App\Service\PermissionStore;
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\MessageBag;
 use Inertia\Inertia;
 use Laravel\Fortify\Features;
+use Laravel\Jetstream\Jetstream;
 use Symfony\Component\HttpFoundation\Response;
 
 class ShareInertiaData
@@ -25,8 +27,28 @@ class ShareInertiaData
         /** @var PermissionStore $permissions */
         $permissions = app(PermissionStore::class);
         Inertia::share([
+            'jetstream' => function () use ($request) {
+                /** @var User|null $user */
+                $user = $request->user();
+
+                return [
+                    'canCreateTeams' => $user !== null &&
+                        Jetstream::userHasTeamFeatures($user) &&
+                        Gate::forUser($user)->check('create', Jetstream::newTeamModel()),
+                    'canManageTwoFactorAuthentication' => Features::canManageTwoFactorAuthentication(),
+                    'canUpdatePassword' => Features::enabled(Features::updatePasswords()),
+                    'canUpdateProfileInformation' => Features::canUpdateProfileInformation(),
+                    'hasEmailVerification' => Features::enabled(Features::emailVerification()),
+                    'flash' => $request->session()->get('flash', []),
+                    'hasAccountDeletionFeatures' => Jetstream::hasAccountDeletionFeatures(),
+                    'hasApiFeatures' => Jetstream::hasApiFeatures(),
+                    'hasTeamFeatures' => Jetstream::hasTeamFeatures(),
+                    'hasTermsAndPrivacyPolicyFeature' => Jetstream::hasTermsAndPrivacyPolicyFeature(),
+                    'managesProfilePhotos' => Jetstream::managesProfilePhotos(),
+                ];
+            },
             'auth' => [
-                'permissions' => $request->user() !== null && $request->user()->currentOrganization !== null ? $permissions->getPermissions($request->user()->currentOrganization) : [],
+                'permissions' => $request->user() !== null && $request->user()->currentTeam !== null ? $permissions->getPermissions($request->user()->currentTeam) : [],
                 'user' => function () use ($request): array {
                     /** @var User|null $user */
                     $user = $request->user();
@@ -35,8 +57,6 @@ class ShareInertiaData
                         return [];
                     }
 
-                    $currentOrganization = $user->currentOrganization;
-
                     return array_merge([
                         'id' => $user->id,
                         'name' => $user->name,
@@ -49,12 +69,12 @@ class ShareInertiaData
                         'profile_photo_url' => $user->profile_photo_url,
                         'two_factor_enabled' => Features::enabled(Features::twoFactorAuthentication())
                             && ! is_null($user->two_factor_secret),
-                        'current_team' => $currentOrganization !== null ? [
-                            'id' => $currentOrganization->id,
-                            'user_id' => $currentOrganization->user_id,
-                            'name' => $currentOrganization->name,
-                            'personal_team' => $currentOrganization->personal_team,
-                            'currency' => $currentOrganization->currency,
+                        'current_team' => $user->currentTeam !== null ? [
+                            'id' => $user->currentTeam->id,
+                            'user_id' => $user->currentTeam->user_id,
+                            'name' => $user->currentTeam->name,
+                            'personal_team' => $user->currentTeam->personal_team,
+                            'currency' => $user->currentTeam->currency,
                         ] : null,
                     ], array_filter([
                         'all_teams' => $user->organizations->map(function (Organization $organization): array {

app/Http/Requests/V1/Invitation/InvitationIndexRequest.php

@@ -21,11 +21,6 @@ class InvitationIndexRequest extends BaseFormRequest
     public function rules(): array
     {
         return [
-            'page' => [
-                'integer',
-                'min:1',
-                'max:2147483647',
-            ],
         ];
     }
 }

app/Http/Requests/V1/Invitation/InvitationStoreRequest.php

@@ -25,7 +25,7 @@ class InvitationStoreRequest extends BaseFormRequest
         return [
             'email' => [
                 'required',
-                'email:rfc,strict',
+                'email',
             ],
             'role' => [
                 'required',

app/Http/Requests/V1/Member/MemberIndexRequest.php

@@ -21,11 +21,6 @@ class MemberIndexRequest extends BaseFormRequest
     public function rules(): array
     {
         return [
-            'page' => [
-                'integer',
-                'min:1',
-                'max:2147483647',
-            ],
         ];
     }
 }

app/Http/Requests/V1/Member/MemberMergeIntoRequest.php

@@ -7,7 +7,6 @@ namespace App\Http\Requests\V1\Member;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Member;
 use App\Models\Organization;
-use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
@@ -20,7 +19,7 @@ class MemberMergeIntoRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|Rule>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {

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

@@ -1,48 +0,0 @@
-<?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/OrganizationStoreRequest.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\Organization;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use App\Models\Organization;
-use Illuminate\Contracts\Validation\Rule;
-
-/**
- * @property Organization $organization Organization from model binding
- */
-class OrganizationStoreRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|Rule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'name' => [
-                'required',
-                'string',
-                'max:255',
-            ],
-        ];
-    }
-
-    public function getName(): string
-    {
-        return (string) $this->input('name');
-    }
-}

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

@@ -11,8 +11,6 @@ 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;
 
 /**
@@ -23,7 +21,7 @@ class OrganizationUpdateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule|ValidationRule>>
+     * @return array<string, array<string|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -32,10 +30,6 @@ class OrganizationUpdateRequest extends BaseFormRequest
                 'string',
                 'max:255',
             ],
-            'currency' => [
-                'string',
-                new CurrencyRule,
-            ],
             'billable_rate' => array_merge(
                 [
                     'nullable',
@@ -74,11 +68,6 @@ 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/ProjectMember/ProjectMemberIndexRequest.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\ProjectMember;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class ProjectMemberIndexRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'page' => [
-                'integer',
-                'min:1',
-                'max:2147483647',
-            ],
-        ];
-    }
-}

app/Http/Requests/V1/Report/ReportIndexRequest.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\Report;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class ReportIndexRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'page' => [
-                'integer',
-                'min:1',
-                'max:2147483647',
-            ],
-        ];
-    }
-}

app/Http/Requests/V1/Report/ReportStoreRequest.php

@@ -4,18 +4,15 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\Report;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
 use App\Enums\Weekday;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Organization;
-use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\Rule as LegacyValidationRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 
 /**
@@ -26,7 +23,7 @@ class ReportStoreRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|LegacyValidationRule|\Closure>>
+     * @return array<string, array<string|ValidationRule|LegacyValidationRule>>
      */
     public function rules(): array
     {
@@ -84,14 +81,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    if (! Str::isUuid($value)) {
-                        $fail('The '.$attribute.' must be a valid UUID.');
-                    }
-                },
+                'uuid',
             ],
             // Filter by project IDs, project IDs are OR combined
             'properties.project_ids' => [
@@ -100,14 +90,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    if (! Str::isUuid($value)) {
-                        $fail('The '.$attribute.' must be a valid UUID.');
-                    }
-                },
+                'uuid',
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'properties.tag_ids' => [
@@ -116,19 +99,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    if (! Str::isUuid($value)) {
-                        $fail('The '.$attribute.' must be a valid UUID.');
-                    }
-                },
-            ],
-            'properties.tag_match_type' => [
-                'nullable',
-                'string',
-                Rule::enum(TagMatchType::class),
+                'uuid',
             ],
             'properties.task_ids' => [
                 'nullable',
@@ -136,14 +107,7 @@ class ReportStoreRequest extends BaseFormRequest
             ],
             'properties.task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    if (! Str::isUuid($value)) {
-                        $fail('The '.$attribute.' must be a valid UUID.');
-                    }
-                },
+                'uuid',
             ],
             'properties.group' => [
                 'required',
@@ -255,15 +219,6 @@ class ReportStoreRequest extends BaseFormRequest
         return TimeEntryAggregationTypeInterval::from($this->input('properties.history_group'));
     }
 
-    public function getPropertyTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('properties.tag_match_type') || $this->input('properties.tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->input('properties.tag_match_type'));
-    }
-
     public function getPropertyRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('properties.rounding_type') || $this->input('properties.rounding_type') === null) {

app/Http/Requests/V1/Tag/TagIndexRequest.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Http\Requests\V1\Tag;
-
-use App\Http\Requests\V1\BaseFormRequest;
-use Illuminate\Contracts\Validation\ValidationRule;
-
-class TagIndexRequest extends BaseFormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, array<string|ValidationRule>>
-     */
-    public function rules(): array
-    {
-        return [
-            'page' => [
-                'integer',
-                'min:1',
-                'max:2147483647',
-            ],
-        ];
-    }
-}

app/Http/Requests/V1/Task/TaskIndexRequest.php

@@ -26,11 +26,6 @@ class TaskIndexRequest extends BaseFormRequest
     public function rules(): array
     {
         return [
-            'page' => [
-                'integer',
-                'min:1',
-                'max:2147483647',
-            ],
             'project_id' => [
                 ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateExportRequest.php

@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;
 
 use App\Enums\ExportFormat;
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryAggregationTypeInterval;
 use App\Enums\TimeEntryRoundingType;
@@ -17,7 +16,6 @@ use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
-use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -32,7 +30,7 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -96,15 +94,10 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Project> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by client IDs, client IDs are OR combined
             'client_ids' => [
@@ -113,15 +106,10 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Client> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Client> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -130,19 +118,10 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Tag> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
-            ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -151,14 +130,9 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
@@ -251,15 +225,6 @@ class TimeEntryAggregateExportRequest extends BaseFormRequest
         return ExportFormat::from($this->validated('format'));
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryAggregateRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryAggregationType;
 use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
@@ -15,7 +14,6 @@ use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
 use App\Models\User;
-use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -30,7 +28,7 @@ class TimeEntryAggregateRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -82,15 +80,10 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Project> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by client IDs, client IDs are OR combined
             'client_ids' => [
@@ -99,15 +92,10 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Client> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Client> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -116,19 +104,10 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Tag> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
-            ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -137,14 +116,9 @@ class TimeEntryAggregateRequest extends BaseFormRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
@@ -213,15 +187,6 @@ class TimeEntryAggregateRequest extends BaseFormRequest
         return $this->input('end') !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $this->input('end'), 'UTC') : null;
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryIndexExportRequest.php

@@ -5,15 +5,12 @@ declare(strict_types=1);
 namespace App\Http\Requests\V1\TimeEntry;
 
 use App\Enums\ExportFormat;
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryRoundingType;
-use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
-use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -28,7 +25,7 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule|\Closure>>
+     * @return array<string, array<string|ValidationRule|\Illuminate\Contracts\Validation\Rule>>
      */
     public function rules(): array
     {
@@ -60,23 +57,6 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
                     return $builder->whereBelongsTo($this->organization, 'organization');
                 }),
             ],
-            // Filter by client IDs, client IDs are OR combined
-            'client_ids' => [
-                'array',
-                'min:1',
-            ],
-            'client_ids.*' => [
-                'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Client> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
-            ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
                 'array',
@@ -84,15 +64,11 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Project> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                'uuid',
+                new ExistsEloquent(Project::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -101,19 +77,11 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Tag> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
-            ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
+                'uuid',
+                new ExistsEloquent(Tag::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -122,15 +90,11 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Task> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                'uuid',
+                new ExistsEloquent(Task::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Task> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                }),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
@@ -220,15 +184,6 @@ class TimeEntryIndexExportRequest extends TimeEntryIndexRequest
         return ExportFormat::from($this->validated('format'));
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryIndexRequest.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Http\Requests\V1\TimeEntry;
 
-use App\Enums\TagMatchType;
 use App\Enums\TimeEntryRoundingType;
 use App\Http\Requests\V1\BaseFormRequest;
 use App\Models\Client;
@@ -13,7 +12,6 @@ use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
-use App\Service\TimeEntryFilter;
 use Illuminate\Contracts\Validation\Rule as RuleContract;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
@@ -28,7 +26,7 @@ class TimeEntryIndexRequest extends BaseFormRequest
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array<string, array<string|ValidationRule|RuleContract|\Closure>>
+     * @return array<string, array<string|ValidationRule|RuleContract>>
      */
     public function rules(): array
     {
@@ -60,15 +58,10 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'client_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Client> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Client::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Client> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by project IDs, project IDs are OR combined
             'project_ids' => [
@@ -77,15 +70,10 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'project_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Project> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Project> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by tag IDs, tag IDs are OR combined
             'tag_ids' => [
@@ -94,19 +82,10 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'tag_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Tag> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
-            ],
-            'tag_match_type' => [
-                'string',
-                Rule::enum(TagMatchType::class),
+                ExistsEloquent::make(Tag::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Tag> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter by task IDs, task IDs are OR combined
             'task_ids' => [
@@ -115,15 +94,10 @@ class TimeEntryIndexRequest extends BaseFormRequest
             ],
             'task_ids.*' => [
                 'string',
-                function (string $attribute, mixed $value, \Closure $fail): void {
-                    if ($value === TimeEntryFilter::NONE_VALUE) {
-                        return;
-                    }
-                    ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
-                        /** @var Builder<Task> $builder */
-                        return $builder->whereBelongsTo($this->organization, 'organization');
-                    })->uuid()->validate($attribute, $value, $fail);
-                },
+                ExistsEloquent::make(Task::class, null, function (Builder $builder): Builder {
+                    /** @var Builder<Task> $builder */
+                    return $builder->whereBelongsTo($this->organization, 'organization');
+                })->uuid(),
             ],
             // Filter only time entries that have a start date after the given timestamp in UTC (example: 2021-01-01T00:00:00Z)
             'start' => [
@@ -195,15 +169,6 @@ class TimeEntryIndexRequest extends BaseFormRequest
         return $this->has('offset') ? (int) $this->validated('offset', 0) : 0;
     }
 
-    public function getTagMatchType(): ?TagMatchType
-    {
-        if (! $this->has('tag_match_type') || $this->validated('tag_match_type') === null) {
-            return null;
-        }
-
-        return TagMatchType::from($this->validated('tag_match_type'));
-    }
-
     public function getRoundingType(): ?TimeEntryRoundingType
     {
         if (! $this->has('rounding_type') || $this->validated('rounding_type') === null) {

app/Http/Requests/V1/TimeEntry/TimeEntryStoreRequest.php

@@ -10,10 +10,8 @@ use App\Models\Organization;
 use App\Models\Project;
 use App\Models\Tag;
 use App\Models\Task;
-use App\Service\PermissionStore;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Facades\Auth;
 use Korridor\LaravelModelValidationRules\Rules\ExistsEloquent;
 
 /**
@@ -44,16 +42,7 @@ class TimeEntryStoreRequest extends BaseFormRequest
                 'required_with:task_id',
                 ExistsEloquent::make(Project::class, null, function (Builder $builder): Builder {
                     /** @var Builder<Project> $builder */
-                    $builder = $builder->whereBelongsTo($this->organization, 'organization');
-
-                    // If user doesn't have 'all' permission for time entries or projects, only allow access to public projects or projects they're a member of
-                    $permissionStore = app(PermissionStore::class);
-                    if (! $permissionStore->has($this->organization, 'time-entries:create:all')
-                        && ! $permissionStore->has($this->organization, 'projects:view:all')) {
-                        $builder = $builder->visibleByEmployee(Auth::user());
-                    }
-
-                    return $builder;
+                    return $builder->whereBelongsTo($this->organization, 'organization');
                 })->uuid(),
             ],
             // ID of the task that the time entry should belong to