andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: rename/revoke user while in search on share page (#1787)

Browse Source 
* fix: revoke user config

* fix: user renaming

* fix: revoke signal

* some fixes

* remaded fix
This commit is contained in:
MrMirDan
2025-09-03 06:56:08 +03:00
committed by GitHub
parent 17d2fa5532
commit ec60764072
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/exportController.cpp
+2 -1
View File
@@ -297,10 +297,11 @@ void ExportController::revokeConfig(const int row, const DockerContainer contain
{ {
QSharedPointer<ServerController> serverController(new ServerController(m_settings)); QSharedPointer<ServerController> serverController(new ServerController(m_settings));
ErrorCode errorCode = ErrorCode errorCode =
m_clientManagementModel->revokeClient(row, container, credentials, m_serversModel->getProcessedServerIndex(), serverController); m_clientManagementModel->revokeClient(row, container, credentials, m_serversModel->getProcessedServerIndex(), serverController);
if (errorCode != ErrorCode::NoError) { if (errorCode != ErrorCode::NoError) {
emit exportErrorOccurred(errorCode); emit exportErrorOccurred(errorCode);
} }
emit revokeConfigCompleted();
} }
void ExportController::renameClient(const int row, const QString &clientName, const DockerContainer container, ServerCredentials credentials) void ExportController::renameClient(const int row, const QString &clientName, const DockerContainer container, ServerCredentials credentials)
client/ui/controllers/exportController.h
+1
View File
@@ -42,6 +42,7 @@ public slots:
signals: signals:
void generateConfig(int type); void generateConfig(int type);
void revokeConfigCompleted();
void exportErrorOccurred(const QString &errorMessage); void exportErrorOccurred(const QString &errorMessage);
void exportErrorOccurred(ErrorCode errorCode); void exportErrorOccurred(ErrorCode errorCode);
client/ui/models/clientManagementModel.cpp
+4 -2
View File
@@ -497,7 +497,8 @@ ErrorCode ClientManagementModel::appendClient(const QString &clientId, const QSt
return error; return error;
} }
ErrorCode ClientManagementModel::renameClient(const int row, const QString &clientName, const DockerContainer container, ErrorCode ClientManagementModel::renameClient(const int row, const QString &clientName,
const DockerContainer container,
const ServerCredentials &credentials, const ServerCredentials &credentials,
const QSharedPointer<ServerController> &serverController, bool addTimeStamp) const QSharedPointer<ServerController> &serverController, bool addTimeStamp)
{ {
@@ -529,7 +530,8 @@ ErrorCode ClientManagementModel::renameClient(const int row, const QString &clie
return error; return error;
} }
ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContainer container, const ServerCredentials &credentials, ErrorCode ClientManagementModel::revokeClient(const int row, const DockerContainer container,
const ServerCredentials &credentials,
const int serverIndex, const QSharedPointer<ServerController> &serverController) const int serverIndex, const QSharedPointer<ServerController> &serverController)
{ {
ErrorCode errorCode = ErrorCode::NoError; ErrorCode errorCode = ErrorCode::NoError;
client/ui/models/clientManagementModel.h
+6 -4
View File
@@ -44,10 +44,10 @@ public slots:
const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController); const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController);
ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container, ErrorCode appendClient(const QString &clientId, const QString &clientName, const DockerContainer container,
const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController); const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController);
ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container, const ServerCredentials &credentials, ErrorCode renameClient(const int row, const QString &userName, const DockerContainer container,
const QSharedPointer<ServerController> &serverController, bool addTimeStamp = false); const ServerCredentials &credentials, const QSharedPointer<ServerController> &serverController, bool addTimeStamp = false);
ErrorCode revokeClient(const int index, const DockerContainer container, const ServerCredentials &credentials, const int serverIndex, ErrorCode revokeClient(const int index, const DockerContainer container, const ServerCredentials &credentials,
const QSharedPointer<ServerController> &serverController); const int serverIndex, const QSharedPointer<ServerController> &serverController);
ErrorCode revokeClient(const QJsonObject &containerConfig, const DockerContainer container, const ServerCredentials &credentials, ErrorCode revokeClient(const QJsonObject &containerConfig, const DockerContainer container, const ServerCredentials &credentials,
const int serverIndex, const QSharedPointer<ServerController> &serverController); const int serverIndex, const QSharedPointer<ServerController> &serverController);
@@ -60,6 +60,8 @@ signals:
private: private:
bool isClientExists(const QString &clientId); bool isClientExists(const QString &clientId);
int clientIndexById(const QString &clientId);
void migration(const QByteArray &clientsTableString); void migration(const QByteArray &clientsTableString);
ErrorCode revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials, const int serverIndex, ErrorCode revokeOpenVpn(const int row, const DockerContainer container, const ServerCredentials &credentials, const int serverIndex,
client/ui/qml/Pages2/PageShare.qml
+10 -12
View File
@@ -29,19 +29,14 @@ PageType {
Xray Xray
} }
signal revokeConfig(int index)
onRevokeConfig: function(index) {
PageController.showBusyIndicator(true)
ExportController.revokeConfig(index,
ContainersModel.getProcessedContainerIndex(),
ServersModel.getProcessedServerCredentials())
PageController.showBusyIndicator(false)
PageController.showNotificationMessage(qsTr("Config revoked"))
}
Connections { Connections {
target: ExportController target: ExportController
function onRevokeConfigCompleted() {
PageController.showBusyIndicator(false)
PageController.showNotificationMessage(qsTr("Config revoked"))
}
function onGenerateConfig(type) { function onGenerateConfig(type) {
PageController.showBusyIndicator(true) PageController.showBusyIndicator(true)
@@ -797,7 +792,7 @@ PageType {
if (clientNameEditor.textField.text !== clientName) { if (clientNameEditor.textField.text !== clientName) {
PageController.showBusyIndicator(true) PageController.showBusyIndicator(true)
ExportController.renameClient(index, ExportController.renameClient(proxyClientManagementModel.mapToSource(index),
clientNameEditor.textField.text, clientNameEditor.textField.text,
ContainersModel.getProcessedContainerIndex(), ContainersModel.getProcessedContainerIndex(),
ServersModel.getProcessedServerCredentials()) ServersModel.getProcessedServerCredentials())
@@ -832,7 +827,10 @@ PageType {
var yesButtonFunction = function() { var yesButtonFunction = function() {
clientInfoDrawer.closeTriggered() clientInfoDrawer.closeTriggered()
root.revokeConfig(index) PageController.showBusyIndicator(true)
ExportController.revokeConfig(proxyClientManagementModel.mapToSource(index),
ContainersModel.getProcessedContainerIndex(),
ServersModel.getProcessedServerCredentials())
} }
var noButtonFunction = function() { var noButtonFunction = function() {
} }