summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2022-07-18 11:50:43 +0200
committerGitHub <noreply@github.com>2022-07-18 11:50:43 +0200
commit929aaaa129519e554f56b19815d0e2ff0f41cd2b (patch)
treee3a6d9478a9537c63b50f15faa2208d32ca535f8 /lib/private
parent6a6ce39d0b303a883083d78e7a2f81908b42cd4c (diff)
parent21b3e87c771987768e0ffe38823e680ff738394f (diff)
downloadnextcloud-server-929aaaa129519e554f56b19815d0e2ff0f41cd2b.tar.gz
nextcloud-server-929aaaa129519e554f56b19815d0e2ff0f41cd2b.zip
Merge pull request #27929 from nextcloud/enh/allowSsoToProvideSecret
Allow SSO authentication to provide a user secret
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/legacy/OC_User.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php
index b7547be5e82..de066e143b4 100644
--- a/lib/private/legacy/OC_User.php
+++ b/lib/private/legacy/OC_User.php
@@ -178,7 +178,11 @@ class OC_User {
}
$userSession->setLoginName($uid);
$request = OC::$server->getRequest();
- $userSession->createSessionToken($request, $uid, $uid);
+ $password = null;
+ if ($backend instanceof \OCP\Authentication\IProvideUserSecretBackend) {
+ $password = $backend->getCurrentUserSecret();
+ }
+ $userSession->createSessionToken($request, $uid, $uid, $password);
$userSession->createRememberMeToken($userSession->getUser());
// setup the filesystem
OC_Util::setupFS($uid);
@@ -191,7 +195,7 @@ class OC_User {
'post_login',
[
'uid' => $uid,
- 'password' => null,
+ 'password' => $password,
'isTokenLogin' => false,
]
);