feat: add portal authentication prompt to taskbar

according to user feedback, the direct web page opening method affects the experience. Changed to a prompt method; users click the prompt to open the web page automatically.

Log: optimize portal authentication policy
Influence: portal prompt method
PMS: TASK-36815

feat: 任务栏增加portal认证提示

根据客户的反馈，直接打开网页的方式影响体验，修改为提示的方式，用户点击提示自动打开网页

Log: portal认证策略优化
Influence: portal提示方式

Author: ut003640

config/org.deepin.dde.network.json

@@ -108,8 +108,8 @@
             "permissions":"readwrite",
             "visibility":"private"
          },
-         "enableOpenPortal":{
-            "value": true,
+         "portalProcessMode":{
+            "value": "promp",
             "serial": 0,
             "flags": [
                 "global"

net-view/operation/netitem.cpp

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -88,6 +88,7 @@ GETFUN(int, NetDeviceItem, pathIndex)
 GETFUN(const QString &, NetTipsItem, linkActivatedText)
 GETFUN(bool, NetTipsItem, tipsLinkEnabled)
 // 有线设备
+GETFUN(const QString &, NetWiredItem, portalUrl)
 
 // 无线设备
 GETFUN(bool, NetWirelessDeviceItem, apMode)
@@ -110,6 +111,7 @@ GETFUN(int, NetWirelessItem, strength)
 GETFUN(int, NetWirelessItem, strengthLevel)
 GETFUN(bool, NetWirelessItem, isSecure)
 GETFUN(bool, NetWirelessItem, hasConnection)
+GETFUN(const QString &, NetWirelessItem, portalUrl)
 
 QString NetWiredControlItem::name() const
 {

net-view/operation/netitem.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -204,8 +204,13 @@ class NetConnectionItem : public NetItem
 class NetWiredItem : public NetConnectionItem
 {
     Q_OBJECT
+public:
+    const QString & portalUrl() const;
 protected:
     using NetConnectionItem::NetConnectionItem;
+
+Q_SIGNALS:
+    void portalUrlChanged(const QString &url);
 };
 
 class NetWiredDisabledItem : public NetItem
@@ -234,20 +239,23 @@ class NetWirelessItem : public NetConnectionItem
     Q_PROPERTY(int strengthLevel READ strengthLevel NOTIFY strengthLevelChanged)
     Q_PROPERTY(bool secure READ isSecure NOTIFY secureChanged)
     Q_PROPERTY(bool hasConnection READ hasConnection NOTIFY hasConnectionChanged)
+    Q_PROPERTY(QString portalUrl READ portalUrl NOTIFY portalUrlChanged)
 
 public:
     uint flags() const;
     int strength() const;
     int strengthLevel() const;
     bool isSecure() const;
     bool hasConnection() const;
+    const QString & portalUrl() const;
 
 Q_SIGNALS:
     void flagsChanged(uint flags);
     void strengthChanged(int strength);
     void strengthLevelChanged(int strengthLevel);
     void secureChanged(bool secure);
     void hasConnectionChanged(bool hasConnection);
+    void portalUrlChanged(const QString &url);
 
 protected:
     using NetConnectionItem::NetConnectionItem;

net-view/operation/netmanager.cpp

@@ -68,6 +68,12 @@ void NetManager::setEnabled(bool enabled)
     d->setEnabled(enabled);
 }
 
+NetType::NetManagerFlags NetManager::flags() const
+{
+    Q_D(const NetManager);
+    return d->flags();
+}
+
 NetItem *NetManager::root() const
 {
     Q_D(const NetManager);
@@ -273,6 +279,11 @@ void NetManagerPrivate::init(NetType::NetManagerFlags flags)
     }
 }
 
+NetType::NetManagerFlags NetManagerPrivate::flags() const
+{
+    return m_managerThread->flags();
+}
+
 bool NetManagerPrivate::netCheckAvailable()
 {
     return m_managerThread->NetCheckAvailable();
@@ -545,7 +556,13 @@ void NetManagerPrivate::onItemRemoved(const QString &id)
 void NetManagerPrivate::onDataChanged(int dataType, const QString &id, const QVariant &value)
 {
     switch (dataType) {
+    case NetManagerThreadPrivate::portalUrlChanged: {
+        updatePortalUrl(id, value.toString());
+        m_lastShowPortalItemId = id;
+    } break;
     case NetManagerThreadPrivate::primaryConnectionTypeChanged: {
+        // 在主链接发生变化之前，清空之前连接的portal的连接
+        updatePortalUrl(m_lastShowPortalItemId, "");
         updatePrimaryConnectionType(NetManager::ConnectionType(value.toInt()));
     } break;
     case NetManagerThreadPrivate::AirplaneModeEnabledChanged: {
@@ -1035,6 +1052,27 @@ void NetManagerPrivate::updatePrimaryConnectionType(NetManager::ConnectionType t
     // }
 }
 
+void NetManagerPrivate::updatePortalUrl(const QString &id, const QString &url)
+{
+    NetItemPrivate *item = findItem(id);
+    if (!item)
+        return;
+
+    switch (item->itemType()) {
+    case NetType::WiredItem: {
+        // 有线网络
+        NetWiredItemPrivate *wiredItem = NetItemPrivate::toItem<NetWiredItemPrivate>(item);
+        wiredItem->updateportalUrl(url);
+    } break;
+    case NetType::WirelessItem: {
+        // 无线网络
+        NetWirelessItemPrivate *wirelessItem = NetItemPrivate::toItem<NetWirelessItemPrivate>(item);
+        wirelessItem->updateportalUrl(url);
+    } break;
+    default: break;
+    }
+}
+
 void NetManagerPrivate::addItem(NetItemPrivate *item, NetItemPrivate *parentItem)
 {
     NetItemPrivate *oldItem = findItem(item->id());

net-view/operation/netmanager.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -34,6 +34,7 @@ class NetManager : public QObject
     void setAutoScanInterval(int ms);      // 设置自动扫描无线网间隔，0为不扫描
     void setAutoScanEnabled(bool enabled); // 设置自动扫描，网络面板关闭时禁用
     void setEnabled(bool enabled);         // 禁用时不发通知，不请求交互
+    NetType::NetManagerFlags flags() const;
 
     // const bool isGreeterMode() const;
     NetItem *root() const;

net-view/operation/private/netitemprivate.cpp

@@ -244,6 +244,8 @@ NetConnectionItemPrivate::NetConnectionItemPrivate()
 }
 // 有线连接
 GETFUN(NetType::NetItemType, NetWiredItem, itemType, NetType::NetItemType::WiredItem)
+GETFUN(const QString &, NetWiredItem, portalUrl, m_portalUrl)
+UPDATEFUN(NetWiredItem, const QString &, portalUrl)
 // 我的网络
 GETFUN(NetType::NetItemType, NetWirelessMineItem, itemType, NetType::NetItemType::WirelessMineItem)
 // 其他网络
@@ -270,6 +272,8 @@ UPDATEFUN(NetWirelessItem, uint, flags)
 // UPDATEFUN(NetWirelessItem, int, strength)
 UPDATEFUN(NetWirelessItem, bool, secure)
 UPDATEFUN(NetWirelessItem, bool, hasConnection)
+GETFUN(const QString &, NetWirelessItem, portalUrl, m_portalUrl)
+UPDATEFUN(NetWirelessItem, const QString &, portalUrl)
 
 void NetWirelessItemPrivate::updatestrength(int strength)
 {

net-view/operation/private/netitemprivate.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -170,9 +170,14 @@ class NetWiredItemPrivate : public NetConnectionItemPrivate
 {
 public:
     NetType::NetItemType itemType() const override;
+    const QString & portalUrl() const;
+    void updateportalUrl(const QString &url);
 
 protected:
     using NetConnectionItemPrivate::NetConnectionItemPrivate;
+
+private:
+    QString m_portalUrl;
 };
 
 class NetWirelessMineItemPrivate : public NetItemPrivate
@@ -223,6 +228,8 @@ class NetWirelessItemPrivate : public NetConnectionItemPrivate
     void updatestrength(int strength);
     void updatesecure(bool secure);
     void updatehasConnection(bool hasConnection);
+    const QString & portalUrl() const;
+    void updateportalUrl(const QString &url);
 
 protected:
     explicit NetWirelessItemPrivate();
@@ -233,6 +240,7 @@ class NetWirelessItemPrivate : public NetConnectionItemPrivate
     int m_strengthLevel;
     bool m_secure;
     bool m_hasConnection;
+    QString m_portalUrl;
 
     friend class NetItemPrivate;
 };

net-view/operation/private/netmanager_p.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2018 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2018 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -38,6 +38,7 @@ class NetManagerPrivate : public QObject
     void setEnabled(bool enabled);
     void setServerKey(const QString &serverKey);
     void init(NetType::NetManagerFlags flags);
+    NetType::NetManagerFlags flags() const;
     bool netCheckAvailable();
     QString wpaEapAuthen() const;     // 企业网EAP认证方式
     QString wpaEapAuthmethod() const; // 企业网内部认证方式
@@ -71,6 +72,7 @@ protected Q_SLOTS:
     void updateControlEnabled(int type);
     void updateAirplaneMode(bool enabled);
     void updatePrimaryConnectionType(NetManager::ConnectionType type);
+    void updatePortalUrl(const QString &id, const QString &url);
 
     void addItem(NetItemPrivate *item, NetItemPrivate *parentItem = nullptr);
     void removeItem(NetItemPrivate *item);
@@ -91,6 +93,7 @@ protected Q_SLOTS:
     QMap<QString, NetItemPrivate *> m_dataMap;
     PasswordRequest *m_passwordRequestData;
     QString m_showInputId;
+    QString m_lastShowPortalItemId;
 
     int m_deviceCount[DeviceItemCount];
     bool m_supportWireless;

net-view/operation/private/netmanagerthreadprivate.cpp

@@ -214,6 +214,11 @@ void NetManagerThreadPrivate::init(NetType::NetManagerFlags flags)
     QMetaObject::invokeMethod(this, &NetManagerThreadPrivate::doInit, Qt::QueuedConnection);
 }
 
+NetType::NetManagerFlags NetManagerThreadPrivate::flags() const
+{
+    return m_flags;
+}
+
 QString NetManagerThreadPrivate::wpaEapAuthen() const
 {
     return ConfigSetting::instance()->wpaEapAuthen();
@@ -500,6 +505,17 @@ void NetManagerThreadPrivate::doInit()
     QDBusConnection::systemBus().connect("com.deepin.defender.netcheck", "/com/deepin/defender/netcheck", "org.freedesktop.DBus.Properties", "PropertiesChanged", this, SLOT(onNetCheckPropertiesChanged(QString, QVariantMap, QStringList)));
     QDBusConnection::systemBus().connect("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "PrepareForSleep", this, SLOT(onPrepareForSleep(bool)));
 
+
+    // 只有配置为promp和openandpromp的情况下，才会给出提示
+    if (ConfigSetting::instance()->supportPortalPromp()) {
+        QDBusConnection::systemBus().connect("org.deepin.dde.Network1",
+                                             "/org/deepin/service/SystemNetwork",
+                                             "org.deepin.service.SystemNetwork",
+                                             "PortalDetected",
+                                             this,
+                                             SLOT(onPortalDetected(const QString &)));
+    }
+
     // 优先网络
     auto updadePrimaryConnectionType = [this] {
         Q_EMIT dataChanged(DataChanged::primaryConnectionTypeChanged, "", NetworkManager::primaryConnectionType());
@@ -1948,6 +1964,8 @@ void NetManagerThreadPrivate::onDeviceAdded(QList<NetworkDeviceBase *> devices)
     }
     updateDSLEnabledable();
     updateSupportWireless();
+
+    checkPoratal();
 }
 
 void NetManagerThreadPrivate::onDeviceRemoved(QList<NetworkDeviceBase *> devices)
@@ -1989,6 +2007,7 @@ void NetManagerThreadPrivate::onConnectionAdded(const QList<WiredConnection *> &
     if (!dev)
         return;
     addConnection(dev, conns);
+    checkPoratal();
 }
 
 void NetManagerThreadPrivate::onConnectionRemoved(const QList<WiredConnection *> &conns)
@@ -2908,6 +2927,62 @@ void NetManagerThreadPrivate::onPrepareForSleep(bool state)
     m_isSleeping = state;
 }
 
+void NetManagerThreadPrivate::onPortalDetected(const QString &portalUrl)
+{
+    NetworkManager::ActiveConnection::Ptr primaryActiveConnection = NetworkManager::primaryConnection();
+    if (primaryActiveConnection.isNull())
+        return;
+
+    dde::network::NetworkDeviceBase *networkDevice = nullptr;
+    NetworkManager::Connection::Ptr primaryConnection = primaryActiveConnection->connection();
+    for (const NetworkManager::Device::Ptr &device : NetworkManager::networkInterfaces()) {
+        NetworkManager::ActiveConnection::Ptr deviceActiveConnection = device->activeConnection();
+        if (deviceActiveConnection.isNull())
+            continue;
+        if (deviceActiveConnection->connection() == primaryConnection) {
+            QList<NetworkDeviceBase *> devices = dde::network::NetworkController::instance()->devices();
+            for (NetworkDeviceBase *dev : devices) {
+                if (dev->path() == device->uni()) {
+                    networkDevice = dev;
+                    break;
+                }
+            }
+            if (networkDevice)
+                break;
+        }
+    }
+    if (!networkDevice) {
+        qCWarning(DNC) << "can't found the device,connection" << primaryConnection->name();
+        return;
+    }
+    qCDebug(DNC) << "portal changed:" << portalUrl << "device" << networkDevice->interface();
+    if (networkDevice->deviceType() == dde::network::DeviceType::Wired) {
+        // 找到有线网络对应的那个连接
+        NetworkManager::WiredSetting::Ptr wiredSetting = primaryConnection->settings()->setting(NetworkManager::Setting::Wired).dynamicCast<NetworkManager::WiredSetting>();
+        if (!wiredSetting)
+            return;
+
+        // 找到有线连接对应的连接
+        dde::network::WiredDevice *wiredDevice = static_cast<dde::network::WiredDevice *>(networkDevice);
+        Q_EMIT dataChanged(DataChanged::portalUrlChanged, QString("%1:%2").arg(wiredDevice->path()).arg(primaryConnection->path()), portalUrl);
+    } else if (networkDevice->deviceType() == dde::network::DeviceType::Wireless) {
+        // 找到无线设备对应的那个无线网络
+        NetworkManager::WirelessSetting::Ptr wirelessSetting = primaryConnection->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
+        if (!wirelessSetting)
+            return;
+
+        dde::network::WirelessDevice *wirelessDevice = static_cast<dde::network::WirelessDevice *>(networkDevice);
+        // 找到无线连接对应那个网络
+        for (dde::network::AccessPoints *ap : wirelessDevice->accessPointItems()) {
+            if (ap->ssid() != wirelessSetting->ssid())
+                continue;
+
+            Q_EMIT dataChanged(DataChanged::portalUrlChanged, apID(ap), portalUrl);
+            break;
+        }
+    }
+}
+
 void NetManagerThreadPrivate::addDevice(NetDeviceItemPrivate *deviceItem, NetworkDeviceBase *dev)
 {
     deviceItem->updatepathIndex(dev->path().mid(dev->path().lastIndexOf('/') + 1).toInt());
@@ -3143,5 +3218,16 @@ NetType::NetDeviceStatus NetManagerThreadPrivate::deviceStatus(NetworkDeviceBase
     return NetType::NetDeviceStatus::DS_Unknown;
 }
 
+void NetManagerThreadPrivate::checkPoratal()
+{
+    // 只有配置为promp和openandpromp的情况下，才会给出提示
+    if (!ConfigSetting::instance()->supportPortalPromp())
+        return;
+
+    // 获取portal网页
+    QDBusInterface dbusInter("org.deepin.dde.Network1", "/org/deepin/service/SystemNetwork", "org.deepin.service.SystemNetwork", QDBusConnection::systemBus());
+    onPortalDetected(dbusInter.property("PortalUrl").toString());
+}
+
 } // namespace network
 } // namespace dde