mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-10-08 05:43:18 +01:00
Compare commits
5 Commits
feature/po
...
feature/fi
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f64b0331cd | ||
|
|
b85f49fe05 | ||
|
|
8c5a898585 | ||
|
|
a86c18ad2d | ||
|
|
f683c03ff9 |
@@ -11,6 +11,7 @@ use App\Models\Client;
|
|||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Organization;
|
use App\Models\Organization;
|
||||||
use App\Models\OrganizationInvitation;
|
use App\Models\OrganizationInvitation;
|
||||||
|
use App\Models\Passport\RefreshToken;
|
||||||
use App\Models\Project;
|
use App\Models\Project;
|
||||||
use App\Models\ProjectMember;
|
use App\Models\ProjectMember;
|
||||||
use App\Models\Report;
|
use App\Models\Report;
|
||||||
@@ -169,6 +170,10 @@ 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->accessTokens()->delete();
|
||||||
$user->authCodes()->delete();
|
$user->authCodes()->delete();
|
||||||
|
|
||||||
|
|||||||
79
composer.lock
generated
79
composer.lock
generated
@@ -429,23 +429,24 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "brick/math",
|
"name": "brick/math",
|
||||||
"version": "0.19.1",
|
"version": "1.0.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/brick/math.git",
|
"url": "https://github.com/brick/math.git",
|
||||||
"reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce"
|
"reference": "2effe05d2177c451b86c6a073196a4034c02f211"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/brick/math/zipball/a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",
|
"url": "https://api.github.com/repos/brick/math/zipball/2effe05d2177c451b86c6a073196a4034c02f211",
|
||||||
"reference": "a89bc96a7cf3d7b59e725afe57ccb95eb03cf6ce",
|
"reference": "2effe05d2177c451b86c6a073196a4034c02f211",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.2"
|
"php": "^8.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpstan/phpstan": "2.1.22",
|
"phpstan/phpstan": "2.2.13",
|
||||||
|
"phpstan/phpstan-phpunit": "2.0.18",
|
||||||
"phpunit/phpunit": "^11.5"
|
"phpunit/phpunit": "^11.5"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
@@ -476,7 +477,7 @@
|
|||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/brick/math/issues",
|
"issues": "https://github.com/brick/math/issues",
|
||||||
"source": "https://github.com/brick/math/tree/0.19.1"
|
"source": "https://github.com/brick/math/tree/1.0.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -484,7 +485,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-08-08T23:03:16+00:00"
|
"time": "2026-09-12T10:28:18+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "brick/money",
|
"name": "brick/money",
|
||||||
@@ -4218,16 +4219,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/fortify",
|
"name": "laravel/fortify",
|
||||||
"version": "v1.39.0",
|
"version": "v1.40.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/fortify.git",
|
"url": "https://github.com/laravel/fortify.git",
|
||||||
"reference": "b1fc50707bbe007fd92165d8b7d460ab549b355a"
|
"reference": "fe0fce8814660317df0684f2c7be3b573def67d3"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/fortify/zipball/b1fc50707bbe007fd92165d8b7d460ab549b355a",
|
"url": "https://api.github.com/repos/laravel/fortify/zipball/fe0fce8814660317df0684f2c7be3b573def67d3",
|
||||||
"reference": "b1fc50707bbe007fd92165d8b7d460ab549b355a",
|
"reference": "fe0fce8814660317df0684f2c7be3b573def67d3",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4278,24 +4279,24 @@
|
|||||||
"issues": "https://github.com/laravel/fortify/issues",
|
"issues": "https://github.com/laravel/fortify/issues",
|
||||||
"source": "https://github.com/laravel/fortify"
|
"source": "https://github.com/laravel/fortify"
|
||||||
},
|
},
|
||||||
"time": "2026-08-23T07:46:41+00:00"
|
"time": "2026-09-10T11:52:08+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/framework",
|
"name": "laravel/framework",
|
||||||
"version": "v13.32.0",
|
"version": "v13.33.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/framework.git",
|
"url": "https://github.com/laravel/framework.git",
|
||||||
"reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96"
|
"reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/framework/zipball/cdd8b33c246719acdd118c705ce8c7ab5ef48a96",
|
"url": "https://api.github.com/repos/laravel/framework/zipball/91188a17ceaa3dbace6e8a5f7abd0d042e466359",
|
||||||
"reference": "cdd8b33c246719acdd118c705ce8c7ab5ef48a96",
|
"reference": "91188a17ceaa3dbace6e8a5f7abd0d042e466359",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19",
|
"brick/math": "^0.14.2 || ^0.15 || ^0.16 || ^0.17 || ^0.18 || ^0.19 || ^0.20 || ^1.0",
|
||||||
"composer-runtime-api": "^2.2",
|
"composer-runtime-api": "^2.2",
|
||||||
"doctrine/inflector": "^2.0.5",
|
"doctrine/inflector": "^2.0.5",
|
||||||
"dragonmantank/cron-expression": "^3.4",
|
"dragonmantank/cron-expression": "^3.4",
|
||||||
@@ -4509,20 +4510,20 @@
|
|||||||
"issues": "https://github.com/laravel/framework/issues",
|
"issues": "https://github.com/laravel/framework/issues",
|
||||||
"source": "https://github.com/laravel/framework"
|
"source": "https://github.com/laravel/framework"
|
||||||
},
|
},
|
||||||
"time": "2026-09-15T14:55:30+00:00"
|
"time": "2026-09-22T14:12:33+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/octane",
|
"name": "laravel/octane",
|
||||||
"version": "v2.19.1",
|
"version": "v2.20.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/octane.git",
|
"url": "https://github.com/laravel/octane.git",
|
||||||
"reference": "68a2516a0318baba0de0e4648f61e335c5e69dca"
|
"reference": "df4c38dcddc5f51e36e7f1d788841130c4fb8f45"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/octane/zipball/68a2516a0318baba0de0e4648f61e335c5e69dca",
|
"url": "https://api.github.com/repos/laravel/octane/zipball/df4c38dcddc5f51e36e7f1d788841130c4fb8f45",
|
||||||
"reference": "68a2516a0318baba0de0e4648f61e335c5e69dca",
|
"reference": "df4c38dcddc5f51e36e7f1d788841130c4fb8f45",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4598,7 +4599,7 @@
|
|||||||
"issues": "https://github.com/laravel/octane/issues",
|
"issues": "https://github.com/laravel/octane/issues",
|
||||||
"source": "https://github.com/laravel/octane"
|
"source": "https://github.com/laravel/octane"
|
||||||
},
|
},
|
||||||
"time": "2026-08-13T13:58:52+00:00"
|
"time": "2026-08-23T17:25:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/passkeys",
|
"name": "laravel/passkeys",
|
||||||
@@ -4804,16 +4805,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/serializable-closure",
|
"name": "laravel/serializable-closure",
|
||||||
"version": "v2.0.16",
|
"version": "v2.1.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/serializable-closure.git",
|
"url": "https://github.com/laravel/serializable-closure.git",
|
||||||
"reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed"
|
"reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
|
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/2d5869a838bbcf37e0d8b0568fc41914e81374b5",
|
||||||
"reference": "7cfc24e4fa2cca045fb8dd2a797a2b2b13b655ed",
|
"reference": "2d5869a838bbcf37e0d8b0568fc41914e81374b5",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -4861,7 +4862,7 @@
|
|||||||
"issues": "https://github.com/laravel/serializable-closure/issues",
|
"issues": "https://github.com/laravel/serializable-closure/issues",
|
||||||
"source": "https://github.com/laravel/serializable-closure"
|
"source": "https://github.com/laravel/serializable-closure"
|
||||||
},
|
},
|
||||||
"time": "2026-08-18T20:28:54+00:00"
|
"time": "2026-09-22T14:32:34+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/tinker",
|
"name": "laravel/tinker",
|
||||||
@@ -15337,16 +15338,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/sail",
|
"name": "laravel/sail",
|
||||||
"version": "v1.67.0",
|
"version": "v1.68.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/sail.git",
|
"url": "https://github.com/laravel/sail.git",
|
||||||
"reference": "639e03ac12cf23def171770bcab05758045b2642"
|
"reference": "2bc304083d515065b03944e425e62cb3c526c33e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/sail/zipball/639e03ac12cf23def171770bcab05758045b2642",
|
"url": "https://api.github.com/repos/laravel/sail/zipball/2bc304083d515065b03944e425e62cb3c526c33e",
|
||||||
"reference": "639e03ac12cf23def171770bcab05758045b2642",
|
"reference": "2bc304083d515065b03944e425e62cb3c526c33e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -15396,7 +15397,7 @@
|
|||||||
"issues": "https://github.com/laravel/sail/issues",
|
"issues": "https://github.com/laravel/sail/issues",
|
||||||
"source": "https://github.com/laravel/sail"
|
"source": "https://github.com/laravel/sail"
|
||||||
},
|
},
|
||||||
"time": "2026-08-12T13:55:56+00:00"
|
"time": "2026-09-18T14:34:46+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/sentinel",
|
"name": "laravel/sentinel",
|
||||||
@@ -15456,16 +15457,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "laravel/telescope",
|
"name": "laravel/telescope",
|
||||||
"version": "v5.24.0",
|
"version": "v5.25.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/laravel/telescope.git",
|
"url": "https://github.com/laravel/telescope.git",
|
||||||
"reference": "50cbcf4553ddfd8d4bd456b04f97dfed923007d9"
|
"reference": "65fe6724f8688de01dfa74b28a0edc191bc3caa8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/laravel/telescope/zipball/50cbcf4553ddfd8d4bd456b04f97dfed923007d9",
|
"url": "https://api.github.com/repos/laravel/telescope/zipball/65fe6724f8688de01dfa74b28a0edc191bc3caa8",
|
||||||
"reference": "50cbcf4553ddfd8d4bd456b04f97dfed923007d9",
|
"reference": "65fe6724f8688de01dfa74b28a0edc191bc3caa8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -15518,9 +15519,9 @@
|
|||||||
"monitoring"
|
"monitoring"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/laravel/telescope/tree/v5.24.0"
|
"source": "https://github.com/laravel/telescope/tree/v5.25.0"
|
||||||
},
|
},
|
||||||
"time": "2026-09-08T16:15:16+00:00"
|
"time": "2026-09-09T14:16:19+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "mockery/mockery",
|
"name": "mockery/mockery",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Billing": {
|
"Billing": {
|
||||||
"repository": "solidtime-io/extension-billing",
|
"repository": "solidtime-io/extension-billing",
|
||||||
"ref": "v0.0.7"
|
"ref": "v0.0.8"
|
||||||
},
|
},
|
||||||
"Services": {
|
"Services": {
|
||||||
"repository": "solidtime-io/extension-services",
|
"repository": "solidtime-io/extension-services",
|
||||||
|
|||||||
@@ -111,6 +111,8 @@ export function useEventResize(params: {
|
|||||||
edge: 'start' | 'end',
|
edge: 'start' | 'end',
|
||||||
dayStr: string
|
dayStr: string
|
||||||
) {
|
) {
|
||||||
|
if (e.button !== 0) return;
|
||||||
|
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
|
|||||||
const showActionBlockedModal = ref(false);
|
const showActionBlockedModal = ref(false);
|
||||||
|
|
||||||
function addNotification(type: NotificationType, title: string, message?: string) {
|
function addNotification(type: NotificationType, title: string, message?: string) {
|
||||||
const uuid = crypto.randomUUID();
|
const uuid = Math.random().toString(36).substring(7);
|
||||||
notifications.value.push({ title, message, type, uuid });
|
notifications.value.push({ title, message, type, uuid });
|
||||||
|
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ use App\Exceptions\Api\CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembe
|
|||||||
use App\Models\Client;
|
use App\Models\Client;
|
||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Organization;
|
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\Project;
|
||||||
use App\Models\ProjectMember;
|
use App\Models\ProjectMember;
|
||||||
use App\Models\Report;
|
use App\Models\Report;
|
||||||
@@ -23,6 +26,7 @@ use Illuminate\Support\Collection;
|
|||||||
use Illuminate\Support\Facades\Event;
|
use Illuminate\Support\Facades\Event;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
use PHPUnit\Framework\Attributes\CoversClass;
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
use Tests\TestCaseWithDatabase;
|
use Tests\TestCaseWithDatabase;
|
||||||
use TiMacDonald\Log\LogEntry;
|
use TiMacDonald\Log\LogEntry;
|
||||||
@@ -424,4 +428,45 @@ class DeletionServiceTest extends TestCaseWithDatabase
|
|||||||
'role' => Role::Placeholder->value,
|
'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(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user