Allow specifying this is the first login

On firstlogin we allow non empty target folders. So that for guest
transfers the user sees the same UI.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2020-01-31 11:04:43 +01:00
parent 055ae9b2cd
commit 5bc0951267
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 9 additions and 2 deletions

View File

@ -80,7 +80,8 @@ class OwnershipTransferService {
IUser $destinationUser,
string $path,
?OutputInterface $output = null,
bool $move = false): void {
bool $move = false,
bool $firstLogin = false): void {
$output = $output ?? new NullOutput();
$sourceUid = $sourceUser->getUID();
$destinationUid = $destinationUser->getUID();
@ -107,7 +108,13 @@ class OwnershipTransferService {
throw new TransferOwnershipException("Unknown path provided: $path", 1);
}
if ($move && (!$view->is_dir($finalTarget) || count($view->getDirectoryContent($finalTarget)) > 0)) {
if ($move && (
!$view->is_dir($finalTarget) || (
!$firstLogin &&
count($view->getDirectoryContent($finalTarget)) > 0
)
)
) {
throw new TransferOwnershipException("Destination path does not exists or is not empty", 1);
}