EE code reorganisation

crates/jmap/Cargo.toml

@@ -11,7 +11,6 @@ jmap_proto = { path = "../jmap-proto" }
 smtp = { path =  "../smtp" }
 utils = { path =  "../utils" }
 common = { path =  "../common" }
-se_common = { path =  "../se-common", optional = true }
 directory = { path =  "../directory" }
 smtp-proto = { version = "0.1" }
 mail-parser = { version = "0.9", features = ["full_encoding", "serde_support", "ludicrous_mode"] } 
@@ -61,4 +60,4 @@ quick-xml = "0.35"
 
 [features]
 test_mode = []
-enterprise = ["se_common"]
+enterprise = []

crates/jmap/src/api/management/enterprise.rs

@@ -11,11 +11,11 @@
 use std::str::FromStr;
 
 use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
+use common::enterprise::undelete::DeletedBlob;
 use directory::backend::internal::manage::ManageDirectory;
 use hyper::Method;
 use jmap_proto::{error::request::RequestError, types::collection::Collection};
 use mail_parser::{DateTime, MessageParser};
-use se_common::undelete::{DeletedBlob, Undelete};
 use serde_json::json;
 use store::write::{BatchBuilder, BlobOp, ValueClass};
 use utils::{url_params::UrlParams, BlobHash};

crates/jmap/src/api/management/mod.rs

@@ -26,9 +26,6 @@ use serde::Serialize;
 use super::{http::ToHttpResponse, HttpRequest, HttpResponse, JsonResponse};
 use crate::{auth::AccessToken, JMAP};
 
-#[cfg(feature = "enterprise")]
-use se_common::EnterpriseCore;
-
 #[derive(Serialize)]
 #[serde(tag = "error")]
 pub enum ManagementApiError {

crates/jmap/src/auth/oauth/auth.rs

@@ -24,9 +24,6 @@ use crate::{
     JMAP,
 };
 
-#[cfg(feature = "enterprise")]
-use se_common::EnterpriseCore;
-
 use super::{
     DeviceAuthResponse, FormData, OAuthCode, OAuthCodeRequest, CLIENT_ID_MAX_LEN, DEVICE_CODE_LEN,
     MAX_POST_LEN, USER_CODE_ALPHABET, USER_CODE_LEN,

crates/jmap/src/email/delete.rs

@@ -13,8 +13,6 @@ use jmap_proto::{
         type_state::DataType,
     },
 };
-#[cfg(feature = "enterprise")]
-use se_common::undelete::Undelete;
 use store::{
     ahash::AHashMap,
     roaring::RoaringBitmap,