aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2024-06-12 11:05:43 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2024-06-12 11:25:35 +0200
commit4ec174197f3ee47631193f7941ef656ce6b06be1 (patch)
tree9c7c7a2b37fd4ffeeae746405fd1ad91b71c1be0 /lib/private
parent86a496d58980cc3dd578368c9d8e5f951ec01f17 (diff)
downloadnextcloud-server-4ec174197f3ee47631193f7941ef656ce6b06be1.tar.gz
nextcloud-server-4ec174197f3ee47631193f7941ef656ce6b06be1.zip
fix(Token): make new scope future compatible
- "password-unconfirmable" is the effective name for 30, but a draft name was backported. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php2
-rw-r--r--lib/private/Template/JSConfigHelper.php2
-rw-r--r--lib/private/legacy/OC_User.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php
index 27328e17b03..8d00f6b7423 100644
--- a/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/PasswordConfirmationMiddleware.php
@@ -103,7 +103,7 @@ class PasswordConfirmationMiddleware extends Middleware {
return;
}
$scope = $token->getScopeAsArray();
- if (isset($scope['sso-based-login']) && $scope['sso-based-login'] === true) {
+ if (isset($scope['password-unconfirmable']) && $scope['password-unconfirmable'] === true) {
// Users logging in from SSO backends cannot confirm their password by design
return;
}
diff --git a/lib/private/Template/JSConfigHelper.php b/lib/private/Template/JSConfigHelper.php
index cca3d646544..f255da9fd66 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -310,6 +310,6 @@ class JSConfigHelper {
return true;
}
$scope = $token->getScopeAsArray();
- return !isset($scope['sso-based-login']) || $scope['sso-based-login'] === false;
+ return !isset($scope['password-unconfirmable']) || $scope['password-unconfirmable'] === false;
}
}
diff --git a/lib/private/legacy/OC_User.php b/lib/private/legacy/OC_User.php
index 7cf0b3487a9..0be87804eed 100644
--- a/lib/private/legacy/OC_User.php
+++ b/lib/private/legacy/OC_User.php
@@ -200,7 +200,7 @@ class OC_User {
if (empty($password)) {
$tokenProvider = \OC::$server->get(IProvider::class);
$token = $tokenProvider->getToken($userSession->getSession()->getId());
- $token->setScope(['sso-based-login' => true]);
+ $token->setScope(['password-unconfirmable' => true]);
$tokenProvider->updateToken($token);
}