DNS, DKIM and ACME improvements - part 2

tests/src/directory/oidc.rs

@@ -24,6 +24,7 @@ pub async fn test() {
             "profile".to_string(),
             "openid".to_string(),
         ]),
+        member_tenant_id: None,
     };
     let mut oidc = OpenIdDirectory::open(config.clone()).await.unwrap();
     let token = get_token("john.doe@example.org", "this is an OIDC password").await;

tests/src/smtp/inbound/antispam.rs

@@ -95,7 +95,7 @@ async fn antispam() {
         .await;
     let model_id = admin
         .registry_create_object(AiModel {
-            class: AiModelType::Chat,
+            model_type: AiModelType::Chat,
             allow_invalid_certs: true,
             model: "gpt-dummy".to_string(),
             name: "dummy".to_string(),

tests/src/smtp/inbound/sign.rs

@@ -18,8 +18,7 @@ use mail_auth::{
 use registry::schema::{
     enums::DkimCanonicalization,
     structs::{
-        Dkim1Signature, DkimPrivateKey, DkimSignature, Domain, Expression, SecretTextValue,
-        SenderAuth,
+        Dkim1Signature, DkimSignature, Domain, Expression, SecretText, SecretTextValue, SenderAuth,
     },
 };
 use std::time::{Duration, Instant};
@@ -183,7 +182,7 @@ impl Account {
                 selector: "rsa".to_string(),
                 canonicalization: DkimCanonicalization::SimpleRelaxed,
                 domain_id,
-                private_key: DkimPrivateKey::Value(SecretTextValue {
+                private_key: SecretText::Text(SecretTextValue {
                     secret: RSA_KEY.to_string(),
                 }),
                 ..Default::default()
@@ -196,7 +195,7 @@ impl Account {
                 selector: "ed".to_string(),
                 canonicalization: DkimCanonicalization::RelaxedSimple,
                 domain_id,
-                private_key: DkimPrivateKey::Value(SecretTextValue {
+                private_key: SecretText::Text(SecretTextValue {
                     secret: ED25519_KEY.to_string(),
                 }),
                 ..Default::default()

tests/src/system/tenant.rs

@@ -18,10 +18,10 @@ use registry::{
         enums::{AccountType, Permission, TenantStorageQuota},
         prelude::{ObjectType, Property},
         structs::{
-            Account, Credential, Dkim1Signature, DkimPrivateKey, DkimSignature, DnsServer,
-            DnsServerCloudflare, Domain, GroupAccount, MailingList, OAuthClient,
-            PasswordCredential, Permissions, PermissionsList, Role, SecretKey, SecretKeyValue,
-            SecretTextValue, Tenant, UserAccount, UserRoles,
+            Account, Credential, Dkim1Signature, DkimSignature, DnsServer, DnsServerCloudflare,
+            Domain, GroupAccount, MailingList, OAuthClient, PasswordCredential, Permissions,
+            PermissionsList, Role, SecretKey, SecretKeyValue, SecretText, SecretTextValue, Tenant,
+            UserAccount, UserRoles,
         },
     },
     types::{EnumImpl, ObjectImpl, list::List, map::Map},
@@ -233,7 +233,7 @@ pub async fn test(test: &mut TestServer) {
                         domain_id,
                         member_tenant_id,
                         selector: "ed-key".to_string(),
-                        private_key: DkimPrivateKey::Value(SecretTextValue {
+                        private_key: SecretText::Text(SecretTextValue {
                             secret: DKIM_KEY.to_string(),
                         }),
                         ..Default::default()