diff --git a/resources/js/components/Others/CreatePersonalTokenPopup.vue b/resources/js/components/Others/CreatePersonalTokenPopup.vue index 2a804b0a..bd5dfded 100644 --- a/resources/js/components/Others/CreatePersonalTokenPopup.vue +++ b/resources/js/components/Others/CreatePersonalTokenPopup.vue @@ -10,7 +10,7 @@ v-slot="{ invalid }" tag="form" > - + - + {{ $t('shared_form.button_done') }} @@ -115,11 +115,10 @@ export default { this.name = undefined }) }, - closePopup() { - this.$closePopup() - this.token = undefined - }, }, + created() { + events.$on('popup:close', () => this.token = undefined) + } } diff --git a/src/App/Console/Commands/SetupDevEnvironment.php b/src/App/Console/Commands/SetupDevEnvironment.php index fcf9b6e8..8a470d58 100644 --- a/src/App/Console/Commands/SetupDevEnvironment.php +++ b/src/App/Console/Commands/SetupDevEnvironment.php @@ -116,6 +116,10 @@ class SetupDevEnvironment extends Command 'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']), ]); + // Create personal tokens + $user->createToken('Workplace App'); + $user->createToken('Web App'); + // Show user credentials $this->info('Default admin account created. Email: howdy@hi5ve.digital and Password: vuefilemanager'); } diff --git a/src/App/Users/Controllers/Account/UpdatePasswordController.php b/src/App/Users/Controllers/Account/UpdatePasswordController.php index 49ae61b1..8d7eab67 100644 --- a/src/App/Users/Controllers/Account/UpdatePasswordController.php +++ b/src/App/Users/Controllers/Account/UpdatePasswordController.php @@ -11,11 +11,11 @@ class UpdatePasswordController extends Controller public function __invoke( UpdateUserPasswordRequest $request ): Response { - $user = Auth::user(); - // Check if is demo abort_if(is_demo_account(), 204, 'Changed!'); + $user = Auth::user(); + // Store new password $user->update([ 'password' => bcrypt($request->input('password')), diff --git a/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php b/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php index c2b13a37..eb97f8ce 100644 --- a/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php +++ b/src/App/Users/Controllers/Account/UpdateProfileSettingsController.php @@ -13,12 +13,12 @@ class UpdateProfileSettingsController extends Controller */ public function __invoke(UpdateUserProfileSettingsRequest $request): Response { - // Get user - $user = Auth::user(); - // Check if is demo abort_if(is_demo_account(), 204, 'Done.'); + // Get user + $user = Auth::user(); + // Update avatar if ($request->hasFile('avatar')) { $user diff --git a/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php b/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php index 75922fc6..5082a610 100644 --- a/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php +++ b/src/App/Users/Controllers/Authentication/AccountAccessTokenController.php @@ -1,4 +1,5 @@ 'token', - 'token' => Str::random(40), - 'abilities' => '["*"]', - 'tokenable_id' => Str::uuid(), - 'updated_at' => now(), - 'created_at' => now(), - 'id' => Str::random(40), - ]); + if (is_demo_account()) { + return response(['plainTextToken' => Str::random(40)], 201); + } $token = Auth::user() ->createToken( diff --git a/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php b/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php index ad89c996..a7600112 100644 --- a/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php +++ b/src/Domain/Admin/Controllers/Users/ChangeUserRoleController.php @@ -12,7 +12,7 @@ class ChangeUserRoleController extends Controller ChangeRoleRequest $request, User $user, ): UserResource { - if (is_demo_account($user->email)) { + if (is_demo_account()) { return new UserResource($user); } diff --git a/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php b/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php index d6ef2b86..98e1fd1f 100644 --- a/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php +++ b/src/Domain/Admin/Controllers/Users/ChangeUserStorageCapacityController.php @@ -15,6 +15,11 @@ class ChangeUserStorageCapacityController extends Controller ChangeStorageCapacityRequest $request, User $user, ): UserStorageResource { + // Abort in demo mode + if (is_demo_account()) { + return new UserStorageResource($user); + } + $user ->limitations() ->update( diff --git a/src/Domain/Folders/Controllers/FavouriteController.php b/src/Domain/Folders/Controllers/FavouriteController.php index c91dfa35..811660c7 100644 --- a/src/Domain/Folders/Controllers/FavouriteController.php +++ b/src/Domain/Folders/Controllers/FavouriteController.php @@ -17,7 +17,7 @@ class FavouriteController extends Controller $user = Auth::user(); foreach ($request->input('folders') as $id) { - if (is_demo_account($user->email)) { + if (is_demo_account()) { return $user->favouriteFolders->makeHidden(['pivot']); } @@ -38,7 +38,7 @@ class FavouriteController extends Controller { $user = Auth::user(); - if (is_demo_account($user->email)) { + if (is_demo_account()) { return $user->favouriteFolders->makeHidden(['pivot']); } diff --git a/src/Domain/Homepage/Controllers/SendContactMessageController.php b/src/Domain/Homepage/Controllers/SendContactMessageController.php index 93f5a39c..766d3bce 100644 --- a/src/Domain/Homepage/Controllers/SendContactMessageController.php +++ b/src/Domain/Homepage/Controllers/SendContactMessageController.php @@ -15,6 +15,9 @@ class SendContactMessageController extends Controller public function __invoke( SendContactMessageRequest $request ): Response { + // Abort in demo mode + abort_if(is_demo(), 201, 'Done'); + $contactEmail = get_settings('contact_email'); if ($contactEmail) { diff --git a/src/Domain/Settings/Controllers/GetSettingsValueController.php b/src/Domain/Settings/Controllers/GetSettingsValueController.php index a601c3a9..fbda0862 100644 --- a/src/Domain/Settings/Controllers/GetSettingsValueController.php +++ b/src/Domain/Settings/Controllers/GetSettingsValueController.php @@ -7,9 +7,6 @@ use Domain\Settings\Models\Setting; class GetSettingsValueController { - /** - * List of allowed settings to get from public request - */ private array $blacklist = [ 'purchase_code', 'license', diff --git a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php index ee37dbd5..59682b54 100644 --- a/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php +++ b/src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php @@ -1,6 +1,7 @@ owner->canInviteTeamMembers($request->input('invitations'))) { return response([ diff --git a/src/Domain/Teams/Controllers/LeaveTeamFolderController.php b/src/Domain/Teams/Controllers/LeaveTeamFolderController.php index 7e0ede5f..0e55e713 100644 --- a/src/Domain/Teams/Controllers/LeaveTeamFolderController.php +++ b/src/Domain/Teams/Controllers/LeaveTeamFolderController.php @@ -19,6 +19,11 @@ class LeaveTeamFolderController extends Controller public function __invoke(Folder $folder): Response|Application|ResponseFactory { + // Abort in demo mode + if (is_demo_account()) { + return response('Done.', 204); + } + // Authorize action if (! Gate::any(['can-edit', 'can-view'], [$folder, null])) { abort(403, 'Access Denied'); diff --git a/src/Domain/Teams/Controllers/TeamFoldersController.php b/src/Domain/Teams/Controllers/TeamFoldersController.php index 1bbc79d6..9ab72ca8 100644 --- a/src/Domain/Teams/Controllers/TeamFoldersController.php +++ b/src/Domain/Teams/Controllers/TeamFoldersController.php @@ -64,6 +64,9 @@ class TeamFoldersController extends Controller public function store( CreateTeamFolderRequest $request, ): ResponseFactory | Response { + // Abort in demo mode + abort_if(is_demo_account(), 201, 'Done.'); + $data = CreateTeamFolderData::fromRequest($request); // Check if user can create team folder @@ -108,6 +111,12 @@ class TeamFoldersController extends Controller UpdateInvitationsAction $updateInvitations, UpdateMembersAction $updateMembers, ): ResponseFactory | Response { + // Abort in demo mode + if (is_demo_account()) { + return response(new FolderResource($folder), 201); + } + + // Authorize request $this->authorize('owner', $folder); // Check if user didn't exceed max team members limit @@ -133,6 +142,11 @@ class TeamFoldersController extends Controller public function destroy(Folder $folder): ResponseFactory | Response { + // Abort in demo mode + if (is_demo_account()) { + return response('Done.', 201); + } + $this->authorize('owner', $folder); // Delete existing invitations diff --git a/src/Domain/Trash/Controllers/RestoreTrashContentController.php b/src/Domain/Trash/Controllers/RestoreTrashContentController.php index 768ab31e..88fc22c2 100644 --- a/src/Domain/Trash/Controllers/RestoreTrashContentController.php +++ b/src/Domain/Trash/Controllers/RestoreTrashContentController.php @@ -14,7 +14,7 @@ class RestoreTrashContentController extends Controller public function __invoke( Request $request ): Response { - abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.'); + abort_if(is_demo_account(), 204, 'Done.'); // TODO: zrefaktorovat validator do requestu $validator = Validator::make($request->input('items'), [ diff --git a/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php b/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php index 1de4feac..70c44987 100644 --- a/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php +++ b/src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php @@ -17,7 +17,9 @@ class SetUploadRequestAsFilledController ]); // Send user notification - $uploadRequest->user->notify(new UploadRequestFulfilledNotification($uploadRequest)); + if (!is_demo_account()) { + $uploadRequest->user->notify(new UploadRequestFulfilledNotification($uploadRequest)); + } return response(new UploadRequestResource($uploadRequest), 201); }