feat: 802-1x 可以修改 identity 字段

dnetwork-secret-dialog/networkdialog.cpp

@@ -90,12 +90,32 @@ bool NetworkDialog::exec(const QJsonDocument &doc)
         device = array.first().toString();
     }
     QString connName = obj.value("connId").toString();
-    if (!connName.isEmpty() && (1 == obj.value("secrets").toArray().size())) {
+    QJsonObject propsObj = obj.value("props").toObject();
+    QString password;
+    static const char* identity = "identity";
+    bool needIdentity = false;
+    int count = 0;
+    for (auto secret : obj.value("secrets").toArray()) {
+        const QString& key = secret.toString();
+        if (key == identity) {
+            needIdentity = true;
+            continue;
+        }
+        count++;
+        if (propsObj.contains(key)) {
+            password = propsObj.value(key).toString();
+        }
+    }
+    if (!connName.isEmpty() && 1 == count) {
         m_key = connName;
         QJsonObject json;
         json.insert("dev", device);
         json.insert("ssid", m_key);
         json.insert("wait", true);
+        if (needIdentity) {
+            json.insert(identity, propsObj.value(identity).toString());
+        }
+        json.insert("password", password);
         QJsonDocument doc;
         doc.setObject(json);
         m_data = "\nconnect:" + doc.toJson(QJsonDocument::Compact) + "\n";

dnetwork-secret-dialog/networksecretdialog.cpp

@@ -44,6 +44,7 @@ NetworkSecretDialog::NetworkSecretDialog(QJsonDocument jsonDoc, QWidget *parent)
               { "IPSec secret", tr("Password") },
               { "Xauth password", tr("Group Password") },
       })
+    , m_propMap({ { "identity", tr("Username") }, })
 {
     m_allInputValid = false;
 
@@ -67,6 +68,7 @@ void NetworkSecretDialog::parseJsonData(const QJsonDocument &jsonDoc)
     m_connName = m_jsonObj.value("connId").toString();
     m_connType = m_jsonObj.value("connType").toString();
     m_connSettingName = m_jsonObj.value("settingName").toString();
+    m_propsObj = m_jsonObj.value("props").toObject();
     for (auto secret : m_jsonObj.value("secrets").toArray()) {
         m_secretKeyList.append(secret.toString());
     }
@@ -107,11 +109,22 @@ void NetworkSecretDialog::initUI()
 
     for (int row = 0; row < m_secretKeyList.size(); ++row) {
         const QString &secret = m_secretKeyList.at(row);
-        DPasswordEdit *lineEdit = new DPasswordEdit();
+
+        DLineEdit *lineEdit;
+        QString label;
+        if (m_propMap.contains(secret)) {
+            lineEdit = new DLineEdit();
+            label = m_propMap.value(secret);
+        } else {
+            lineEdit = new DPasswordEdit();
+            label = m_secretKeyStrMap.value(secret);
+        }
+        if (m_propsObj.contains(secret))
+            lineEdit->setText(m_propsObj.value(secret).toString());
         lineEdit->setClearButtonEnabled(true);
         lineEdit->setCopyEnabled(false);
         lineEdit->setCutEnabled(false);
-        gridLayout->addWidget(new QLabel(m_secretKeyStrMap.value(secret) + ":"), row, 0);
+        gridLayout->addWidget(new QLabel(label + ":"), row, 0);
         gridLayout->addWidget(lineEdit, row, 1);
         m_lineEditList.append(lineEdit);
 
@@ -168,7 +181,7 @@ void NetworkSecretDialog::checkInputValid()
 
     m_lineEditList.at(0)->hideAlertMessage();
     for (int i = 0; i < m_secretKeyList.size(); ++i) {
-        DPasswordEdit * const lineEdit = m_lineEditList.at(i);
+        DLineEdit * const lineEdit = m_lineEditList.at(i);
         if (!passwordIsValid(lineEdit->text(), m_secretKeyList.at(i))) {
             allValid = false;
             lineEdit->setAlert(true);

dnetwork-secret-dialog/networksecretdialog.h

@@ -37,12 +37,14 @@ private slots:
 private:
     QJsonObject m_jsonObj;
     const QMap<QString, QString> m_secretKeyStrMap;
+    const QMap<QString, QString> m_propMap;
     QString m_connName;
     QString m_connType;
     QString m_connSettingName;
     QStringList m_secretKeyList;
+    QJsonObject m_propsObj;
 
-    QList<Dtk::Widget::DPasswordEdit *> m_lineEditList;
+    QList<Dtk::Widget::DLineEdit *> m_lineEditList;
 
     bool m_allInputValid;
 };