129 lines
5.6 KiB
Diff
129 lines
5.6 KiB
Diff
From 5d3070ff4a72ef31c364fec618e5277287191842 Mon Sep 17 00:00:00 2001
|
|
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|
Date: Tue, 30 May 2023 11:09:17 +0800
|
|
Subject: [PATCH 2/3] refactor(kiran auth): Update the DBus invocation method
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 更新Kiran认证服务 DBus调用方法
|
|
---
|
|
.../com.kylinsec.Kiran.Authentication.xml | 66 +++++++++----------
|
|
.../src/utils/kiran-auth-dbus-proxy.cpp | 2 +-
|
|
2 files changed, 34 insertions(+), 34 deletions(-)
|
|
|
|
diff --git a/plugins/authentication/data/com.kylinsec.Kiran.Authentication.xml b/plugins/authentication/data/com.kylinsec.Kiran.Authentication.xml
|
|
index 026c4fa..12b077f 100644
|
|
--- a/plugins/authentication/data/com.kylinsec.Kiran.Authentication.xml
|
|
+++ b/plugins/authentication/data/com.kylinsec.Kiran.Authentication.xml
|
|
@@ -51,7 +51,7 @@
|
|
</arg>
|
|
</method>
|
|
|
|
- <method name="SetDrivereEanbled">
|
|
+ <method name="SetDrivereEnabled">
|
|
<arg name="driver_name" direction="in" type="s">
|
|
<description>driver name</description>
|
|
</arg>
|
|
@@ -74,7 +74,7 @@
|
|
<description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
</arg>
|
|
<arg name="device_id" direction="in" type="s">
|
|
- <description>The device ID.</description>
|
|
+ <description>The default device ID.</description>
|
|
</arg>
|
|
</method>
|
|
|
|
@@ -83,37 +83,7 @@
|
|
<description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
</arg>
|
|
<arg name="device_id" direction="out" type="s">
|
|
- <description>The device ID.</description>
|
|
- </arg>
|
|
- </method>
|
|
-
|
|
- <method name="GetAuthTypeEnabled">
|
|
- <arg name="auth_type" direction="in" type="i">
|
|
- <description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
- </arg>
|
|
- <arg name="enabled" direction="out" type="b">
|
|
- <description>Whether the authentication type is enabled</description>
|
|
- </arg>
|
|
- </method>
|
|
-
|
|
- <method name="SetAuthTypeEnabled">
|
|
- <arg name="auth_type" direction="in" type="i">
|
|
- <description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
- </arg>
|
|
- <arg name="enabled" direction="in" type="b">
|
|
- <description>Whether the authentication type is enabled</description>
|
|
- </arg>
|
|
- </method>
|
|
-
|
|
- <method name="GetAuthTypeEnabledForApp">
|
|
- <arg name="auth_type" direction="in" type="i">
|
|
- <description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
- </arg>
|
|
- <arg name="auth_app" direction="in" type="i">
|
|
- <description>Authentication application, Refer to KADAuthApplication in kas-authentication-i.h</description>
|
|
- </arg>
|
|
- <arg name="enabled" direction="out" type="b">
|
|
- <description>Whether to enable the authentication type in this application</description>
|
|
+ <description>The default device ID.</description>
|
|
</arg>
|
|
</method>
|
|
|
|
@@ -148,6 +118,36 @@
|
|
</arg>
|
|
</method>
|
|
|
|
+ <method name="GetAuthTypeEnabled">
|
|
+ <arg name="auth_type" direction="in" type="i">
|
|
+ <description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
+ </arg>
|
|
+ <arg name="enabled" direction="out" type="b">
|
|
+ <description>Whether the authentication type is enabled</description>
|
|
+ </arg>
|
|
+ </method>
|
|
+
|
|
+ <method name="SetAuthTypeEnabled">
|
|
+ <arg name="auth_type" direction="in" type="i">
|
|
+ <description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
+ </arg>
|
|
+ <arg name="enabled" direction="in" type="b">
|
|
+ <description>Whether the authentication type is enabled</description>
|
|
+ </arg>
|
|
+ </method>
|
|
+
|
|
+ <method name="GetAuthTypeEnabledForApp">
|
|
+ <arg name="auth_type" direction="in" type="i">
|
|
+ <description>The auth type. Refer to KADAuthType in kas-authentication-i.h</description>
|
|
+ </arg>
|
|
+ <arg name="auth_app" direction="in" type="i">
|
|
+ <description>Authentication application, Refer to KADAuthApplication in kas-authentication-i.h</description>
|
|
+ </arg>
|
|
+ <arg name="enabled" direction="out" type="b">
|
|
+ <description>Whether to enable the authentication type in this application</description>
|
|
+ </arg>
|
|
+ </method>
|
|
+
|
|
<property name="AuthMode" type="i" access="read">
|
|
<description>The authentication mode contains AND and OR. Refer to enum AuthMode in file kas-authentication-i.h.</description>
|
|
</property>
|
|
diff --git a/plugins/authentication/src/utils/kiran-auth-dbus-proxy.cpp b/plugins/authentication/src/utils/kiran-auth-dbus-proxy.cpp
|
|
index 0bd77b5..09a60d8 100644
|
|
--- a/plugins/authentication/src/utils/kiran-auth-dbus-proxy.cpp
|
|
+++ b/plugins/authentication/src/utils/kiran-auth-dbus-proxy.cpp
|
|
@@ -151,7 +151,7 @@ KiranAuthDBusProxy::getDriversByType(KADAuthType type)
|
|
|
|
void KiranAuthDBusProxy::setDriverEnalbe(const QString& driverName,bool enable)
|
|
{
|
|
- auto reply = m_authProxy->SetDrivereEanbled(driverName,enable);
|
|
+ auto reply = m_authProxy->SetDrivereEnabled(driverName,enable);
|
|
reply.waitForFinished();
|
|
}
|
|
|
|
--
|
|
2.33.0
|
|
|