diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2024-10-28 11:44:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-28 11:44:16 +0100 |
| commit | e8dbf022c96f7695b26d35869aeca9236b314567 (patch) | |
| tree | ed0dd12f33a85e3342336b3ed60b623113ef71f6 /apps/settings/lib | |
| parent | 86006368bf596a98e1cdf4ec7a13e3446456585c (diff) | |
| parent | 35d614057cdcb304a2b7ee473f4fc4e184b10985 (diff) | |
| download | nextcloud-server-e8dbf022c96f7695b26d35869aeca9236b314567.tar.gz nextcloud-server-e8dbf022c96f7695b26d35869aeca9236b314567.zip | |
Merge pull request #48919 from nextcloud/fix/settings/userid-dependency-injection
Diffstat (limited to 'apps/settings/lib')
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/settings/lib/Settings/Personal/Security/Authtokens.php b/apps/settings/lib/Settings/Personal/Security/Authtokens.php index 147a4687f66..e0509b22a9c 100644 --- a/apps/settings/lib/Settings/Personal/Security/Authtokens.php +++ b/apps/settings/lib/Settings/Personal/Security/Authtokens.php @@ -27,7 +27,7 @@ class Authtokens implements ISettings { private ISession $session, private IUserSession $userSession, private IInitialState $initialState, - private ?string $uid, + private ?string $userId, ) { } @@ -54,7 +54,7 @@ class Authtokens implements ISettings { } private function getAppTokens(): array { - $tokens = $this->tokenProvider->getTokenByUser($this->uid); + $tokens = $this->tokenProvider->getTokenByUser($this->userId); try { $sessionId = $this->session->getId(); diff --git a/apps/settings/lib/Settings/Personal/Security/Password.php b/apps/settings/lib/Settings/Personal/Security/Password.php index 82e56fe5a21..8184dae9560 100644 --- a/apps/settings/lib/Settings/Personal/Security/Password.php +++ b/apps/settings/lib/Settings/Personal/Security/Password.php @@ -16,12 +16,12 @@ class Password implements ISettings { public function __construct( private IUserManager $userManager, - private ?string $uid, + private ?string $userId, ) { } public function getForm(): TemplateResponse { - $user = $this->userManager->get($this->uid); + $user = $this->userManager->get($this->userId); $passwordChangeSupported = false; if ($user !== null) { $passwordChangeSupported = $user->canChangePassword(); diff --git a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php index 486b79ae0cb..0c419cb6fa7 100644 --- a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php +++ b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php @@ -35,7 +35,7 @@ class TwoFactor implements ISettings { MandatoryTwoFactor $mandatoryTwoFactor, private IUserSession $userSession, private IConfig $config, - private ?string $uid, + private ?string $userId, ) { $this->providerLoader = $providerLoader; $this->mandatoryTwoFactor = $mandatoryTwoFactor; diff --git a/apps/settings/lib/Settings/Personal/Security/WebAuthn.php b/apps/settings/lib/Settings/Personal/Security/WebAuthn.php index cfb29e4d493..b0bd16a0dc7 100644 --- a/apps/settings/lib/Settings/Personal/Security/WebAuthn.php +++ b/apps/settings/lib/Settings/Personal/Security/WebAuthn.php @@ -25,7 +25,7 @@ class WebAuthn implements ISettings { public function __construct( PublicKeyCredentialMapper $mapper, - private string $uid, + private string $userId, private IInitialStateService $initialStateService, Manager $manager, ) { @@ -37,7 +37,7 @@ class WebAuthn implements ISettings { $this->initialStateService->provideInitialState( Application::APP_ID, 'webauthn-devices', - $this->mapper->findAllForUid($this->uid) + $this->mapper->findAllForUid($this->userId) ); return new TemplateResponse('settings', 'settings/personal/security/webauthn', [ |