mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25679 from nextcloud/drop/ocp-user 

Drop \OCP\User
This commit is contained in:
Morris Jobke 2021-05-21 15:05:38 +02:00 committed by GitHub
parent 4aae71cd77 8196420063
commit b1ad3faf14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 35 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/ajax/download.php
View File

@ -29,7 +29,7 @@
*/
// Check if we are a user
OCP\User::checkLoggedIn();
OC_Util::checkLoggedIn();
\OC::$server->getSession()->close();
$files = isset($_GET['files']) ? (string)$_GET['files'] : '';

2
apps/files/recentlist.php
View File

@ -23,7 +23,7 @@
*
*/
// Check if we are a user
OCP\User::checkLoggedIn();
OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();

2
apps/files_external/list.php
View File

@ -23,7 +23,7 @@
*
*/
// Check if we are a user
OCP\User::checkLoggedIn();
OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();

6
apps/files_sharing/lib/Updater.php
View File

@ -94,11 +94,11 @@ class Updater {
* @param string $newPath new path relative to data/user/files
*/
private static function renameChildren($oldPath, $newPath) {
$absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath);
$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath);
$absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OC_User::getUser() . '/files/' . $newPath);
$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OC_User::getUser() . '/files/' . $oldPath);
$mountManager = \OC\Files\Filesystem::getMountManager();
$mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath);
$mountedShares = $mountManager->findIn('/' . \OC_User::getUser() . '/files/' . $oldPath);
foreach ($mountedShares as $mount) {
if ($mount->getStorage()->instanceOfStorage(ISharedStorage::class)) {
$mountPoint = $mount->getMountPoint();

2
apps/files_sharing/list.php
View File

@ -28,7 +28,7 @@ use OCA\Viewer\Event\LoadViewer;
use OCP\EventDispatcher\GenericEvent;
// Check if we are a user
OCP\User::checkLoggedIn();
OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
$legacyEventDispatcher = \OC::$server->getEventDispatcher();

2
apps/files_trashbin/lib/Hooks.php
View File

@ -44,7 +44,7 @@ class Hooks {
}
public static function post_write_hook($params) {
$user = \OCP\User::getUser();
$user = \OC_User::getUser();
if (!empty($user)) {
Trashbin::resizeTrash($user);
}

16
apps/files_trashbin/lib/Trashbin.php
View File

@ -45,6 +45,7 @@
namespace OCA\Files_Trashbin;
use OC_User;
use OC\Files\Cache\Cache;
use OC\Files\Cache\CacheEntry;
use OC\Files\Cache\CacheQueryBuilder;
@ -60,7 +61,6 @@ use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
use OCP\Lock\ILockingProvider;
use OCP\Lock\LockedException;
use OCP\User;
class Trashbin {
@ -103,14 +103,14 @@ class Trashbin {
// to a remote user with a federated cloud ID we use the current logged-in
// user. We need a valid local user to move the file to the right trash bin
if (!$userManager->userExists($uid)) {
$uid = User::getUser();
$uid = OC_User::getUser();
}
if (!$uid) {
// no owner, usually because of share link from ext storage
return [null, null];
}
Filesystem::initMountPoints($uid);
if ($uid !== User::getUser()) {
if ($uid !== OC_User::getUser()) {
$info = Filesystem::getFileInfo($filename);
$ownerView = new View('/' . $uid . '/files');
try {
@ -390,7 +390,7 @@ class Trashbin {
*/
private static function retainVersions($filename, $owner, $ownerPath, $timestamp) {
if (\OCP\App::isEnabled('files_versions') && !empty($ownerPath)) {
$user = User::getUser();
$user = OC_User::getUser();
$rootView = new View('/');
if ($rootView->is_dir($owner . '/files_versions/' . $ownerPath)) {
@ -464,7 +464,7 @@ class Trashbin {
* @return bool true on success, false otherwise
*/
public static function restore($file, $filename, $timestamp) {
$user = User::getUser();
$user = OC_User::getUser();
$view = new View('/' . $user);
$location = '';
@ -538,7 +538,7 @@ class Trashbin {
*/
private static function restoreVersions(View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
if (\OCP\App::isEnabled('files_versions')) {
$user = User::getUser();
$user = OC_User::getUser();
$rootView = new View('/');
$target = Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename);
@ -574,7 +574,7 @@ class Trashbin {
* delete all files from the trash
*/
public static function deleteAll() {
$user = User::getUser();
$user = OC_User::getUser();
$userRoot = \OC::$server->getUserFolder($user)->getParent();
$view = new View('/' . $user);
$fileInfos = $view->getDirectoryContent('files_trashbin/files');
@ -725,7 +725,7 @@ class Trashbin {
* @return bool true if file exists, otherwise false
*/
public static function file_exists($filename, $timestamp = null) {
$user = User::getUser();
$user = OC_User::getUser();
$view = new View('/' . $user);
if ($timestamp) {

2
apps/files_trashbin/list.php
View File

@ -24,7 +24,7 @@
*
*/
// Check if we are a user
OCP\User::checkLoggedIn();
OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();

4
apps/files_versions/lib/Hooks.php
View File

@ -129,7 +129,7 @@ class Hooks {
public static function pre_renameOrCopy_hook($params) {
// if we rename a movable mount point, then the versions don't have
// to be renamed
$absOldPath = Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
$absOldPath = Filesystem::normalizePath('/' . \OC_User::getUser() . '/files' . $params['oldpath']);
$manager = Filesystem::getMountManager();
$mount = $manager->find($absOldPath);
$internalPath = $mount->getInternalPath($absOldPath);
@ -137,7 +137,7 @@ class Hooks {
return;
}
$view = new View(\OCP\User::getUser() . '/files');
$view = new View(\OC_User::getUser() . '/files');
if ($view->file_exists($params['newpath'])) {
Storage::store($params['newpath']);
} else {

6
apps/files_versions/lib/Storage.php
View File

@ -46,6 +46,7 @@
namespace OCA\Files_Versions;
use OC_User;
use OC\Files\Filesystem;
use OC\Files\View;
use OCA\Files_Versions\AppInfo\Application;
@ -56,7 +57,6 @@ use OCP\Files\NotFoundException;
use OCP\Files\StorageNotAvailableException;
use OCP\IUser;
use OCP\Lock\ILockingProvider;
use OCP\User;
class Storage {
public const DEFAULTENABLED = true;
@ -105,10 +105,10 @@ class Storage {
// to a remote user with a federated cloud ID we use the current logged-in
// user. We need a valid local user to create the versions
if (!$userManager->userExists($uid)) {
$uid = User::getUser();
$uid = OC_User::getUser();
}
Filesystem::initMountPoints($uid);
if ($uid !== User::getUser()) {
if ($uid !== OC_User::getUser()) {
$info = Filesystem::getFileInfo($filename);
$ownerView = new View('/'.$uid.'/files');
try {

21
build/psalm-baseline.xml
View File

@ -1646,6 +1646,11 @@
<code>dispatch</code>
</TooManyArguments>
</file>
<file src="apps/files_trashbin/lib/Hooks.php">
<InvalidScalarArgument occurrences="1">
<code>$user</code>
</InvalidScalarArgument>
</file>
<file src="apps/files_trashbin/lib/Sabre/AbstractTrash.php">
<InvalidNullableReturnType occurrences="1">
<code>int</code>
@ -1715,9 +1720,12 @@
<FalsableReturnStatement occurrences="1">
<code>false</code>
</FalsableReturnStatement>
<InvalidScalarArgument occurrences="2">
<InvalidScalarArgument occurrences="5">
<code>$timestamp</code>
<code>$timestamp</code>
<code>$uid</code>
<code>$user</code>
<code>$user</code>
</InvalidScalarArgument>
</file>
<file src="apps/files_versions/appinfo/routes.php">
@ -1756,8 +1764,9 @@
<InvalidArgument occurrences="1">
<code>'OCA\Files_Versions::createVersion'</code>
</InvalidArgument>
<InvalidScalarArgument occurrences="1">
<InvalidScalarArgument occurrences="2">
<code>$timestamp</code>
<code>$uid</code>
</InvalidScalarArgument>
<TooManyArguments occurrences="2">
<code>dispatch</code>
@ -5073,14 +5082,6 @@
<code>mixed</code>
</InvalidReturnType>
</file>
<file src="lib/public/User.php">
<InvalidReturnStatement occurrences="1">
<code>\OC_User::getUser()</code>
</InvalidReturnStatement>
<InvalidReturnType occurrences="1">
<code>string</code>
</InvalidReturnType>
</file>
<file src="lib/public/Util.php">
<InvalidReturnStatement occurrences="1">
<code>\OC_Helper::computerFileSize($str)</code>

1
lib/composer/composer/autoload_classmap.php
View File

@ -522,7 +522,6 @@ return array(
'OCP\\SystemTag\\TagAlreadyExistsException' => $baseDir . '/lib/public/SystemTag/TagAlreadyExistsException.php',
'OCP\\SystemTag\\TagNotFoundException' => $baseDir . '/lib/public/SystemTag/TagNotFoundException.php',
'OCP\\Template' => $baseDir . '/lib/public/Template.php',
'OCP\\User' => $baseDir . '/lib/public/User.php',
'OCP\\UserInterface' => $baseDir . '/lib/public/UserInterface.php',
'OCP\\UserStatus\\IManager' => $baseDir . '/lib/public/UserStatus/IManager.php',
'OCP\\UserStatus\\IProvider' => $baseDir . '/lib/public/UserStatus/IProvider.php',

1
lib/composer/composer/autoload_static.php
View File

@ -551,7 +551,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\SystemTag\\TagAlreadyExistsException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagAlreadyExistsException.php',
'OCP\\SystemTag\\TagNotFoundException' => __DIR__ . '/../../..' . '/lib/public/SystemTag/TagNotFoundException.php',
'OCP\\Template' => __DIR__ . '/../../..' . '/lib/public/Template.php',
'OCP\\User' => __DIR__ . '/../../..' . '/lib/public/User.php',
'OCP\\UserInterface' => __DIR__ . '/../../..' . '/lib/public/UserInterface.php',
'OCP\\UserStatus\\IManager' => __DIR__ . '/../../..' . '/lib/public/UserStatus/IManager.php',
'OCP\\UserStatus\\IProvider' => __DIR__ . '/../../..' . '/lib/public/UserStatus/IProvider.php',

2
lib/private/Files/View.php
View File

@ -2171,7 +2171,7 @@ class View {
throw new NotFoundException($this->getAbsolutePath($filename) . ' not found');
}
$uid = $info->getOwner()->getUID();
if ($uid != \OCP\User::getUser()) {
if ($uid != \OC_User::getUser()) {
Filesystem::initMountPoints($uid);
$ownerView = new View('/' . $uid . '/files');
try {

2
lib/private/Share/Share.php
View File

@ -614,7 +614,7 @@ class Share extends Constants {
}
// group items if we are looking for items shared with the current user
if (isset($shareWith) && $shareWith === \OCP\User::getUser()) {
if (isset($shareWith) && $shareWith === \OC_User::getUser()) {
$items = self::groupItems($items, $itemType);
}

85
lib/public/User.php
View File

@ -1,85 +0,0 @@
<?php
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
* @author Bart Visscher <bartv@thisnet.nl>
* @author Frank Karlitschek <frank@karlitschek.de>
* @author Georg Ehrke <oc.list@georgehrke.com>
* @author Morris Jobke <hey@morrisjobke.de>
* @author Roeland Jago Douma <roeland@famdouma.nl>
* @author Sebastian Wessalowski <sebastian@wessalowski.org>
* @author Thomas Müller <thomas.mueller@tmit.eu>
*
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
/**
* Public interface of ownCloud for apps to use.
* User Class
*
*/
// use OCP namespace for all classes that are considered public.
// This means that they should be used by apps instead of the internal ownCloud classes
namespace OCP;
/**
* This class provides access to the user management. You can get information
* about the currently logged in user and the permissions for example
* @since 5.0.0
* @deprecated 13.0.0
*/
class User {
/**
* Get the user id of the user currently logged in.
* @return string uid or false
* @deprecated 8.0.0 Use \OC::$server->getUserSession()->getUser()->getUID()
* @since 5.0.0
*/
public static function getUser() {
return \OC_User::getUser();
}
/**
* Check if the user is logged in
* @return boolean
* @since 5.0.0
* @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
*/
public static function isLoggedIn() {
return \OC::$server->getUserSession()->isLoggedIn();
}
/**
* Check if the user is a admin, redirects to home if not
* @since 5.0.0
* @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
*/
public static function checkAdminUser() {
\OC_Util::checkAdminUser();
}
/**
* Check if the user is logged in, redirects to home if not. With
* redirect URL parameter to the request URI.
* @since 5.0.0
* @deprecated 13.0.0 Use annotation based ACLs from the AppFramework instead
*/
public static function checkLoggedIn() {
\OC_Util::checkLoggedIn();
}
}