Merge branch 'php8Optimisations' of https://github.com/nextcloud/twof…

…actor_totp into php8Optimisations
nextcloud · Jan 24, 2025 · ddbc73d · ddbc73d
2 parents ee91271 + 7227a48
commit ddbc73d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -36,7 +36,7 @@ public function __construct(
 	 * @return JSONResponse
 	 */
 	public function state(): JSONResponse {
-		$user = $this->userSession->getUser();
+		$user = $this->userSession?->getUser();
 		if (is_null($user)) {
 			throw new \Exception('user not available');
 		}
@@ -53,7 +53,7 @@ public function state(): JSONResponse {
 	 * @param string|null $code for verification
 	 */
 	public function enable(int $state, ?string $code = null): JSONResponse {
-		$user = $this->userSession->getUser();
+		$user = $this->userSession?->getUser();
 		if (is_null($user)) {
 			throw new \Exception('user not available');
 		}
@@ -94,7 +94,7 @@ public function enable(int $state, ?string $code = null): JSONResponse {
 	 */
 	private function getSecretName(): string {
 		$productName = $this->defaults->getName();
-		$user = $this->userSession->getUser();
+		$user = $this->userSession?->getUser();
 		if ($user === null) {
 			throw new RuntimeException('No user in this context');
 		}

diff --git a/lib/Listener/UserDeleted.php b/lib/Listener/UserDeleted.php
@@ -30,9 +30,9 @@ public function __construct(
 	public function handle(Event $event): void {
 		if ($event instanceof UserDeletedEvent) {
 			try {
-				$this->totpSecretMapper->deleteSecretByUserId($event->getUser()->getUID());
+				$this->totpSecretMapper->deleteSecretByUserId($event->getUser()?->getUID());
 			} catch (Exception $e) {
-				$this->logger->warning($e->getMessage(), ['uid' => $event->getUser()->getUID()]);
+				$this->logger->warning($e->getMessage(), ['uid' => $event->getUser()?->getUID()]);
 			}
 		}
 	}