mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-20 02:00:55 +07:00
(7) fixed appendClient abort & fix restore admin
This commit is contained in:
@@ -208,7 +208,7 @@ void CoreSignalHandlers::initAdminConfigRevokedHandler()
|
|||||||
connect(m_coreController->m_installController, &InstallController::clientAppendRequested, this,
|
connect(m_coreController->m_installController, &InstallController::clientAppendRequested, this,
|
||||||
[this](const QString &serverId, const QString &clientId, const QString &clientName, DockerContainer container) {
|
[this](const QString &serverId, const QString &clientId, const QString &clientName, DockerContainer container) {
|
||||||
m_coreController->m_usersController->appendClient(serverId, clientId, clientName, container);
|
m_coreController->m_usersController->appendClient(serverId, clientId, clientName, container);
|
||||||
});
|
}, Qt::DirectConnection);
|
||||||
|
|
||||||
connect(m_coreController->m_usersController, &UsersController::adminConfigRevoked, m_coreController->m_installController,
|
connect(m_coreController->m_usersController, &UsersController::adminConfigRevoked, m_coreController->m_installController,
|
||||||
&InstallController::clearCachedProfile);
|
&InstallController::clearCachedProfile);
|
||||||
|
|||||||
@@ -758,7 +758,8 @@ ErrorCode UsersController::revokeClient(const QString &serverId, const int index
|
|||||||
ContainerConfig containerCfg = adminConfig->containerConfig(container);
|
ContainerConfig containerCfg = adminConfig->containerConfig(container);
|
||||||
QString containerClientId = containerCfg.protocolConfig.clientId();
|
QString containerClientId = containerCfg.protocolConfig.clientId();
|
||||||
|
|
||||||
if (!clientId.isEmpty() && !containerClientId.isEmpty() && containerClientId.contains(clientId)) {
|
const bool isAdminMatch = !clientId.isEmpty() && !containerClientId.isEmpty() && containerClientId.contains(clientId);
|
||||||
|
if (isAdminMatch) {
|
||||||
emit adminConfigRevoked(serverId, container);
|
emit adminConfigRevoked(serverId, container);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user