Skip to content

Public dav endpoint v2 #32400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 4 commits into from
Jan 9, 2024
Merged

Public dav endpoint v2 #32400

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b6a650
feat: public dav endpoint v2
skjnldsv May 15, 2022
82b5a19
fix: public dav and files_sharing testing fixes
skjnldsv Oct 28, 2022
18399fc
fix: improve typing and use \OCP\Server::get
skjnldsv Dec 29, 2023
9e4c9b9
fix(psalm): update baseline and suppress unnecessary issues
skjnldsv Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix(psalm): update baseline and suppress unnecessary issues 
Signed-off-by: John Molakvoæ <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Jan 9, 2024
commit 9e4c9b97ddf96b1a9379f5bdc5ecd1c24021291c
7 changes: 7 additions & 0 deletions apps/dav/appinfo/v2/publicremote.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,20 @@
$fileId = $share->getNodeId();

// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
/** @psalm-suppress InternalMethod */
$previousLog = Filesystem::logWarningWhenAddingStorageWrapper(false);

/** @psalm-suppress MissingClosureParamType */
Filesystem::addStorageWrapper('sharePermissions', function ($mountPoint, $storage) use ($share) {
return new PermissionsMask(['storage' => $storage, 'mask' => $share->getPermissions() | \OCP\Constants::PERMISSION_SHARE]);
});

/** @psalm-suppress MissingClosureParamType */
Filesystem::addStorageWrapper('shareOwner', function ($mountPoint, $storage) use ($share) {
return new PublicOwnerWrapper(['storage' => $storage, 'owner' => $share->getShareOwner()]);
});

/** @psalm-suppress InternalMethod */
Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

OC_Util::tearDownFS();
Expand Down
6 changes: 0 additions & 6 deletions build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@
<code>$baseuri</code>
</UndefinedGlobalVariable>
</file>
<file src="apps/dav/appinfo/v2/publicremote.php">
<InternalMethod>
<code>Filesystem::logWarningWhenAddingStorageWrapper($previousLog)</code>
<code>Filesystem::logWarningWhenAddingStorageWrapper(false)</code>
</InternalMethod>
</file>
<file src="apps/dav/lib/AppInfo/Application.php">
<InvalidArgument>
<code>CalendarDeletionDefaultUpdaterListener::class</code>
Expand Down
4 changes: 2 additions & 2 deletions public.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* @param $service
* @return string
*/
function resolveService($service) {
function resolveService(string $service): string {
$services = [
'webdav' => 'dav/appinfo/v1/publicwebdav.php',
'dav' => 'dav/appinfo/v2/publicremote.php',
Expand Down Expand Up @@ -74,7 +74,7 @@ function resolveService($service) {

$file = resolveService($service);

if (is_null($file)) {
if (!$file) {
throw new RemoteException('Path not found', 404);
}

Expand Down