Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/documentserver_community.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-01-29 17:02:25 +0300
committerRobin Appelman <robin@icewind.nl>2020-01-29 17:02:25 +0300
commitc5994761331127d5fa27d615ce1bee2cee5a184a (patch)
treee10467f7fc5e8e0de38e6b1eb1edcc39f1c678d1 /lib
parentb38e30fbf9fa4ead1774ca88b2cd765a6d76890d (diff)
fix username in ui being prefixed by instance id
Diffstat (limited to 'lib')
-rw-r--r--lib/Channel/Session.php2
-rw-r--r--lib/XHRCommand/AuthCommand.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Channel/Session.php b/lib/Channel/Session.php
index 5884c04..0e47549 100644
--- a/lib/Channel/Session.php
+++ b/lib/Channel/Session.php
@@ -76,7 +76,7 @@ class Session {
return [
"id" => $this->getUserId(),
"idOriginal" => $this->getUserOriginal(),
- "username" => $this->getUser(),
+ "username" => $this->getUserOriginal(),
"indexUser" => $this->getUserIndex(),
"view" => $this->isReadOnly(),
"connectionId" => $this->getSessionId(),
diff --git a/lib/XHRCommand/AuthCommand.php b/lib/XHRCommand/AuthCommand.php
index cb2823d..d1ce97c 100644
--- a/lib/XHRCommand/AuthCommand.php
+++ b/lib/XHRCommand/AuthCommand.php
@@ -79,7 +79,7 @@ class AuthCommand implements ICommandHandler {
$user = $command['user'];
$readOnly = $command['view'];
- $session = $this->sessionManager->authenticate($session, $user['id'], $user['id'], $readOnly);
+ $session = $this->sessionManager->authenticate($session, $user['id'], $user['username'], $readOnly);
$participants = $this->sessionManager->getSessionsForDocument($session->getDocumentId());