fix: optimize the logic for opening the authentication web page

ut003640 · deepin-bot[bot] · commit d4ca3f4d4b5f · 2026-04-02T11:36:19.000Z
1.Since deepin-service-manager does not exit after the current user logs out, logic for monitoring desktop entry and desktop exit has been added. The presence of the portal web page is checked only after entering the desktop, by detecting whether the SessionManager service is started. This ensures that the web page is always opened after the desktop session is ready.
2.When assigning a value to the portal, logic has been added to compare the current network with the last network. This allows the portal address to be updated immediately when switching networks rapidly.
Log: Optimize the logic for opening the authentication web page

Influence: portal web page
PMS: TASK-360019

fix: 优化打开认证网页逻辑

1、由于deepin-service-manager在注销当前用户后不会退出，所以增加监视进入桌面和退出桌面的逻辑，在进入桌面后再检测是否存在portal网页，使用检测SessionManager服务是否启动的方式来判断，这样保证了打开网页始终在进入桌面后进行
2、在给portal赋值的情况下，增加判断当前网络和最后一次网络是否相同的逻辑，这样在快速切换网络的时候，portal地址会马上更新

Log: 优化打开认证网页逻辑
Influence: portal网页
diff --git a/network-service-plugin/src/session/desktopmonitor.cpp b/network-service-plugin/src/session/desktopmonitor.cpp
@@ -0,0 +1,142 @@
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#include "desktopmonitor.h"
+#include "constants.h"
+
+#include <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusServiceWatcher>
+#include <QDBusConnectionInterface>
+#include <QTimer>
+
+using namespace network::sessionservice;
+
+#define SESSION_MANAG_SERVICE "com.deepin.SessionManager"
+
+DesktopMonitor::DesktopMonitor(QObject *parent)
+    : QObject (parent)
+    , m_prepare(false)
+    , m_checkFinished(false)
+    , m_timer(nullptr)
+{
+    init();
+}
+
+bool DesktopMonitor::prepared() const
+{
+    return m_prepare && (!m_displayEnvironment.isEmpty() || m_checkFinished);
+}
+
+QString DesktopMonitor::displayEnvironment() const
+{
+    return m_displayEnvironment;
+}
+
+void DesktopMonitor::init()
+{
+    m_prepare = QDBusConnection::sessionBus().interface()->isServiceRegistered(SESSION_MANAG_SERVICE);
+    qCDebug(DSM) << SESSION_MANAG_SERVICE << " prepare status" << m_prepare;
+    if (m_prepare) {
+        m_displayEnvironment = getDisplayEnvironment();
+        qCDebug(DSM) << "get display environment" << m_displayEnvironment;
+        if (m_displayEnvironment.isEmpty()) {
+            m_timer = new QTimer(this);
+            m_timer->setInterval(1000);
+            m_timer->setProperty("checktime", 0);
+            connect(m_timer, &QTimer::timeout, this, &DesktopMonitor::onCheckTimeout);
+            m_timer->start();
+        }
+    }
+
+    // 就算注销当前用户后，deepin-service-manager服务也不会退出，所以这里需要监控该服务的退出和启动的状态
+    QDBusServiceWatcher *serviceWatcher = new QDBusServiceWatcher(this);
+    serviceWatcher->setConnection(QDBusConnection::sessionBus());
+    serviceWatcher->addWatchedService(SESSION_MANAG_SERVICE);
+    connect(serviceWatcher, &QDBusServiceWatcher::serviceRegistered, this, &DesktopMonitor::onServiceRegistered);
+    QDBusConnection::sessionBus().connect("com.deepin.SessionManager", "/com/deepin/SessionManager", "com.deepin.SessionManager",
+                                          "PrepareLogout", this, SLOT(onPrepareLogout()));
+}
+
+QString DesktopMonitor::getDisplayEnvironment() const
+{
+    QString displayenv = qgetenv("DISPLAY");
+    if (!displayenv.isEmpty()) {
+        qCDebug(DSM) << "get DISPLAY Environment from local env";
+        return displayenv;
+    }
+
+    qCDebug(DSM) << "get DISPLAY Environment from systemd1 service";
+    // 有时候获取到的环境变量为空，此时就需要从systemd接口中来获取环境变量了
+    QDBusInterface systemdInterface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager");
+    QStringList environments = systemdInterface.property("Environment").toStringList();
+    for (const QString &env : environments) {
+        QStringList envArray = env.split("=");
+        if (envArray.size() < 2)
+            continue;
+        if (envArray.first() == "DISPLAY")
+            return envArray[1];
+    }
+
+    return QString();
+}
+
+void DesktopMonitor::checkFinished()
+{
+    m_checkFinished = true;
+    m_timer->stop();
+    m_timer->deleteLater();
+    m_timer = nullptr;
+    if (prepared()) {
+        qCDebug(DSM) << "display environment check finished";
+        emit desktopChanged(true);
+    }
+}
+
+void DesktopMonitor::onCheckTimeout()
+{
+    m_displayEnvironment = getDisplayEnvironment();
+    if (m_displayEnvironment.isEmpty()) {
+        // 连接检测20次，如果20次还是没有这个环境变量，就说明这个环境变量有问题，直接尝试打开
+        int checktime = m_timer->property("checktime").toInt();
+        qCDebug(DSM) << "in " << checktime << "times, the display environment is empty";
+        if (checktime >= 20) {
+            checkFinished();
+        } else {
+            checktime++;
+            m_timer->setProperty("checktime", checktime);
+        }
+    } else {
+        qCDebug(DSM) << "the display environment is not empty" << m_displayEnvironment;
+        checkFinished();
+    }
+}
+
+void DesktopMonitor::onServiceRegistered(const QString &service)
+{
+    if (service != SESSION_MANAG_SERVICE)
+        return;
+
+    if (m_prepare && !m_displayEnvironment.isEmpty()) {
+        // 如果之前是已经准备好的，无需再次发送信号，这种情况一般发生在kill掉startdde进程或者重启SessionManager服务
+        qCDebug(DSM) << "the prepare is true";
+        return;
+    }
+
+    m_prepare = true;
+    m_displayEnvironment = getDisplayEnvironment();
+    qCInfo(DSM) << SESSION_MANAG_SERVICE << "start success, display envionment:" << m_displayEnvironment;
+    if (prepared()) {
+        qCDebug(DSM) << "desktop prepared";
+        emit desktopChanged(true);
+    }
+}
+
+void DesktopMonitor::onPrepareLogout()
+{
+    // 注销当前账户
+    m_prepare = false;
+    qCDebug(DSM) << "current user is logout";
+    emit desktopChanged(false);
+}
diff --git a/network-service-plugin/src/session/desktopmonitor.h b/network-service-plugin/src/session/desktopmonitor.h
@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+#ifndef DESKTOPMONITOR_H
+#define DESKTOPMONITOR_H
+
+#include <QObject>
+
+class QTimer;
+
+namespace network {
+namespace sessionservice {
+/**
+ * @brief The StartMonitor class
+ * 用于监控环境是否准备好，桌面环境准备好了，才能进行下一步的动作
+ */
+class DesktopMonitor : public QObject
+{
+    Q_OBJECT
+
+public:
+    DesktopMonitor(QObject *parent = Q_NULLPTR);
+    ~DesktopMonitor() = default;
+    bool prepared() const;               // 环境是否准备好
+    QString displayEnvironment() const;  // DISPLAY环境变量
+
+signals:
+    void desktopChanged(bool);           // 桌面环境变化发出的信号,true为进入桌面后并且环境准备好了，false为注销当前环境
+
+private:
+    void init();
+    QString getDisplayEnvironment() const;
+    void checkFinished();
+
+private slots:
+    void onCheckTimeout();
+    void onServiceRegistered(const QString &service);
+    void onPrepareLogout();
+
+private:
+    bool m_prepare;
+    bool m_checkFinished;
+    QString m_displayEnvironment;
+    QTimer *m_timer;
+};
+
+}
+}
+
+#endif
diff --git a/network-service-plugin/src/session/sessioncontainer.cpp b/network-service-plugin/src/session/sessioncontainer.cpp
@@ -5,10 +5,12 @@
 #include "sessioncontainer.h"
 #include "sessionipconfilct.h"
 #include "constants.h"
-#include "urlopenerhelper.h"
+#include "desktopmonitor.h"
 
 #include <QDBusConnection>
 #include <QDBusInterface>
+#include <QProcessEnvironment>
+#include <QProcess>
 
 using namespace network::sessionservice;
 
@@ -19,9 +21,10 @@ static QString networkInterface = "org.deepin.service.SystemNetwork";
 SessionContainer::SessionContainer(QObject *parent)
     : QObject (parent)
     , m_ipConflictHandler(new SessionIPConflict(this))
+    , m_desktopMonitor(new DesktopMonitor(this))
 {
-    initMember();
     initConnection();
+    initEnvornment();
 }
 
 SessionContainer::~SessionContainer()
@@ -39,9 +42,10 @@ void SessionContainer::initConnection()
     QDBusConnection::systemBus().connect(networkService, networkPath, networkInterface, "PortalDetected", this, SLOT(onPortalDetected(const QString &)));
     // 当系统代理发生变化的时候需要主动调用SystemNetwork服务的检查网络连通性的接口
     QDBusConnection::sessionBus().connect("org.deepin.dde.Network1", "/org/deepin/dde/Network1", "org.deepin.dde.Network1", "ProxyMethodChanged", this, SLOT(onProxyMethodChanged(const QString &)));
+    connect(m_desktopMonitor, &DesktopMonitor::desktopChanged, this, &SessionContainer::onDesktopChanged);
 }
 
-void SessionContainer::initMember()
+void SessionContainer::checkPortalUrl()
 {
     // 检测初始化的状态是否为门户认证，这种情况下需要先打开Url
     QDBusInterface dbusInter("org.deepin.service.SystemNetwork", "/org/deepin/service/SystemNetwork", "org.deepin.service.SystemNetwork", QDBusConnection::systemBus());
@@ -50,19 +54,59 @@ void SessionContainer::initMember()
         // 获取需要认证的网站的信息，并打开网页
         QString url = dbusInter.property("PortalUrl").toString();
         qCDebug(DSM) << "check portal url:" << url;
-        onPortalDetected(url);
+        openPortalUrl(url);
     }
 }
 
+void SessionContainer::initEnvornment()
+{
+    if (m_desktopMonitor->prepared())
+        enterDesktop();
+}
+
+void SessionContainer::enterDesktop()
+{
+    qCInfo(DSM) << "enter desktop";
+    // 进入桌面，检查本地portal连接
+    checkPortalUrl();
+}
+
+void SessionContainer::leaveDesktop()
+{
+    qCInfo(DSM) << "leave desktop";
+    // TODO: 注销后离开桌面
+}
+
+void SessionContainer::openPortalUrl(const QString &url)
+{
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+    QString displayEnvironment = m_desktopMonitor->displayEnvironment();
+    if (!displayEnvironment.isEmpty())
+        env.insert("DISPLAY", displayEnvironment);
+
+    QProcess process;
+    process.setProcessEnvironment(env);
+    process.start("xdg-open", QStringList() << url);
+    process.waitForFinished();
+}
+
 void SessionContainer::onIPConflictChanged(const QString &devicePath, const QString &ip, bool conflicted)
 {
     // TODO: 这里用于处理IP冲突，例如检测到IP冲突后，会给出提示的消息，等后期将任务栏种的相关处理删除后，再到这里来处理，目前此处暂时保留
+    Q_UNUSED(devicePath)
+    Q_UNUSED(ip)
+    Q_UNUSED(conflicted)
 }
 
 void SessionContainer::onPortalDetected(const QString &url)
 {
+    if (!m_desktopMonitor->prepared()) {
+        qCWarning(DSM) << "desktop is not login in";
+        return;
+    }
+
     qCDebug(DSM) << "detacted portal url" << url;
-    UrlOpenerHelper::openUrl(url);
+    openPortalUrl(url);
 }
 
 void SessionContainer::onProxyMethodChanged(const QString &method)
@@ -73,3 +117,8 @@ void SessionContainer::onProxyMethodChanged(const QString &method)
     QDBusPendingCall callReply = dbusInter.asyncCall("CheckConnectivity");
     callReply.waitForFinished();
 }
+
+void SessionContainer::onDesktopChanged(bool isLogin)
+{
+    isLogin ? enterDesktop() : leaveDesktop();
+}
diff --git a/network-service-plugin/src/session/sessioncontainer.h b/network-service-plugin/src/session/sessioncontainer.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -11,6 +11,7 @@ namespace network {
 namespace sessionservice {
 
 class SessionIPConflict;
+class DesktopMonitor;
 
 class SessionContainer : public QObject
 {
@@ -23,15 +24,21 @@ class SessionContainer : public QObject
 
 private:
     void initConnection();
-    void initMember();
+    void initEnvornment();
+    void checkPortalUrl();
+    void enterDesktop();
+    void leaveDesktop();
+    void openPortalUrl(const QString &url);
 
 private slots:
     void onIPConflictChanged(const QString &devicePath, const QString &ip, bool conflicted);
     void onPortalDetected(const QString &url);
     void onProxyMethodChanged(const QString &method);
+    void onDesktopChanged(bool isLogin);
 
 private:
     SessionIPConflict *m_ipConflictHandler;
+    DesktopMonitor *m_desktopMonitor;
 };
 
 }
diff --git a/network-service-plugin/src/session/urlopenerhelper.cpp b/network-service-plugin/src/session/urlopenerhelper.cpp
diff --git a/network-service-plugin/src/session/urlopenerhelper.h b/network-service-plugin/src/session/urlopenerhelper.h
