summaryrefslogtreecommitdiffstats
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 19:28:57 +0200
commit3b840dfb795b7b3037b4193da451138df297c5c2 (patch)
tree99c36081598c0c53b782be7c76b81364e1370d7b /lib/private
parent02313013ad9094ea0ec52f30672971ab03f4ec15 (diff)
downloadnextcloud-server-3b840dfb795b7b3037b4193da451138df297c5c2.tar.gz
nextcloud-server-3b840dfb795b7b3037b4193da451138df297c5c2.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 45278254762..f41e61b4a18 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 d890ac785af..6942fdeebcb 100644
--- a/lib/private/Template/JSConfigHelper.php
+++ b/lib/private/Template/JSConfigHelper.php
@@ -309,6 +309,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 24ffaa3b3aa..ec0b7e69c8a 100644
--- a/lib/private/legacy/OC_User.php
+++ b/lib/private/legacy/OC_User.php
@@ -197,7 +197,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);
}