Add postgres 18 support

.github/workflows/phpunit-extensions.yml

@@ -8,7 +8,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        postgres_version: [ 15, 16, 17 ]
+        postgres_version: [ 15, 16, 17, 18 ]
 
     services:
       pgsql_test:

.github/workflows/phpunit.yml

@@ -8,7 +8,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        postgres_version: [ 15, 16, 17 ]
+        postgres_version: [ 15, 16, 17, 18 ]
 
     services:
       pgsql_test:

app/Service/DeletionService.php

@@ -11,7 +11,6 @@ use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
 use App\Models\OrganizationInvitation;
-use App\Models\Passport\RefreshToken;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Report;
@@ -170,10 +169,6 @@ class DeletionService
             }
         }
 
-        // Refresh tokens are not linked to the user directly, so they need to be deleted via their access tokens.
-        // Otherwise a still-valid refresh token could be used to issue a new access token for a deleted user,
-        // which fails with a foreign key violation on oauth_access_tokens.user_id.
-        RefreshToken::query()->whereIn('access_token_id', $user->accessTokens()->pluck('id'))->delete();
         $user->accessTokens()->delete();
         $user->authCodes()->delete();
 

extensions/manifest.json

@@ -1,7 +1,7 @@
 {
     "Billing": {
         "repository": "solidtime-io/extension-billing",
-        "ref": "v0.0.8"
+        "ref": "v0.0.7"
     },
     "Services": {
         "repository": "solidtime-io/extension-services",

resources/js/packages/ui/src/FullCalendar/useEventResize.ts

@@ -111,8 +111,6 @@ export function useEventResize(params: {
         edge: 'start' | 'end',
         dayStr: string
     ) {
-        if (e.button !== 0) return;
-
         e.preventDefault();
         e.stopPropagation();
 

resources/js/packages/ui/src/TimeTracker/TimeTrackerEntryInput.vue

@@ -168,10 +168,6 @@ defineExpose({ submit, focusAfterStart });
         data-testid="time_entry_description"
         class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base text-text-primary bg-transparent border-none placeholder-text-secondary focus:ring-0 transition"
         type="text"
-        autocomplete="off"
-        data-1p-ignore
-        data-lpignore="true"
-        data-form-type="other"
         @keydown.enter="submit"
         @keydown.esc="showDropdown = false"
         @blur="updateTimeEntryDescription" />

resources/js/packages/ui/src/TimeTracker/TimeTrackerRangeSelector.vue

@@ -170,10 +170,6 @@ function closeAndFocusInput() {
                             : 'text-text-primary bg-card-background border-border-secondary border border-none'
                     "
                     type="text"
-                    autocomplete="off"
-                    data-1p-ignore
-                    data-lpignore="true"
-                    data-form-type="other"
                     @focusin="openModalOnTab"
                     @click="openModalOnClick"
                     @keydown.exact.tab="focusNextElement"

resources/js/utils/notification.ts

@@ -19,7 +19,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
     const showActionBlockedModal = ref(false);
 
     function addNotification(type: NotificationType, title: string, message?: string) {
-        const uuid = Math.random().toString(36).substring(7);
+        const uuid = crypto.randomUUID();
         notifications.value.push({ title, message, type, uuid });
 
         setTimeout(() => {

tests/Unit/Service/DeletionServiceTest.php

@@ -10,9 +10,6 @@ use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembe
 use App\Models\Client;
 use App\Models\Member;
 use App\Models\Organization;
-use App\Models\Passport\Client as PassportClient;
-use App\Models\Passport\RefreshToken;
-use App\Models\Passport\Token;
 use App\Models\Project;
 use App\Models\ProjectMember;
 use App\Models\Report;
@@ -26,7 +23,6 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Str;
 use PHPUnit\Framework\Attributes\CoversClass;
 use Tests\TestCaseWithDatabase;
 use TiMacDonald\Log\LogEntry;
@@ -428,45 +424,4 @@ class DeletionServiceTest extends TestCaseWithDatabase
             'role' => Role::Placeholder->value,
         ]);
     }
-
-    public function test_delete_user_deletes_access_tokens_and_their_refresh_tokens_but_does_not_delete_tokens_of_other_users(): void
-    {
-        // Arrange
-        $user = User::factory()->create();
-        $otherUser = User::factory()->create();
-        $passportClient = PassportClient::factory()->create();
-
-        $userToken = Token::factory()->forUser($user)->forClient($passportClient)->create();
-        $userRefreshToken = RefreshToken::query()->create([
-            'id' => Str::random(100),
-            'access_token_id' => $userToken->getKey(),
-            'revoked' => false,
-            'expires_at' => now()->addDays(30),
-        ]);
-
-        $otherUserToken = Token::factory()->forUser($otherUser)->forClient($passportClient)->create();
-        $otherUserRefreshToken = RefreshToken::query()->create([
-            'id' => Str::random(100),
-            'access_token_id' => $otherUserToken->getKey(),
-            'revoked' => false,
-            'expires_at' => now()->addDays(30),
-        ]);
-
-        // Act
-        $this->deletionService->deleteUser($user);
-
-        // Assert
-        $this->assertDatabaseMissing(Token::class, [
-            'id' => $userToken->getKey(),
-        ]);
-        $this->assertDatabaseMissing(RefreshToken::class, [
-            'id' => $userRefreshToken->getKey(),
-        ]);
-        $this->assertDatabaseHas(Token::class, [
-            'id' => $otherUserToken->getKey(),
-        ]);
-        $this->assertDatabaseHas(RefreshToken::class, [
-            'id' => $otherUserRefreshToken->getKey(),
-        ]);
-    }
 }