emailengine-app 2.61.4 → 2.62.0

package/lib/schemas.js

@@ -43,7 +43,10 @@ const settingsSchema = {
         .example('https://api.example.com/email/webhooks')
         .description('Target URL that will receive webhook notifications via POST requests'),
 
-    webhookEvents: Joi.array().items(Joi.string().max(256).example('messageNew')).description('List of event types that will trigger webhook notifications'),
+    webhookEvents: Joi.array()
+        .items(Joi.string().max(256).example('messageNew').label('WebhookEventType'))
+        .description('List of event types that will trigger webhook notifications')
+        .label('WebhookEvents'),
 
     webhooksCustomHeaders: Joi.array()
         .items(
@@ -61,8 +64,9 @@ const settingsSchema = {
         .label('WebhooksCustomHeaders'),
 
     notifyHeaders: Joi.array()
-        .items(Joi.string().max(256).example('List-ID'))
-        .description('Email headers to include in webhook payloads for additional context'),
+        .items(Joi.string().max(256).example('List-ID').label('NotifyHeaderEntry'))
+        .description('Email headers to include in webhook payloads for additional context')
+        .label('NotifyHeaders'),
 
     /* ──────────────  URLs  ────────────── */
 
@@ -105,9 +109,8 @@ const settingsSchema = {
         .trim()
         .valid('full', 'fast')
         .example('full')
-        .description(
-            'IMAP indexing strategy:\n  * full - Detect new, changed, and deleted messages (slower but complete)\n  * fast - Detect only new messages'
-        ),
+        .description('IMAP indexing strategy:\n  * full - Detect new, changed, and deleted messages (slower but complete)\n  * fast - Detect only new messages')
+        .label('ImapIndexer'),
 
     resolveGmailCategories: Joi.boolean()
         .truthy('Y', 'true', '1', 'on')
@@ -373,17 +376,24 @@ const settingsSchema = {
     imapStrategy: Joi.string()
         .empty('')
         .valid(...ADDRESS_STRATEGIES.map(entry => entry.key))
-        .description('IP address selection strategy for outbound IMAP connections when multiple local addresses are available'),
+        .description('IP address selection strategy for outbound IMAP connections when multiple local addresses are available')
+        .label('ImapStrategy'),
 
     smtpStrategy: Joi.string()
         .empty('')
         .valid(...ADDRESS_STRATEGIES.map(entry => entry.key))
-        .description('IP address selection strategy for outbound SMTP connections when multiple local addresses are available'),
+        .description('IP address selection strategy for outbound SMTP connections when multiple local addresses are available')
+        .label('SmtpStrategy'),
 
     localAddresses: Joi.array()
-        .items(Joi.string().ip({ version: ['ipv4', 'ipv6'], cidr: 'forbidden' }))
+        .items(
+            Joi.string()
+                .ip({ version: ['ipv4', 'ipv6'], cidr: 'forbidden' })
+                .label('LocalAddressEntry')
+        )
         .single()
-        .description('List of local IP addresses to use for outbound connections (requires appropriate network configuration)'),
+        .description('List of local IP addresses to use for outbound connections (requires appropriate network configuration)')
+        .label('LocalAddresses'),
 
     /* ──────────────  Built-in SMTP Server  ────────────── */
 
@@ -473,7 +483,8 @@ const settingsSchema = {
         .max(100)
         .example('fr')
         .valid(...locales.map(l => l.locale))
-        .description('Default language/locale for the user interface'),
+        .description('Default language/locale for the user interface')
+        .label('SettingsLocale'),
     timezone: Joi.string().max(100).example('Europe/Tallinn').description('Default timezone for date/time display (IANA timezone identifier)'),
     pageBrandName: Joi.string().allow('', null).max(1024).example('EmailEngine').description('Brand name displayed in page titles'),
 
@@ -494,13 +505,39 @@ const settingsSchema = {
         .allow('')
         .uri({ scheme: ['http', 'https', 'mailto'], allowRelative: false })
         .example('https://github.com/postalsys/emailengine/issues')
-        .description('Support URL advertised via IMAP ID extension')
+        .description('Support URL advertised via IMAP ID extension'),
+
+    /* ──────────────  Export  ────────────── */
+
+    exportMaxConcurrent: Joi.number().integer().min(1).max(100).example(2).description('Maximum concurrent exports per account'),
+
+    exportMaxGlobalConcurrent: Joi.number().integer().min(1).max(100).example(8).description('Maximum concurrent exports system-wide across all accounts'),
+
+    gmailExportBatchSize: Joi.number()
+        .integer()
+        .min(1)
+        .max(50)
+        .example(10)
+        .description('Number of parallel message fetch requests for Gmail export operations (default: 10, max: 50)'),
+
+    outlookExportBatchSize: Joi.number()
+        .integer()
+        .min(1)
+        .max(20)
+        .example(20)
+        .description('Number of messages per batch request for Outlook export operations (default: 20, max: 20 - MS Graph API limit)'),
+
+    exportMaxMessages: Joi.number().integer().min(1).max(10000000).example(500000).description('Maximum number of messages per export (default: 500000)'),
+
+    exportMaxSize: Joi.number().integer().min(1).example(10737418240).description('Maximum export file size in bytes (default: 10GB)')
 };
 
 const addressSchema = Joi.object({
     name: Joi.string().trim().empty('').max(256).example('Some Name').description('Display name for the email address'),
     address: Joi.string().email({ ignoreLength: false }).example('user@example.com').required().description('Email address')
-}).description('Email address with optional display name');
+})
+    .description('Email address with optional display name')
+    .label('EmailAddress');
 
 // generate a list of boolean values
 const settingsQuerySchema = Object.fromEntries(
@@ -527,6 +564,7 @@ const imapSchema = {
             .max(4 * 4096)
             .example(false)
             .description('OAuth2 access token (when using OAuth2 instead of password authentication)')
+            .label('ImapAccessToken')
     })
         .allow(false)
         .when('useAuthServer', {
@@ -535,7 +573,7 @@ const imapSchema = {
             otherwise: Joi.optional()
         })
         .description('Authentication credentials for the IMAP server')
-        .label('Authentication'),
+        .label('ImapAuthentication'),
 
     useAuthServer: Joi.boolean().example(false).description('Use external authentication server to retrieve credentials dynamically'),
 
@@ -566,7 +604,7 @@ const imapSchema = {
     })
         .unknown()
         .description('Advanced TLS configuration options')
-        .label('TLS'),
+        .label('ImapTlsOptions'),
     resyncDelay: Joi.number().integer().example(RESYNC_DELAY).description('Delay in seconds between full mailbox resynchronizations').default(RESYNC_DELAY),
     disabled: Joi.boolean().example(false).description('Temporarily disable IMAP operations for this account'),
 
@@ -614,6 +652,7 @@ const smtpSchema = {
             .max(4 * 4096)
             .example(false)
             .description('OAuth2 access token (when using OAuth2 instead of password authentication)')
+            .label('SmtpAccessToken')
     })
         .allow(false)
         .when('useAuthServer', {
@@ -622,7 +661,7 @@ const smtpSchema = {
             otherwise: Joi.optional()
         })
         .description('Authentication credentials for the SMTP server')
-        .label('Authentication'),
+        .label('SmtpAuthentication'),
 
     useAuthServer: Joi.boolean().example(false).description('Use external authentication server to retrieve credentials dynamically'),
 
@@ -644,7 +683,7 @@ const smtpSchema = {
     })
         .unknown()
         .description('Advanced TLS configuration options')
-        .label('TLS')
+        .label('SmtpTlsOptions')
 };
 
 const oauth2AuthSchema = Joi.object({
@@ -678,9 +717,10 @@ const oauth2Schema = {
             is: true,
             then: Joi.optional(),
             otherwise: Joi.optional().valid(false, null)
-        }),
+        })
+        .label('OAuth2RedirectUrl'),
 
-    provider: Joi.string().max(256).example('AAABhaBPHscAAAAH').description('OAuth2 Application ID configured in EmailEngine'),
+    provider: Joi.string().max(256).example('AAABhaBPHscAAAAH').description('OAuth2 Application ID configured in EmailEngine').label('OAuth2AppProvider'),
 
     auth: oauth2AuthSchema,
 
@@ -689,7 +729,8 @@ const oauth2Schema = {
     accessToken: Joi.string()
         .max(4 * 4096)
         .example('ya29.a0ARrdaM8a...')
-        .description('OAuth2 access token for the email account'),
+        .description('OAuth2 access token for the email account')
+        .label('OAuth2SchemaAccessToken'),
     refreshToken: Joi.string()
         .max(4 * 4096)
         .example('1//09Ie3CtORQYm...')
@@ -728,6 +769,7 @@ const imapUpdateSchema = {
             .max(4 * 4096)
             .example(false)
             .description('OAuth2 access token (when using OAuth2 instead of password authentication)')
+            .label('ImapUpdateAccessToken')
     })
         .allow(false)
         .when('useAuthServer', {
@@ -736,7 +778,7 @@ const imapUpdateSchema = {
             otherwise: Joi.optional()
         })
         .description('Authentication credentials for the IMAP server')
-        .label('Authentication'),
+        .label('ImapUpdateAuthentication'),
 
     useAuthServer: Joi.boolean().example(false).description('Use external authentication server to retrieve credentials dynamically'),
 
@@ -749,7 +791,7 @@ const imapUpdateSchema = {
     })
         .unknown()
         .description('Advanced TLS configuration options')
-        .label('TLS'),
+        .label('ImapUpdateTlsOptions'),
     resyncDelay: Joi.number().integer().example(RESYNC_DELAY).description('Delay in seconds between full mailbox resynchronizations'),
 
     disabled: Joi.boolean().example(false).description('Temporarily disable IMAP operations for this account'),
@@ -779,6 +821,7 @@ const smtpUpdateSchema = {
             .max(4 * 4096)
             .example(false)
             .description('OAuth2 access token (when using OAuth2 instead of password authentication)')
+            .label('SmtpUpdateAccessToken')
     })
         .allow(false)
         .when('useAuthServer', {
@@ -787,7 +830,7 @@ const smtpUpdateSchema = {
             otherwise: Joi.optional()
         })
         .description('Authentication credentials for the SMTP server')
-        .label('Authentication'),
+        .label('SmtpUpdateAuthentication'),
 
     useAuthServer: Joi.boolean().example(false).description('Use external authentication server to retrieve credentials dynamically'),
 
@@ -800,14 +843,14 @@ const smtpUpdateSchema = {
     })
         .unknown()
         .description('Advanced TLS configuration options')
-        .label('TLS')
+        .label('SmtpUpdateTlsOptions')
 };
 
 const oauth2UpdateSchema = {
     partial: partialSchema,
 
     authorize: Joi.boolean().example(false).description('Request an OAuth2 authorization URL instead of directly configuring credentials'),
-    provider: Joi.string().max(256).example('AAABhaBPHscAAAAH').description('OAuth2 Application ID configured in EmailEngine'),
+    provider: Joi.string().max(256).example('AAABhaBPHscAAAAH').description('OAuth2 Application ID configured in EmailEngine').label('OAuth2UpdateAppProvider'),
 
     auth: oauth2AuthSchema,
 
@@ -816,7 +859,8 @@ const oauth2UpdateSchema = {
     accessToken: Joi.string()
         .max(4 * 4096)
         .example('ya29.a0ARrdaM8a...')
-        .description('OAuth2 access token for the email account'),
+        .description('OAuth2 access token for the email account')
+        .label('OAuth2UpdateAccessToken'),
     refreshToken: Joi.string()
         .max(4 * 4096)
         .example('1//09Ie3CtORQYm...')
@@ -839,7 +883,8 @@ const attachmentSchema = Joi.object({
     encodedSize: Joi.number()
         .integer()
         .example(48)
-        .description('Size of the attachment as stored in the email (base64 encoded). The actual decoded file size is approximately 75% of this value.'),
+        .description('Size of the attachment as stored in the email (base64 encoded). The actual decoded file size is approximately 75% of this value.')
+        .label('AttachmentEncodedSize'),
     embedded: Joi.boolean().example(true).description('Whether the attachment is embedded in the HTML content'),
     inline: Joi.boolean().example(true).description('Whether the attachment should be displayed inline rather than as a download'),
     contentId: Joi.string().example('<unique-image-id@localhost>').description('Content-ID header value used for embedding images in HTML'),
@@ -892,7 +937,9 @@ const messageEntrySchema = Joi.object({
         encodedSize: Joi.object({
             plain: Joi.number().integer().example(1013).description('Size of the plain text part in bytes'),
             html: Joi.number().integer().example(1013).description('Size of the HTML part in bytes')
-        }).description('Sizes of different message parts')
+        })
+            .description('Sizes of different message parts')
+            .label('TextEncodedSize')
     }).label('TextInfo'),
 
     preview: Joi.string().description('Short preview of the message content')
@@ -947,7 +994,9 @@ const messageDetailsSchema = Joi.object({
         encodedSize: Joi.object({
             plain: Joi.number().integer().example(1013).description('Size of the plain text part in bytes'),
             html: Joi.number().integer().example(1013).description('Size of the HTML part in bytes')
-        }).description('Sizes of different message parts'),
+        })
+            .description('Sizes of different message parts')
+            .label('TextDetailEncodedSize'),
         plain: Joi.string().example('Hello from myself!').description('Plain text version of the message'),
         html: Joi.string().example('<p>Hello from myself!</p>').description('HTML version of the message'),
         hasMore: Joi.boolean().example(false).description('Whether the message content was truncated (true if more content is available via separate API call)')
@@ -958,7 +1007,7 @@ const messageDetailsSchema = Joi.object({
             Joi.object({
                 message: Joi.string().max(256).required().example('AAAAAQAACnA').description('EmailEngine identifier of the bounce notification'),
                 recipient: Joi.string().email().example('recipient@example.com').description('Email address that bounced'),
-                action: Joi.string().example('failed').description('Bounce action (failed, delayed, etc.)'),
+                action: Joi.string().example('failed').description('Bounce action (failed, delayed, etc.)').label('BounceAction'),
                 response: Joi.object({
                     message: Joi.string().example('550 5.1.1 No such user').description('Error message from the receiving server'),
                     status: Joi.string().example('5.1.1').description('SMTP status code')
@@ -1027,21 +1076,23 @@ const mailboxesSchema = Joi.array()
     )
     .label('MailboxesList');
 
-const shortMailboxesSchema = Joi.array().items(
-    Joi.object({
-        path: Joi.string().required().example('Kalender/S&APw-nnip&AOQ-evad').description('Full path to the mailbox').label('MailboxPath'),
-        delimiter: Joi.string().example('/').description('Hierarchy delimiter character used in paths'),
-        parentPath: Joi.string().required().example('Kalender').description('Path to the parent mailbox').label('MailboxParentPath'),
-        name: Joi.string().required().example('Sünnipäevad').description('Display name of the mailbox').label('MailboxName'),
-        listed: Joi.boolean().example(true).description('Whether this mailbox appears in LIST command results').label('MailboxListed'),
-        subscribed: Joi.boolean().example(true).description('Whether the user is subscribed to this mailbox').label('MailboxSubscribed'),
-        specialUse: Joi.string()
-            .example('\\Sent')
-            .valid('\\All', '\\Archive', '\\Drafts', '\\Flagged', '\\Junk', '\\Sent', '\\Trash', '\\Inbox')
-            .description('Special folder type (Inbox, Sent, Drafts, etc.)')
-            .label('MailboxSpecialUse')
-    }).label('MailboxShortResponseItem')
-);
+const shortMailboxesSchema = Joi.array()
+    .items(
+        Joi.object({
+            path: Joi.string().required().example('Kalender/S&APw-nnip&AOQ-evad').description('Full path to the mailbox').label('MailboxPath'),
+            delimiter: Joi.string().example('/').description('Hierarchy delimiter character used in paths'),
+            parentPath: Joi.string().required().example('Kalender').description('Path to the parent mailbox').label('MailboxParentPath'),
+            name: Joi.string().required().example('Sünnipäevad').description('Display name of the mailbox').label('MailboxName'),
+            listed: Joi.boolean().example(true).description('Whether this mailbox appears in LIST command results').label('MailboxListed'),
+            subscribed: Joi.boolean().example(true).description('Whether the user is subscribed to this mailbox').label('MailboxSubscribed'),
+            specialUse: Joi.string()
+                .example('\\Sent')
+                .valid('\\All', '\\Archive', '\\Drafts', '\\Flagged', '\\Junk', '\\Sent', '\\Trash', '\\Inbox')
+                .description('Special folder type (Inbox, Sent, Drafts, etc.)')
+                .label('MailboxSpecialUse')
+        }).label('MailboxShortResponseItem')
+    )
+    .label('ShortMailboxes');
 
 const licenseSchema = Joi.object({
     active: Joi.boolean().example(true).description('Whether a valid license is currently active'),
@@ -1056,18 +1107,25 @@ const licenseSchema = Joi.object({
         .allow(false)
         .label('LicenseDetails'),
     suspended: Joi.boolean().example(false).description('Whether email operations are suspended due to license issues')
-});
+}).label('LicenseInfo');
 
 const lastErrorSchema = Joi.object({
-    response: Joi.string().example('Token request failed').description('Human-readable error message'),
+    response: Joi.string()
+        .example('Token request failed for gmail (refresh_token, HTTP 400): invalid_grant - Token has been expired or revoked.')
+        .description('Human-readable error message'),
     serverResponseCode: Joi.string().example('OauthRenewError').description('Error code or classification'),
     tokenRequest: Joi.object({
-        grant: Joi.string().valid('refresh_token', 'authorization_code').example('refresh_token').description('OAuth2 grant type being requested'),
-        provider: Joi.string().max(256).example('gmail').description('OAuth2 provider name'),
-        status: Joi.number().integer().example(400).description('HTTP status code from the OAuth2 server'),
+        grant: Joi.string()
+            .valid('refresh_token', 'authorization_code')
+            .example('refresh_token')
+            .description('OAuth2 grant type being requested')
+            .label('OAuthGrant'),
+        provider: Joi.string().max(256).example('gmail').description('OAuth2 provider name').label('OAuthProvider'),
+        status: Joi.number().integer().example(400).description('HTTP status code from the OAuth2 server').label('OAuthStatusCode'),
         clientId: Joi.string()
             .example('1023289917884-h3nu00e9cb7h252e24c23sv19l8k57ah.apps.googleusercontent.com')
-            .description('OAuth2 client ID used for authentication'),
+            .description('OAuth2 client ID used for authentication')
+            .label('OAuthClientId'),
         scopes: Joi.array()
             .items(Joi.string().example('https://mail.google.com/').label('ScopeEntry').description('OAuth2 permission scope'))
             .description('Requested OAuth2 permission scopes')
@@ -1079,7 +1137,10 @@ const lastErrorSchema = Joi.object({
             })
             .description('Raw error response from the OAuth2 server')
             .unknown()
-    }).description('Details about the failed OAuth2 token request')
+            .label('OAuthTokenErrorResponse')
+    })
+        .description('Details about the failed OAuth2 token request')
+        .label('OAuthTokenRequestError')
 }).label('AccountErrorEntry');
 
 const templateSchemas = {
@@ -1266,17 +1327,24 @@ const accountSchemas = {
         .description(
             'Override global IMAP indexing strategy for this account. "full" tracks all changes including deletions, "fast" only detects new messages.'
         )
-        .label('IMAPIndexer')
+        .label('AccountImapIndexer')
 };
 
-const googleProjectIdSchema = Joi.string().trim().allow('', false, null).max(256).example('project-name-425411').description('Google Cloud Project ID');
+const googleProjectIdSchema = Joi.string()
+    .trim()
+    .allow('', false, null)
+    .max(256)
+    .example('project-name-425411')
+    .description('Google Cloud Project ID')
+    .label('GoogleProjectId');
 const googleTopicNameSchema = Joi.string()
     .trim()
     .allow('', false, null)
     .pattern(/^(?!goog)[A-Za-z][A-Za-z0-9\-_.~+%]{2,254}$/)
     .max(256)
     .example('ee-pub-12345')
-    .description('Google Pub/Sub topic name for Gmail push notifications');
+    .description('Google Pub/Sub topic name for Gmail push notifications')
+    .label('GoogleTopicName');
 
 const googleSubscriptionNameSchema = Joi.string()
     .trim()
@@ -1284,7 +1352,8 @@ const googleSubscriptionNameSchema = Joi.string()
     .pattern(/^(?!goog)[A-Za-z][A-Za-z0-9\-_.~+%]{2,254}$/)
     .max(256)
     .example('ee-sub-12345')
-    .description('Google Pub/Sub subscription name');
+    .description('Google Pub/Sub subscription name')
+    .label('GoogleSubscriptionName');
 
 const googleWorkspaceAccountsSchema = Joi.boolean()
     .truthy('Y', 'true', '1', 'on')
@@ -1304,7 +1373,8 @@ const oauthCreateSchema = {
         .valid(...Object.keys(OAUTH_PROVIDERS))
         .example('gmail')
         .required()
-        .description('OAuth2 provider type'),
+        .description('OAuth2 provider type')
+        .label('CreateOAuth2Provider'),
 
     enabled: Joi.boolean()
         .truthy('Y', 'true', '1', 'on')
@@ -1337,7 +1407,13 @@ const oauthCreateSchema = {
         .example('boT7Q~dUljnfFdVuqpC11g8nGMjO8kpRAv-ZB')
         .description('OAuth2 client secret from the provider'),
 
-    baseScopes: Joi.string().empty('').trim().valid('imap', 'api', 'pubsub').example('imap').description('Connection type (IMAP, API, or Pub/Sub)'),
+    baseScopes: Joi.string()
+        .empty('')
+        .trim()
+        .valid('imap', 'api', 'pubsub')
+        .example('imap')
+        .description('Connection type (IMAP, API, or Pub/Sub)')
+        .label('OAuth2BaseScopes'),
 
     pubSubApp: Joi.string()
         .empty('')
@@ -1345,7 +1421,8 @@ const oauthCreateSchema = {
         .max(512)
         .example('AAAAAQAACnA')
         .allow(false, null)
-        .description('Pub/Sub application ID for Gmail push notifications'),
+        .description('Pub/Sub application ID for Gmail push notifications')
+        .label('PubSubAppId'),
 
     extraScopes: Joi.any()
         .alter({
@@ -1354,8 +1431,9 @@ const oauthCreateSchema = {
                     .allow('')
                     .trim()
                     .example('User.Read')
-                    .max(10 * 1024),
-            api: () => Joi.array().items(Joi.string().trim().max(255).example('User.Read'))
+                    .max(10 * 1024)
+                    .label('OAuth2ExtraScopesWeb'),
+            api: () => Joi.array().items(Joi.string().trim().max(255).example('User.Read').label('ExtraScopeEntry')).label('OAuth2ExtraScopesApi')
         })
         .description('Additional OAuth2 permission scopes'),
 
@@ -1366,8 +1444,9 @@ const oauthCreateSchema = {
                     .allow('')
                     .trim()
                     .example('SMTP.Send')
-                    .max(10 * 1024),
-            api: () => Joi.array().items(Joi.string().trim().max(255).example('SMTP.Send'))
+                    .max(10 * 1024)
+                    .label('OAuth2SkipScopesWeb'),
+            api: () => Joi.array().items(Joi.string().trim().max(255).example('SMTP.Send').label('SkipScopeEntry')).label('OAuth2SkipScopesApi')
         })
         .description('OAuth2 scopes to exclude from the default set'),
 
@@ -1381,7 +1460,8 @@ const oauthCreateSchema = {
             otherwise: Joi.optional().valid(false, null)
         })
         .example('7103296518315821565203')
-        .description('Service account unique ID (for 2-legged OAuth2)'),
+        .description('Service account unique ID (for 2-legged OAuth2)')
+        .label('ServiceClientId'),
 
     googleProjectId: googleProjectIdSchema,
     googleWorkspaceAccounts: googleWorkspaceAccountsSchema,
@@ -1459,15 +1539,16 @@ const oauthCreateSchema = {
         })
         .example('https://myservice.com/oauth')
         .description('OAuth2 redirect URI configured in the provider')
+        .label('OAuth2AppRedirectUrl')
 };
 
 const tokenRestrictionsSchema = Joi.object({
     referrers: Joi.array()
         .items(Joi.string())
-        .empty('')
+        .empty(Joi.valid('', false))
         .single()
-        .allow(false)
-        .default(false)
+        .allow(null)
+        .default(null)
         .example(['*web.domain.org/*', '*.domain.org/*', 'https://domain.org/*'])
         .label('ReferrerAllowlist')
         .description('HTTP referrer patterns that are allowed to use this token (wildcards supported)'),
@@ -1478,10 +1559,10 @@ const tokenRestrictionsSchema = Joi.object({
                 cidr: 'optional'
             })
         )
-        .empty('')
+        .empty(Joi.valid('', false))
         .single()
-        .allow(false)
-        .default(false)
+        .allow(null)
+        .default(null)
         .example(['1.2.3.4', '5.6.7.8', '127.0.0.0/8'])
         .label('AddressAllowlist')
         .description('IP addresses or CIDR ranges allowed to use this token'),
@@ -1489,14 +1570,15 @@ const tokenRestrictionsSchema = Joi.object({
         maxRequests: Joi.number().integer().min(1).example(20).description('Maximum requests allowed in the time window'),
         timeWindow: Joi.number().integer().min(1).example(2).description('Time window duration in seconds')
     })
-        .allow(false)
-        .default(false)
+        .empty(Joi.valid('', false))
+        .allow(null)
+        .default(null)
         .example({ maxRequests: 20, timeWindow: 2 })
         .label('AddressRateLimit')
         .description('Rate limiting configuration for this token')
 })
-    .empty('')
-    .allow(false)
+    .empty(Joi.valid('', false))
+    .allow(null)
     .label('TokenRestrictions')
     .description('Security restrictions for API token usage');
 
@@ -1539,13 +1621,15 @@ const defaultAccountTypeSchema = Joi.string()
 const outboxEntrySchema = Joi.object({
     queueId: Joi.string().example('1869c5692565f756b33').description('Unique queue entry identifier'),
     account: accountIdSchema.required(),
-    source: Joi.string().example('smtp').valid('smtp', 'api').description('How this message entered the queue'),
+    source: Joi.string().example('smtp').valid('smtp', 'api').description('How this message entered the queue').label('OutboxSource'),
 
     messageId: Joi.string().max(996).example('<test123@example.com>').description('Message-ID header value'),
     envelope: Joi.object({
         from: Joi.string().email().allow('').example('sender@example.com'),
-        to: Joi.array().items(Joi.string().email().required().example('recipient@example.com'))
-    }).description('SMTP envelope information'),
+        to: Joi.array().items(Joi.string().email().required().example('recipient@example.com')).label('OutboxEnvelopeTo')
+    })
+        .description('SMTP envelope information')
+        .label('OutboxEnvelope'),
 
     subject: Joi.string()
         .allow('')
@@ -1561,7 +1645,7 @@ const outboxEntrySchema = Joi.object({
     attempts: Joi.number().integer().example(3).description('Maximum delivery attempts before marking as failed'),
 
     progress: Joi.object({
-        status: Joi.string().valid('queued', 'processing', 'submitted', 'error').example('queued').description('Current delivery status'),
+        status: Joi.string().valid('queued', 'processing', 'submitted', 'error').example('queued').description('Current delivery status').label('OutboxStatus'),
         response: Joi.string().example('250 Message Accepted').description('SMTP server response (when status is "processing")'),
         error: Joi.object({
             message: Joi.string().example('Authentication failed').description('Error description'),
@@ -1586,7 +1670,8 @@ const messageReferenceSchema = Joi.object({
         .valid('forward', 'reply', 'reply-all')
         .example('reply')
         .default('reply')
-        .description('Action type: "reply" (reply to sender), "reply-all" (reply to all recipients), or "forward" (forward to new recipients)'),
+        .description('Action type: "reply" (reply to sender), "reply-all" (reply to all recipients), or "forward" (forward to new recipients)')
+        .label('MessageAction'),
 
     inline: Joi.boolean()
         .truthy('Y', 'true', '1')
@@ -1643,6 +1728,96 @@ const headerTimeoutSchema = Joi.number()
     .description('Request timeout in milliseconds (overrides EENGINE_TIMEOUT environment variable)')
     .label('X-EE-Timeout');
 
+// Export schemas
+const exportRequestSchema = Joi.object({
+    folders: Joi.array()
+        .items(Joi.string().max(1024).example('INBOX'))
+        .single()
+        .description(
+            'Folder paths or special-use flags (e.g., \\Inbox, \\Sent, \\All) to export from. If empty/omitted, Gmail/Outlook API accounts export from All Mail folder; other accounts export all folders except Junk and Trash.'
+        )
+        .label('ExportFolders'),
+    startDate: Joi.date().iso().required().example('2024-01-01T00:00:00Z').description('Export messages from this date'),
+    endDate: Joi.date().iso().required().example('2024-12-31T23:59:59Z').description('Export messages until this date'),
+    textType: Joi.string()
+        .valid('plain', 'html', '*')
+        .default('*')
+        .example('*')
+        .description('Text content to include: "plain", "html", "*" (both), or omit for metadata only')
+        .label('ExportTextType'),
+    maxBytes: Joi.number()
+        .integer()
+        .min(0)
+        .default(5 * 1024 * 1024)
+        .example(5242880)
+        .description('Maximum bytes for text content (0 = unlimited)'),
+    includeAttachments: Joi.boolean()
+        .truthy('Y', 'true', '1')
+        .falsy('N', 'false', 0)
+        .default(false)
+        .description('Include attachment content as base64 blob in attachments array')
+})
+    .custom((value, helpers) => {
+        if (value.startDate && value.endDate && value.startDate >= value.endDate) {
+            return helpers.error('any.invalid');
+        }
+        return value;
+    }, 'date range validation')
+    .messages({ 'any.invalid': 'startDate must be before endDate' })
+    .label('ExportRequest');
+
+const exportProgressSchema = Joi.object({
+    foldersScanned: Joi.number().integer().example(1).description('Number of folders scanned'),
+    foldersTotal: Joi.number().integer().example(2).description('Total number of folders to scan'),
+    messagesQueued: Joi.number().integer().example(1500).description('Number of messages queued for export'),
+    messagesExported: Joi.number().integer().example(500).description('Number of messages exported'),
+    messagesSkipped: Joi.number().integer().example(5).description('Number of messages skipped (deleted or inaccessible)'),
+    bytesWritten: Joi.number().integer().example(52428800).description('Bytes written to export file')
+}).label('ExportProgress');
+
+const exportStatusSchema = Joi.object({
+    exportId: Joi.string().example('exp_abc123def456abc123def456').description('Export job identifier'),
+    status: Joi.string()
+        .valid('queued', 'processing', 'completed', 'failed', 'cancelled')
+        .example('processing')
+        .description('Export status')
+        .label('ExportStatusValue'),
+    phase: Joi.string().valid('indexing', 'exporting', 'complete').example('indexing').description('Current export phase').label('ExportPhase'),
+    folders: Joi.array().items(Joi.string().label('ExportFolderItem')).description('Folders being exported').label('ExportStatusFolders'),
+    startDate: Joi.date().iso().example('2024-01-01T00:00:00Z').description('Export start date filter'),
+    endDate: Joi.date().iso().example('2024-12-31T23:59:59Z').description('Export end date filter'),
+    isEncrypted: Joi.boolean().example(false).description('Whether the export file is encrypted'),
+    progress: exportProgressSchema,
+    created: Joi.date().iso().example('2024-01-15T10:30:00Z').description('When export was created'),
+    expiresAt: Joi.date().iso().example('2024-01-16T10:30:00Z').description('When export file expires'),
+    error: Joi.string().allow(null).description('Error message if export failed')
+}).label('ExportStatus');
+
+const exportListEntrySchema = Joi.object({
+    exportId: Joi.string().example('exp_abc123def456abc123def456').description('Export job identifier'),
+    status: Joi.string()
+        .valid('queued', 'processing', 'completed', 'failed', 'cancelled')
+        .example('completed')
+        .description('Export status')
+        .label('ExportListStatusValue'),
+    created: Joi.date().iso().example('2024-01-15T10:30:00Z').description('When export was created'),
+    expiresAt: Joi.date().iso().example('2024-01-16T10:30:00Z').description('When export file expires')
+}).label('ExportListEntry');
+
+const exportListSchema = Joi.object({
+    total: Joi.number().integer().example(5).description('Total number of exports'),
+    page: Joi.number().integer().example(0).description('Current page number'),
+    pages: Joi.number().integer().example(1).description('Total number of pages'),
+    exports: Joi.array().items(exportListEntrySchema).description('Export entries').label('ExportEntries')
+}).label('ExportList');
+
+const exportIdSchema = Joi.string()
+    .pattern(/^exp_[a-f0-9]{24}$/)
+    .required()
+    .example('exp_abc123def456abc123def456')
+    .description('Export job identifier')
+    .label('ExportId');
+
 module.exports = {
     ADDRESS_STRATEGIES,
 
@@ -1684,7 +1859,12 @@ module.exports = {
     googleWorkspaceAccountsSchema,
     messageReferenceSchema,
     idempotencyKeySchema,
-    headerTimeoutSchema
+    headerTimeoutSchema,
+    exportRequestSchema,
+    exportStatusSchema,
+    exportListSchema,
+    exportProgressSchema,
+    exportIdSchema
 };
 
 /*