mirror of
https://github.com/projectsend/projectsend.git
synced 2026-09-17 17:15:08 +00:00
616a355d54
A client who may create folders creates them at the top of the library, beside the ones staff made, and their uploads land at the root too. An administrator opening /files gets one flat pile with nothing saying which parts belong to whom. With the new "Give each client a folder of their own" setting, every new client gets a folder named after them and it acts as their root: what they upload and any folder they create goes inside it. /files becomes a list of clients rather than a pile. The sentence this feature has to keep true: **the home is a default location, not a boundary.** Folder::scopeVisibleToClient is untouched, so a folder staff shared with a client still reaches them and sits beside their own. Making the home a jail would have silently revoked every share that already exists -- a data-access change wearing the clothes of a tidying-up feature. There is a test named after that rule. What the client sees is the *inside* of their folder, not a folder wearing their own name, which is not information to them. The breadcrumb is trimmed of it for the same reason: "Invoices", not "Acme Ltd / Invoices". Some decisions worth naming: - **A column, not a convention.** `folders.home_for_user_id`, unique. Matching on the name breaks the moment two clients share one, and `created_by` plus a null parent catches every root folder a client ever made themselves. The question is asked on each upload and each portal listing and the answer has to be exact. - **created_by is the client**, because that is how scopeVisibleToClient already grants somebody their own folder -- no assignment row to keep in step with it. That is also why this writes the row rather than calling FolderService::create(), which takes created_by from auth()->id(). - **On model events**, not in the services that make and rename clients. There are nine of those (ClientAccounts, ClientProvisioning, the profile screen, two update endpoints, AccountConversion, invitations, LDAP, social) and a rule repeated in nine places is missing from the tenth. - **Turning the setting on creates nothing.** Existing clients get a folder when an administrator presses a button that says how many are waiting, and it reports created/total/already-had afterwards. Somebody should be able to switch this on, look, and switch it off without having reorganised a library. It moves no files either. - **Nobody deletes a home from a folder screen**, staff included, and the client cannot rename theirs -- they own it, so ownership alone would have let them, and its name follows the account anyway. - **The name always follows the client**, over a hand-typed one. A folder still called "Acme Ltd" under an account now called something else misleads the administrator the feature exists for. Verified in a real browser as well as in tests: the screen mounts, the panel reads "24 of your existing clients have no folder yet", and pressing the button answers "24 of 24 clients got a folder. 0 already had one."
120 lines
5.9 KiB
PHP
120 lines
5.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
namespace App\Modules\Clients\Http\Controllers;
|
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Modules\Audit\Action;
|
|
use App\Modules\Audit\ActivityLogger;
|
|
use App\Modules\Files\Folders\ClientHomeFolders;
|
|
use App\Modules\Groups\Models\Group;
|
|
use App\Modules\Platform\Settings\Setting;
|
|
use App\Modules\Platform\Settings\Settings;
|
|
use Illuminate\Http\RedirectResponse;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Validation\Rule;
|
|
use Inertia\Inertia;
|
|
use Inertia\Response;
|
|
|
|
class ClientSettingsController extends Controller
|
|
{
|
|
public function __construct(
|
|
private readonly Settings $settings,
|
|
private readonly ActivityLogger $activity,
|
|
private readonly ClientHomeFolders $homeFolders,
|
|
) {}
|
|
|
|
public function edit(): Response
|
|
{
|
|
return Inertia::render('system/settings/clients', [
|
|
'clients_can_register' => $this->settings->get(Setting::ClientsCanRegister),
|
|
'clients_auto_approve' => $this->settings->get(Setting::ClientsAutoApprove),
|
|
'clients_auto_group' => $this->settings->get(Setting::ClientsAutoGroup),
|
|
'clients_can_select_group' => $this->settings->get(Setting::ClientsCanSelectGroup),
|
|
'clients_membership_deny_cooldown_days' => $this->settings->get(Setting::ClientsMembershipDenyCooldownDays),
|
|
'client_invitation_expiry_hours' => $this->settings->get(Setting::ClientInvitationExpiryHours),
|
|
'default_client_storage_quota_mb' => (int) $this->settings->get(Setting::DefaultClientStorageQuotaMb),
|
|
'clients_can_preview_files' => $this->settings->get(Setting::ClientsCanPreviewFiles),
|
|
'clients_home_folders' => $this->settings->get(Setting::ClientsHomeFolders),
|
|
// What the button beside the switch would actually do, so it can
|
|
// say "3 clients have no folder yet" instead of asking somebody
|
|
// to press it and find out.
|
|
'clients_without_home' => $this->homeFolders->pendingCount(),
|
|
'groups' => Group::query()->orderBy('name')->get()
|
|
->map(fn (Group $group): array => ['id' => $group->id, 'name' => $group->name])
|
|
->all(),
|
|
]);
|
|
}
|
|
|
|
public function update(Request $request): RedirectResponse
|
|
{
|
|
$validated = $request->validate([
|
|
'clients_can_register' => ['required', 'boolean'],
|
|
'clients_auto_approve' => ['required', 'boolean'],
|
|
'clients_auto_group' => ['required', 'integer', Rule::in([0, ...Group::query()->pluck('id')->all()])],
|
|
'clients_can_select_group' => ['required', Rule::in(['none', 'public'])],
|
|
'clients_membership_deny_cooldown_days' => ['required', 'integer', 'min:0', 'max:365'],
|
|
'client_invitation_expiry_hours' => ['required', 'integer', 'min:1', 'max:720'],
|
|
'default_client_storage_quota_mb' => ['required', 'integer', 'min:0'],
|
|
'clients_can_preview_files' => ['required', 'boolean'],
|
|
'clients_home_folders' => ['required', 'boolean'],
|
|
]);
|
|
|
|
$this->settings->set(Setting::ClientsCanRegister, $validated['clients_can_register']);
|
|
$this->settings->set(Setting::ClientsAutoApprove, $validated['clients_auto_approve']);
|
|
$this->settings->set(Setting::ClientsAutoGroup, (int) $validated['clients_auto_group']);
|
|
$this->settings->set(Setting::ClientsCanSelectGroup, $validated['clients_can_select_group']);
|
|
$this->settings->set(Setting::ClientsMembershipDenyCooldownDays, (int) $validated['clients_membership_deny_cooldown_days']);
|
|
$this->settings->set(Setting::ClientInvitationExpiryHours, (int) $validated['client_invitation_expiry_hours']);
|
|
$this->settings->set(Setting::DefaultClientStorageQuotaMb, (int) $validated['default_client_storage_quota_mb']);
|
|
$this->settings->set(Setting::ClientsCanPreviewFiles, $validated['clients_can_preview_files']);
|
|
// Saving the switch deliberately creates nothing. Existing clients
|
|
// get a folder when somebody presses the button, so that turning
|
|
// this on, looking at it, and turning it off again leaves the
|
|
// library exactly as it was.
|
|
$this->settings->set(Setting::ClientsHomeFolders, $validated['clients_home_folders']);
|
|
|
|
$this->activity->log(Action::SettingsUpdated, context: ['section' => 'clients']);
|
|
|
|
return back();
|
|
}
|
|
|
|
/**
|
|
* Create the missing home folders, on request.
|
|
*
|
|
* Its own endpoint rather than part of saving the form, because it is a
|
|
* different kind of act: the form records a preference, this one writes
|
|
* a folder for every client on the installation. Wrapping the second
|
|
* inside the first would mean an administrator could not try the
|
|
* setting without committing to it.
|
|
*/
|
|
public function backfillHomeFolders(Request $request): RedirectResponse
|
|
{
|
|
abort_unless($this->homeFolders->enabled(), 403, 'Client folders are switched off.');
|
|
|
|
$result = $this->homeFolders->backfill();
|
|
|
|
$this->activity->log(Action::SettingsUpdated, context: [
|
|
'section' => 'clients',
|
|
'action' => 'client_home_folders_backfill',
|
|
'created' => $result['created'],
|
|
'total' => $result['total'],
|
|
]);
|
|
|
|
// Counts rather than "Done": on an installation with hundreds of
|
|
// clients the administrator wants to know how many there were and
|
|
// how many are new, and the difference between "created 200" and
|
|
// "created 0, they already had one" is the whole answer.
|
|
return back()->with('success', trans_choice(
|
|
'{0}Every client already had a folder.|[1,*]:created of :total clients got a folder. :existing already had one.',
|
|
$result['created'],
|
|
[
|
|
'created' => (string) $result['created'],
|
|
'total' => (string) $result['total'],
|
|
'existing' => (string) $result['existing'],
|
|
],
|
|
));
|
|
}
|
|
}
|