NB-Public
/
user_saml
mirror of https://github.com/netzbegruenung/user_saml.git
14
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve performance by reusing existing sessions 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2021-01-26 14:45:50 +01:00
parent b13a9983e2
commit e9e55a1da1
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/UserBackend.php
View File

@ -389,10 +389,7 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
* @since 6.0.0 * @since 6.0.0
*/ */
public function isSessionActive() { public function isSessionActive() {
if($this->getCurrentUserId() !== '') { return $this->session->get('user_saml.samlUserData') !== null;
return true;
}
return false;
} }
/** /**
@ -487,8 +484,15 @@ class UserBackend implements IApacheBackend, UserInterface, IUserBackend {
* @since 6.0.0 * @since 6.0.0
*/ */
public function getCurrentUserId() { public function getCurrentUserId() {
$this->userData->setAttributes($this->session->get('user_saml.samlUserData') ?? []); $user = \OC::$server->getUserSession()->getUser();
$uid = $this->userData->getEffectiveUid();
if($user instanceof IUser && $this->session->get('user_saml.samlUserData')) {
$uid = $user->getUID();
} else {
$this->userData->setAttributes($this->session->get('user_saml.samlUserData') ?? []);
$uid = $this->userData->getEffectiveUid();
}
if($uid !== '' && $this->userExists($uid)) { if($uid !== '' && $this->userExists($uid)) {
$uid = $this->userData->testEncodedObjectGUID($uid); $uid = $this->userData->testEncodedObjectGUID($uid);