upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-06 15:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 34

Merge pull request #44295 from nextcloud/fix/direct-edit-incognito

Browse source 
Allow injecting the user temporarily for direct editing
This commit is contained in:
Arthur Schiwon 2024-03-21 13:54:34 +01:00 committed by GitHub
commit 42180a2cd0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/files_external/lib/Migration/DummyUserSession.php
View file

@ -29,10 +29,7 @@ use OCP\IUserSession;
class DummyUserSession implements IUserSession {
/**
* @var IUser
*/
private $user;
private ?IUser $user = null;
public function login($uid, $password) {
}
@ -44,6 +41,10 @@ class DummyUserSession implements IUserSession {
$this->user = $user;
}
public function setVolatileActiveUser(?IUser $user): void {
$this->user = $user;
}
public function getUser() {
return $this->user;
}

2
lib/private/DirectEditing/Manager.php
View file

@ -272,13 +272,11 @@ class Manager implements IManager {
}
public function invokeTokenScope($userId): void {
\OC_User::setIncognitoMode(true);
\OC_User::setUserId($userId);
}
public function revertTokenScope(): void {
$this->userSession->setUser(null);
\OC_User::setIncognitoMode(false);
}
public function createToken($editorId, File $file, string $filePath, IShare $share = null): string {

9
lib/private/User/Session.php
View file

@ -211,6 +211,15 @@ class Session implements IUserSession, Emitter {
$this->activeUser = $user;
}
/**
* Temporarily set the currently active user without persisting in the session
*
* @param IUser|null $user
*/
public function setVolatileActiveUser(?IUser $user): void {
$this->activeUser = $user;
}
/**
* get the current active user
*

3
lib/private/legacy/OC_User.php
View file

@ -41,6 +41,7 @@ use OCP\EventDispatcher\IEventDispatcher;
use OCP\IGroupManager;
use OCP\IUser;
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\Server;
use OCP\User\Events\BeforeUserLoggedInEvent;
use OCP\User\Events\UserLoggedInEvent;
@ -338,7 +339,7 @@ class OC_User {
* @return string|false uid or false
*/
public static function getUser() {
$uid = \OC::$server->getSession() ? \OC::$server->getSession()->get('user_id') : null;
$uid = Server::get(IUserSession::class)->getUser()?->getUID();
if (!is_null($uid) && self::$incognitoMode === false) {
return $uid;
} else {

8
lib/public/IUserSession.php
View file

@ -63,6 +63,14 @@ interface IUserSession {
*/
public function setUser($user);
/**
* Temporarily set the currently active user without persisting in the session
*
* @param IUser|null $user
* @since 29.0.0
*/
public function setVolatileActiveUser(?IUser $user): void;
/**
* get the current active user
*