mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 2fa icons in dark theme, fix #13643 

Signed-off-by: Greta Doci <gretadoci@gmail.com>
This commit is contained in:
Greta Doci 2019-05-17 13:00:08 +02:00
parent 74ad4cce83
commit 536b4106bb
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/Settings/Personal/Security.php
View File

@ -42,6 +42,7 @@ use OCP\IUserManager;
use OCP\IUserSession; use OCP\IUserSession;
use OCP\Session\Exceptions\SessionNotAvailableException; use OCP\Session\Exceptions\SessionNotAvailableException;
use OCP\Settings\ISettings; use OCP\Settings\ISettings;
use OCP\IConfig;
class Security implements ISettings { class Security implements ISettings {
@ -69,6 +70,10 @@ class Security implements ISettings {
* @var string|null * @var string|null
*/ */
private $uid; private $uid;
/**
*@var IConfig
*/
private $config;
public function __construct(IUserManager $userManager, public function __construct(IUserManager $userManager,
TwoFactorManager $providerManager, TwoFactorManager $providerManager,
@ -76,6 +81,7 @@ class Security implements ISettings {
ProviderLoader $providerLoader, ProviderLoader $providerLoader,
IUserSession $userSession, IUserSession $userSession,
ISession $session, ISession $session,
IConfig $config,
IInitialStateService $initialStateService, IInitialStateService $initialStateService,
?string $UserId) { ?string $UserId) {
$this->userManager = $userManager; $this->userManager = $userManager;
@ -86,6 +92,7 @@ class Security implements ISettings {
$this->session = $session; $this->session = $session;
$this->initialStateService = $initialStateService; $this->initialStateService = $initialStateService;
$this->uid = $UserId; $this->uid = $UserId;
$this->config = $config;
} }
/** /**
@ -108,6 +115,7 @@ class Security implements ISettings {
return new TemplateResponse('settings', 'settings/personal/security', [ return new TemplateResponse('settings', 'settings/personal/security', [
'passwordChangeSupported' => $passwordChangeSupported, 'passwordChangeSupported' => $passwordChangeSupported,
'twoFactorProviderData' => $this->getTwoFactorProviderData(), 'twoFactorProviderData' => $this->getTwoFactorProviderData(),
'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
]); ]);
} }

18
settings/templates/settings/personal/security.php
View File

@ -69,12 +69,26 @@ if($_['passwordChangeSupported']) {
<?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?> <?php foreach ($_['twoFactorProviderData']['providers'] as $data) { ?>
<li> <li>
<?php <?php
/** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */ /** @var \OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings $provider */
$provider = $data['provider']; $provider = $data['provider'];
//Handle 2FA provider icons and theme
if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) { if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
$icon = $provider->getDarkIcon(); if ($_['themedark']) {
$icon = $provider->getLightIcon();
}
else {
$icon = $provider->getDarkIcon();
}
//fallback icon if the 2factor provider doesn't provide an icon.
} else { } else {
$icon = image_path('core', 'actions/password.svg'); if ($_['themedark']) {
$icon = image_path('core', 'actions/password-white.svg');
}
else {
$icon = image_path('core', 'actions/password.svg');
}
} }
/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */ /** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
$settings = $data['settings']; $settings = $data['settings'];