nextcloud / server

lib/private/Settings/Personal/Security.php

Indentation +138 added lines, -138 removed lines

@@ -46,143 +46,143 @@
 
 class Security implements ISettings {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var TwoFactorManager */
-	private $twoFactorManager;
-
-	/** @var IAuthTokenProvider */
-	private $tokenProvider;
-
-	/** @var ProviderLoader */
-	private $providerLoader;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var IInitialStateService */
-	private $initialStateService;
-	/**
-	 * @var string|null
-	 */
-	private $uid;
-	/**
-	 *@var IConfig
-	 */
-	private $config;
-
-	public function __construct(IUserManager $userManager,
-								TwoFactorManager $providerManager,
-								IAuthTokenProvider $tokenProvider,
-								ProviderLoader $providerLoader,
-								IUserSession $userSession,
-								ISession $session,
-								IConfig $config,
-								IInitialStateService $initialStateService,
-								?string $UserId) {
-		$this->userManager = $userManager;
-		$this->twoFactorManager = $providerManager;
-		$this->tokenProvider = $tokenProvider;
-		$this->providerLoader = $providerLoader;
-		$this->userSession = $userSession;
-		$this->session = $session;
-		$this->initialStateService = $initialStateService;
-		$this->uid = $UserId;
-		$this->config = $config;
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$user = $this->userManager->get($this->uid);
-		$passwordChangeSupported = false;
-		if ($user !== null) {
-			$passwordChangeSupported = $user->canChangePassword();
-		}
-
-		$this->initialStateService->provideInitialState(
-			'settings',
-			'app_tokens',
-			$this->getAppTokens()
-		);
-
-		return new TemplateResponse('settings', 'settings/personal/security', [
-			'passwordChangeSupported' => $passwordChangeSupported,
-			'twoFactorProviderData' => $this->getTwoFactorProviderData(),
-			'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
-		]);
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'security';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	private function getTwoFactorProviderData(): array {
-		$user = $this->userSession->getUser();
-		if (is_null($user)) {
-			// Actually impossible, but still …
-			return [];
-		}
-
-		return [
-			'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
-				return [
-					'provider' => $provider,
-					'settings' => $provider->getPersonalSettings($user)
-				];
-			}, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
-				return $provider instanceof IProvidesPersonalSettings;
-			}))
-		];
-	}
-
-	private function getAppTokens(): array {
-		$tokens = $this->tokenProvider->getTokenByUser($this->uid);
-
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return [];
-		}
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-		} catch (InvalidTokenException $ex) {
-			return [];
-		}
-
-		return array_map(function (IToken $token) use ($sessionToken) {
-			$data = $token->jsonSerialize();
-			$data['canDelete'] = true;
-			$data['canRename'] = $token instanceof INamedToken;
-			if ($sessionToken->getId() === $token->getId()) {
-				$data['canDelete'] = false;
-				$data['canRename'] = false;
-				$data['current'] = true;
-			}
-			return $data;
-		}, $tokens);
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var TwoFactorManager */
+    private $twoFactorManager;
+
+    /** @var IAuthTokenProvider */
+    private $tokenProvider;
+
+    /** @var ProviderLoader */
+    private $providerLoader;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var IInitialStateService */
+    private $initialStateService;
+    /**
+     * @var string|null
+     */
+    private $uid;
+    /**
+     *@var IConfig
+     */
+    private $config;
+
+    public function __construct(IUserManager $userManager,
+                                TwoFactorManager $providerManager,
+                                IAuthTokenProvider $tokenProvider,
+                                ProviderLoader $providerLoader,
+                                IUserSession $userSession,
+                                ISession $session,
+                                IConfig $config,
+                                IInitialStateService $initialStateService,
+                                ?string $UserId) {
+        $this->userManager = $userManager;
+        $this->twoFactorManager = $providerManager;
+        $this->tokenProvider = $tokenProvider;
+        $this->providerLoader = $providerLoader;
+        $this->userSession = $userSession;
+        $this->session = $session;
+        $this->initialStateService = $initialStateService;
+        $this->uid = $UserId;
+        $this->config = $config;
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $user = $this->userManager->get($this->uid);
+        $passwordChangeSupported = false;
+        if ($user !== null) {
+            $passwordChangeSupported = $user->canChangePassword();
+        }
+
+        $this->initialStateService->provideInitialState(
+            'settings',
+            'app_tokens',
+            $this->getAppTokens()
+        );
+
+        return new TemplateResponse('settings', 'settings/personal/security', [
+            'passwordChangeSupported' => $passwordChangeSupported,
+            'twoFactorProviderData' => $this->getTwoFactorProviderData(),
+            'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
+        ]);
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'security';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    private function getTwoFactorProviderData(): array {
+        $user = $this->userSession->getUser();
+        if (is_null($user)) {
+            // Actually impossible, but still …
+            return [];
+        }
+
+        return [
+            'providers' => array_map(function (IProvidesPersonalSettings $provider) use ($user) {
+                return [
+                    'provider' => $provider,
+                    'settings' => $provider->getPersonalSettings($user)
+                ];
+            }, array_filter($this->providerLoader->getProviders($user), function (IProvider $provider) {
+                return $provider instanceof IProvidesPersonalSettings;
+            }))
+        ];
+    }
+
+    private function getAppTokens(): array {
+        $tokens = $this->tokenProvider->getTokenByUser($this->uid);
+
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return [];
+        }
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+        } catch (InvalidTokenException $ex) {
+            return [];
+        }
+
+        return array_map(function (IToken $token) use ($sessionToken) {
+            $data = $token->jsonSerialize();
+            $data['canDelete'] = true;
+            $data['canRename'] = $token instanceof INamedToken;
+            if ($sessionToken->getId() === $token->getId()) {
+                $data['canDelete'] = false;
+                $data['canRename'] = false;
+                $data['current'] = true;
+            }
+            return $data;
+        }, $tokens);
+    }
 
 }

settings/templates/settings/personal/security.php

Indentation +25 added lines, -25 removed lines

@@ -22,12 +22,12 @@ 
  */
 
 script('settings', [
-	'templates',
-	'vue-settings-personal-security',
+    'templates',
+    'vue-settings-personal-security',
 ]);
 
 if($_['passwordChangeSupported']) {
-	script('settings', 'security_password');
+    script('settings', 'security_password');
 }
 
 ?>
@@ -70,29 +70,29 @@ 
 		<li>
 			<?php
 
-			/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
-			$provider = $data['provider'];
-			//Handle 2FA provider icons and theme
-			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-				if ($_['themedark']) {
-					$icon = $provider->getLightIcon();
-				}
-				else {
-					$icon = $provider->getDarkIcon();
-				}
-				//fallback icon if the 2factor provider doesn't provide an icon.
-			} else {
-				if ($_['themedark']) {
-					$icon = image_path('core', 'actions/password-white.svg');
-				}
-				else {
-					$icon = image_path('core', 'actions/password.svg');
-				}
+            /** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
+            $provider = $data['provider'];
+            //Handle 2FA provider icons and theme
+            if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+                if ($_['themedark']) {
+                    $icon = $provider->getLightIcon();
+                }
+                else {
+                    $icon = $provider->getDarkIcon();
+                }
+                //fallback icon if the 2factor provider doesn't provide an icon.
+            } else {
+                if ($_['themedark']) {
+                    $icon = image_path('core', 'actions/password-white.svg');
+                }
+                else {
+                    $icon = image_path('core', 'actions/password.svg');
+                }
 
-			}
-			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
-			$settings = $data['settings'];
-			?>
+            }
+            /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
+            $settings = $data['settings'];
+            ?>
 			<h3>
 				<img class="two-factor-provider-settings-icon" src="<?php p($icon) ?>" alt="">
 				<?php p($provider->getDisplayName()) ?>

Braces +2 added lines, -4 removed lines

@@ -76,16 +76,14 @@
 			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
 				if ($_['themedark']) {
 					$icon = $provider->getLightIcon();
-				}
-				else {
+				} else {
 					$icon = $provider->getDarkIcon();
 				}
 				//fallback icon if the 2factor provider doesn't provide an icon.
 			} else {
 				if ($_['themedark']) {
 					$icon = image_path('core', 'actions/password-white.svg');
-				}
-				else {
+				} else {
 					$icon = image_path('core', 'actions/password.svg');
 				}