Fix an error

ideal-world · May 10, 2024 · 3bd13d1 · 3bd13d1
1 parent 071febe
commit 3bd13d1
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 6 deletions.
diff --git a/backend/spi/spi-plugin/tests/test_plugin.rs b/backend/spi/spi-plugin/tests/test_plugin.rs
@@ -184,23 +184,23 @@ async fn init_data() -> TardisResult<()> {
         RbumRelAttrAggAddReq {
             is_from: true,
             value: "http://xxx".to_string(),
-            name: "url".to_string(),
+            name: Some("url".to_string()),
             record_only: true,
-            rel_rbum_kind_attr_id: kind_attr_1,
+            rel_rbum_kind_attr_id: Some(kind_attr_1),
         },
         RbumRelAttrAggAddReq {
             is_from: true,
             value: "ak123".to_string(),
-            name: "ak".to_string(),
+            name: Some("ak".to_string()),
             record_only: true,
-            rel_rbum_kind_attr_id: kind_attr_2,
+            rel_rbum_kind_attr_id: Some(kind_attr_2),
         },
         RbumRelAttrAggAddReq {
             is_from: true,
             value: "sk123".to_string(),
-            name: "sk".to_string(),
+            name: Some("sk".to_string()),
             record_only: true,
-            rel_rbum_kind_attr_id: kind_attr_3,
+            rel_rbum_kind_attr_id: Some(kind_attr_3),
         },
     ];
     let _: String = client

diff --git a/backend/supports/iam/tests/test_ca_basic.rs b/backend/supports/iam/tests/test_ca_basic.rs
@@ -108,6 +108,7 @@ pub async fn test(context: &TardisContext) -> TardisResult<(TardisContext, Tardi
             status: None,
             temporary: None,
             lock_status: None,
+            logout_type: None,
         },
         false,
         &funs,
@@ -132,6 +133,7 @@ pub async fn test(context: &TardisContext) -> TardisResult<(TardisContext, Tardi
             status: None,
             temporary: None,
             lock_status: None,
+            logout_type: None,
         },
         false,
         &funs,

diff --git a/backend/supports/iam/tests/test_cc_account.rs b/backend/supports/iam/tests/test_cc_account.rs
@@ -63,6 +63,7 @@ async fn test_single_level(context: &TardisContext, _account_name: &str, role_na
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         &funs,
         context,
@@ -81,6 +82,7 @@ async fn test_single_level(context: &TardisContext, _account_name: &str, role_na
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None
         },
         &funs,
         another_context
@@ -98,6 +100,7 @@ async fn test_single_level(context: &TardisContext, _account_name: &str, role_na
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         context,
@@ -180,6 +183,7 @@ async fn test_multi_level_add<'a>(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         funs,
         sys_context,
@@ -196,6 +200,7 @@ async fn test_multi_level_add<'a>(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         funs,
         t1_context,
@@ -212,6 +217,7 @@ async fn test_multi_level_add<'a>(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         funs,
         t2_context,
@@ -228,6 +234,7 @@ async fn test_multi_level_add<'a>(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         funs,
         t2_a1_context,
@@ -244,6 +251,7 @@ async fn test_multi_level_add<'a>(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         funs,
         t2_a2_context,
@@ -278,6 +286,7 @@ pub async fn test_multi_level_by_sys_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         sys_context,
@@ -294,6 +303,7 @@ pub async fn test_multi_level_by_sys_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         sys_context,
@@ -310,6 +320,7 @@ pub async fn test_multi_level_by_sys_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         sys_context,
@@ -391,6 +402,7 @@ pub async fn test_multi_level_by_tenant_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t1_context,
@@ -408,6 +420,7 @@ pub async fn test_multi_level_by_tenant_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_context,
@@ -425,6 +438,7 @@ pub async fn test_multi_level_by_tenant_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_context,
@@ -441,6 +455,7 @@ pub async fn test_multi_level_by_tenant_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_context,
@@ -507,6 +522,7 @@ pub async fn test_multi_level_by_app_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_a1_context,
@@ -524,6 +540,7 @@ pub async fn test_multi_level_by_app_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_a1_context,
@@ -541,6 +558,7 @@ pub async fn test_multi_level_by_app_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_a1_context,
@@ -558,6 +576,7 @@ pub async fn test_multi_level_by_app_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_a1_context,
@@ -575,6 +594,7 @@ pub async fn test_multi_level_by_app_context(
             lock_status: None,
             is_auto: None,
             temporary: None,
+            logout_type: None,
         },
         &funs,
         t2_a1_context,

diff --git a/backend/supports/iam/tests/test_cc_set.rs b/backend/supports/iam/tests/test_cc_set.rs
@@ -208,6 +208,7 @@ async fn test_single_level(context: &TardisContext, another_context: &TardisCont
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         &funs,
         context,
@@ -224,6 +225,7 @@ async fn test_single_level(context: &TardisContext, another_context: &TardisCont
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         &funs,
         context,
@@ -1117,6 +1119,7 @@ pub async fn test_bind_platform_to_tenant_node(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         &funs,
         sys_context,
@@ -1133,6 +1136,7 @@ pub async fn test_bind_platform_to_tenant_node(
             temporary: None,
             status: None,
             lock_status: None,
+            logout_type: None,
         },
         &funs,
         t2_context,

diff --git a/backend/supports/iam/tests/test_cp_all.rs b/backend/supports/iam/tests/test_cp_all.rs
@@ -468,6 +468,7 @@ pub async fn test(sysadmin_info: (&str, &str), system_admin_context: &TardisCont
             icon: Some("/static/images/avatar.png".to_string()),
             disabled: Some(true),
             exts: Default::default(),
+            logout_type: None,
         },
         &funs,
         &system_admin_context,

diff --git a/backend/supports/iam/tests/test_iam_scenes_app.rs b/backend/supports/iam/tests/test_iam_scenes_app.rs
@@ -97,6 +97,7 @@ pub async fn app_console_project_mgr_page(tenant_id: &str, client: &mut BIOSWebT
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;

diff --git a/backend/supports/iam/tests/test_iam_scenes_common.rs b/backend/supports/iam/tests/test_iam_scenes_common.rs
@@ -152,6 +152,7 @@ pub async fn test(sysadmin_name: &str, sysadmin_password: &str, client: &mut BIO
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;

diff --git a/backend/supports/iam/tests/test_iam_scenes_passport.rs b/backend/supports/iam/tests/test_iam_scenes_passport.rs
@@ -118,6 +118,7 @@ pub async fn test(sysadmin_name: &str, sysadmin_password: &str, client: &mut BIO
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;
@@ -202,6 +203,7 @@ pub async fn account_mgr_by_sys_admin(client: &mut BIOSWebTestClient) -> TardisR
                 disabled: None,
                 icon: None,
                 exts: HashMap::new(),
+                logout_type: None,
             },
         )
         .await;
@@ -314,6 +316,7 @@ pub async fn account_mgr_by_tenant_account(client: &mut BIOSWebTestClient) -> Ta
                 disabled: None,
                 icon: None,
                 exts: HashMap::from([("ext9".to_string(), "00001".to_string())]),
+                logout_type: None,
             },
         )
         .await;
@@ -878,6 +881,7 @@ pub async fn login_by_ldap(client: &mut BIOSWebTestClient) -> TardisResult<()> {
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;
@@ -981,6 +985,7 @@ pub async fn login_by_ldap(client: &mut BIOSWebTestClient) -> TardisResult<()> {
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;

diff --git a/backend/supports/iam/tests/test_iam_scenes_system.rs b/backend/supports/iam/tests/test_iam_scenes_system.rs
@@ -118,6 +118,7 @@ pub async fn sys_console_tenant_mgr_page(sysadmin_name: &str, sysadmin_password:
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;
@@ -247,6 +248,7 @@ pub async fn sys_console_tenant_mgr_page(sysadmin_name: &str, sysadmin_password:
                 cert_phone: None,
                 cert_mail: None,
                 temporary: None,
+                logout_type: None,
             },
         )
         .await;
@@ -431,6 +433,7 @@ pub async fn sys_console_account_mgr_page(client: &mut BIOSWebTestClient) -> Tar
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;
@@ -463,6 +466,7 @@ pub async fn sys_console_account_mgr_page(client: &mut BIOSWebTestClient) -> Tar
                 cert_phone: None,
                 cert_mail: None,
                 temporary: None,
+                logout_type: None,
             },
         )
         .await;

diff --git a/backend/supports/iam/tests/test_iam_scenes_tenant.rs b/backend/supports/iam/tests/test_iam_scenes_tenant.rs
@@ -412,6 +412,7 @@ pub async fn tenant_console_account_mgr_page(client: &mut BIOSWebTestClient) ->
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;
@@ -446,6 +447,7 @@ pub async fn tenant_console_account_mgr_page(client: &mut BIOSWebTestClient) ->
                 cert_phone: None,
                 cert_mail: None,
                 temporary: None,
+                logout_type: None,
             },
         )
         .await;
@@ -603,6 +605,7 @@ pub async fn tenant_console_app_set_mgr_page(client: &mut BIOSWebTestClient) ->
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;
@@ -625,6 +628,7 @@ pub async fn tenant_console_app_set_mgr_page(client: &mut BIOSWebTestClient) ->
                 status: None,
                 temporary: None,
                 lock_status: None,
+                logout_type: None,
             },
         )
         .await;

diff --git a/backend/supports/iam/tests/test_key_cache.rs b/backend/supports/iam/tests/test_key_cache.rs
@@ -277,6 +277,7 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
             status: None,
             temporary: None,
             lock_status: None,
+            logout_type: None,
         },
         false,
         &funs,
@@ -1054,6 +1055,7 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
             status: None,
             temporary: None,
             lock_status: None,
+            logout_type: None,
         },
         false,
         &funs,
@@ -1148,6 +1150,7 @@ pub async fn test(system_admin_context: &TardisContext) -> TardisResult<()> {
             status: None,
             temporary: None,
             lock_status: None,
+            logout_type: None,
         },
         false,
         &funs,