diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index 445b15dc6a..f87e05f45e 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -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'] : '';
diff --git a/apps/files/recentlist.php b/apps/files/recentlist.php
index 55ca3d4844..7472723576 100644
--- a/apps/files/recentlist.php
+++ b/apps/files/recentlist.php
@@ -23,7 +23,7 @@
*
*/
// Check if we are a user
-OCP\User::checkLoggedIn();
+OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
diff --git a/apps/files_external/list.php b/apps/files_external/list.php
index d628f59357..dd54c02b75 100644
--- a/apps/files_external/list.php
+++ b/apps/files_external/list.php
@@ -23,7 +23,7 @@
*
*/
// Check if we are a user
-OCP\User::checkLoggedIn();
+OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
diff --git a/apps/files_sharing/lib/Updater.php b/apps/files_sharing/lib/Updater.php
index 2c9ccd1029..976143ab1b 100644
--- a/apps/files_sharing/lib/Updater.php
+++ b/apps/files_sharing/lib/Updater.php
@@ -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();
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index ab40444022..d3627266c7 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -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();
diff --git a/apps/files_trashbin/lib/Hooks.php b/apps/files_trashbin/lib/Hooks.php
index 74f1fde973..8bf8fa8dc9 100644
--- a/apps/files_trashbin/lib/Hooks.php
+++ b/apps/files_trashbin/lib/Hooks.php
@@ -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);
}
diff --git a/apps/files_trashbin/lib/Trashbin.php b/apps/files_trashbin/lib/Trashbin.php
index 01ee260985..8b2b8b2d95 100644
--- a/apps/files_trashbin/lib/Trashbin.php
+++ b/apps/files_trashbin/lib/Trashbin.php
@@ -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) {
diff --git a/apps/files_trashbin/list.php b/apps/files_trashbin/list.php
index 2dbc03719e..29d9cfd5ef 100644
--- a/apps/files_trashbin/list.php
+++ b/apps/files_trashbin/list.php
@@ -24,7 +24,7 @@
*
*/
// Check if we are a user
-OCP\User::checkLoggedIn();
+OC_Util::checkLoggedIn();
$config = \OC::$server->getConfig();
$userSession = \OC::$server->getUserSession();
diff --git a/apps/files_versions/lib/Hooks.php b/apps/files_versions/lib/Hooks.php
index 9a74a9280b..78a8920245 100644
--- a/apps/files_versions/lib/Hooks.php
+++ b/apps/files_versions/lib/Hooks.php
@@ -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 {
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 231faaaac0..79683e41b4 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -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 {
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
index 033d8aac2a..225d191f64 100644
--- a/build/psalm-baseline.xml
+++ b/build/psalm-baseline.xml
@@ -1646,6 +1646,11 @@
dispatch
+
+
+ $user
+
+
int
@@ -1715,9 +1720,12 @@
false
-
+
$timestamp
$timestamp
+ $uid
+ $user
+ $user
@@ -1756,8 +1764,9 @@
'OCA\Files_Versions::createVersion'
-
+
$timestamp
+ $uid
dispatch
@@ -5073,14 +5082,6 @@
mixed
-
-
- \OC_User::getUser()
-
-
- string
-
-
\OC_Helper::computerFileSize($str)
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 7d200489bc..d90785e08d 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -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',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 6fd64c89b9..702b47eb4c 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -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',
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
index 2223858b7a..a59f735c10 100644
--- a/lib/private/Files/View.php
+++ b/lib/private/Files/View.php
@@ -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 {
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 2d0d4f1cf8..703bc28297 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -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);
}
diff --git a/lib/public/User.php b/lib/public/User.php
deleted file mode 100644
index 9bbc2c20cc..0000000000
--- a/lib/public/User.php
+++ /dev/null
@@ -1,85 +0,0 @@
-
- * @author Frank Karlitschek
- * @author Georg Ehrke
- * @author Morris Jobke
- * @author Roeland Jago Douma
- * @author Sebastian Wessalowski
- * @author Thomas Müller
- *
- * @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
- *
- */
-
-/**
- * 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();
- }
-}