@zimbra/api-client 100.1.0 → 100.1.1-PREAPPS-9077.6dad12e.0

package/eslint.config.mjs

@@ -0,0 +1,10 @@
+import { tsEslintConfig } from "@zimbra/eslint-config/typescript";
+
+const customIgnores = ["src/schema/generated-schema-types.ts"];
+
+export default [
+	...tsEslintConfig.map(cfg => ({
+		...cfg,
+		ignores: [...(cfg.ignores || []), ...customIgnores],
+	}))
+];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zimbra/api-client",
   "amdName": "zmApiJsClient",
-  "version": "100.1.0",
+  "version": "100.1.1-PREAPPS-9077.6dad12e.0",
   "description": "Zimbra JS API Client and GraphQL client for making requests against the Zimbra SOAP API.",
   "main": "dist/zm-api-js-client.js",
   "source": "index.ts",
@@ -10,7 +10,7 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "generateSchemaTypes": "rimraf src/schema/generated-schema-types.ts && graphql-codegen",
-    "lint": "tslint --project .",
+    "lint": "eslint --config eslint.config.mjs .",
     "lint:fix": "npm run lint -- --fix",
     "test:unit": "BABEL_ENV=test mocha --require ./babelRegisterConfig.js test/**/*.js",
     "test:watch": "npm run test:unit -- --watch",
@@ -26,7 +26,7 @@
     "minify:cjs": "cross-var uglifyjs $npm_package_main -c pure_getters,pure_funcs=classCallCheck -m toplevel,reserved=['_createClass'] --keep-fnames -o $npm_package_main --source-map content=$npm_package_main.map,url=zm-api-js-client.js.map,filename=$npm_package_main.map",
     "minify:umd": "cross-var uglifyjs $npm_package_umd_main -c pure_getters,pure_funcs=classCallCheck -m toplevel,reserved=['_createClass'] --keep-fnames -o $npm_package_umd_main --source-map content=$npm_package_umd_main.map,url=zm-api-js-client.umd.js.map,filename=$npm_package_umd_main.map",
     "size": "echo \"Gzipped Size: $(gzip-size $npm_package_main | pretty-bytes)\"",
-    "prepublishOnly": "npm test && npm run build && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags",
+    "prepublishOnly": "if [ \"$CI\" != \"true\" ]; then npm test && npm run build && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags; fi",
     "publish:beta": "npm publish --tag=beta",
     "security:audit": "npx audit-ci@^6 --moderate --report-type summary --pass-enoaudit --skip-dev",
     "prepare": "husky || true"
@@ -42,8 +42,8 @@
   },
   "license": "BSD-3-Clause",
   "lint-staged": {
-    "**/*.ts": [
-      "tslint"
+    "**/*.{ts, tsx}": [
+      "eslint"
     ]
   },
   "dependencies": {
@@ -72,23 +72,23 @@
     "@types/lodash": "^4.14.182",
     "@types/node": "^20.10.4",
     "@types/whatwg-fetch": "^0.0.33",
+    "@typescript-eslint/eslint-plugin": "^8.50.1",
+    "@zimbra/eslint-config": "^1.0.0",
     "babel-plugin-lodash": "^3.3.4",
     "chai": "^4.5.0",
     "copyfiles": "^2.4.1",
     "cross-var": "^1.1.0",
+    "eslint": "^9.0.0",
     "husky": "^9.1.7",
     "lint-staged": "15.2.8",
     "mocha": "^10.8.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.2",
     "rimraf": "^5.0.1",
-    "rollup": "^2.75.0",
+    "rollup": "^2.80.0",
     "rollup-plugin-local-resolve": "^1.0.7",
     "rollup-plugin-visualizer": "^5.11.0",
     "tslib": "^2.5.0",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.3.0",
     "typescript": "^5.3.3",
     "uglify-js": "^3.15.5"
   }

package/src/batch-client/index.ts

@@ -372,7 +372,7 @@ export class ZimbraBatchClient {
 			};
 		});
 
-	public accountOnlyRemoteWipeSync = (deviceId: String) =>
+	public accountOnlyRemoteWipeSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'AccountOnlyRemoteWipe',
 			namespace: Namespace.Sync,
@@ -433,7 +433,7 @@ export class ZimbraBatchClient {
 		}).then(normalize(MessageInfo));
 	};
 
-	public allowDeviceSync = (deviceId: String) =>
+	public allowDeviceSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'AllowDevice',
 			namespace: Namespace.Sync,
@@ -476,7 +476,7 @@ export class ZimbraBatchClient {
 			body: options
 		}).then(res => normalize(AutoCompleteGALResponse)(res));
 
-	public blockDeviceSync = (deviceId: String) =>
+	public blockDeviceSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'BlockDevice',
 			namespace: Namespace.Sync,
@@ -487,7 +487,7 @@ export class ZimbraBatchClient {
 			}
 		});
 
-	public cancelPendingAccountOnlyRemoteWipeSync = (deviceId: String) =>
+	public cancelPendingAccountOnlyRemoteWipeSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'CancelPendingAccountOnlyRemoteWipe',
 			namespace: Namespace.Sync,
@@ -498,7 +498,7 @@ export class ZimbraBatchClient {
 			}
 		});
 
-	public cancelPendingRemoteWipeSync = (deviceId: String) =>
+	public cancelPendingRemoteWipeSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'CancelPendingRemoteWipe',
 			namespace: Namespace.Sync,
@@ -567,19 +567,34 @@ export class ZimbraBatchClient {
 		}
 	};
 
-	public checkCalendar = ({
-		id,
-		value
-	}: FolderActionCheckCalendarInput): Promise<ActionOpResponse> => {
+	public checkCalendars = (
+		actions: FolderActionCheckCalendarInput[]
+	): Promise<ActionOpResponse[]> => {
+		const folderActions = actions.map(action => ({
+			_jsns: 'urn:zimbraMail',
+			action: {
+				id: action.id,
+				op: action.value ? 'check' : '!check'
+			}
+		}));
+
 		return this.jsonRequest({
 			name: ActionType.folder,
-			body: {
-				action: {
-					id,
-					op: value ? 'check' : '!check'
-				}
-			},
-			singleRequest: true
+			body: folderActions
+		}).then(res => {
+			const data = res.body;
+
+			if (Array.isArray(data?.action)) {
+				return data.action.map((item: any) => ({
+					__typename: 'ActionOpResponse',
+					action: {
+						__typename: 'ActionOpResponseData',
+						id: item.id,
+						op: item.op
+					}
+				}));
+			}
+			return [];
 		});
 	};
 
@@ -928,41 +943,19 @@ export class ZimbraBatchClient {
 		});
 
 	public endSessionBeaconRequest = (options: JsonRequestOptions) => {
-		const body = {
-			Body: {
-				EndSessionRequest: {
-					_jsns: Namespace.Account
-				}
+		this.jsonRequest({
+			name: 'EndSession',
+			namespace: Namespace.Account,
+			singleRequest: true,
+			headers: {
+				'Content-Type': 'application/json',
+				'X-Zimbra-Csrf-Token': this.csrfToken || ''
 			},
-			Header: {
-				context: {
-					_jsns: Namespace.All,
-					account: {
-						by: 'name',
-						_content: options.accountName
-					},
-					session: {
-						id: this.sessionId,
-						_content: this.sessionId
-					},
-					userAgent: this.userAgent
-				}
-			}
-		};
-
-		try {
-			fetch(`${this.origin}/service/soap`, {
-				method: 'POST',
-				keepalive: true,
-				headers: {
-					'Content-Type': 'application/json',
-					'X-Zimbra-Csrf-Token': this.csrfToken || ''
-				},
-				body: JSON.stringify(body)
-			});
-		} catch (e) {
-			throw new Error('Error on endSessionBeaconRequest request' + e);
-		}
+			accountName: options.accountName,
+			sessionId: this.sessionId,
+			userAgent: this.userAgent,
+			fetchOptions: { keepalive: true }
+		});
 	};
 
 	public folderAction = (options: ActionOptions) => this.action(ActionType.folder, options);
@@ -992,7 +985,7 @@ export class ZimbraBatchClient {
 			}
 		}).then(res => normalize(FreeBusy)(res.usr));
 
-	public generateScratchCodes = (username: String) =>
+	public generateScratchCodes = (username: string) =>
 		this.jsonRequest({
 			name: 'GenerateScratchCodes',
 			namespace: Namespace.Account,
@@ -1005,7 +998,7 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		});
 
-	public getAccountDistributionLists = (attrs: String, ownerOf: number) =>
+	public getAccountDistributionLists = (attrs: string, ownerOf: number) =>
 		this.jsonRequest({
 			name: 'GetAccountDistributionLists',
 			body: {
@@ -1115,7 +1108,7 @@ export class ZimbraBatchClient {
 			namespace: Namespace.Sync
 		}).then(res => res?.device || []);
 
-	public getDistributionList = (dl: String, needOwners: Boolean, needRights: String, by: String) =>
+	public getDistributionList = (dl: string, needOwners: boolean, needRights: string, by: string) =>
 		this.jsonRequest({
 			name: 'GetDistributionList',
 			body: {
@@ -1129,7 +1122,7 @@ export class ZimbraBatchClient {
 			namespace: Namespace.Account
 		});
 
-	public getDistributionListMembers = (limit: String, offset: String, dl: String) =>
+	public getDistributionListMembers = (limit: string, offset: string, dl: string) =>
 		this.jsonRequest({
 			name: 'GetDistributionListMembers',
 			body: {
@@ -1228,7 +1221,7 @@ export class ZimbraBatchClient {
 						 */
 
 						if (folder.view === FolderView.Contact) {
-							(folder.userId = folder.id), (folder.id = `${ownerZimbraId}:${sharedItemId}`);
+							((folder.userId = folder.id), (folder.id = `${ownerZimbraId}:${sharedItemId}`));
 						}
 						if (oname && folders) {
 							folder.folders = updateAbsoluteFolderPath(oname, absFolderPath, folders);
@@ -1401,7 +1394,7 @@ export class ZimbraBatchClient {
 			body: denormalize(GetRightsRequest)(options)
 		}).then(normalize(AccountRights));
 
-	public getScratchCodes = (username: String) =>
+	public getScratchCodes = (username: string) =>
 		this.jsonRequest({
 			name: 'GetScratchCodes',
 			namespace: Namespace.Account,
@@ -1765,7 +1758,7 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		}).then(Boolean);
 
-	public quarantineDeviceSync = (deviceId: String) =>
+	public quarantineDeviceSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'QuarantineDevice',
 			namespace: Namespace.Sync,
@@ -1796,7 +1789,7 @@ export class ZimbraBatchClient {
 			}
 		}).then(resp => resp.relatedContacts.relatedContact);
 
-	public remoteWipeSync = (deviceId: String) =>
+	public remoteWipeSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'RemoteWipe',
 			namespace: Namespace.Sync,
@@ -1807,7 +1800,7 @@ export class ZimbraBatchClient {
 			}
 		});
 
-	public removeDeviceSync = (deviceId: String) =>
+	public removeDeviceSync = (deviceId: string) =>
 		this.jsonRequest({
 			name: 'RemoveDevice',
 			namespace: Namespace.Sync,
@@ -1959,8 +1952,8 @@ export class ZimbraBatchClient {
 	public sendMessage = (
 		message: SendMessageInput,
 		accountName: string,
-		sign: Boolean,
-		encrypt: Boolean
+		sign: boolean,
+		encrypt: boolean
 	) =>
 		this.jsonRequest({
 			name: !(sign || encrypt) ? 'SendMsg' : 'SendSecureMsg',
@@ -2019,7 +2012,7 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		}).then(Boolean);
 
-	public setUserAgent = (userAgent: Object) => {
+	public setUserAgent = (userAgent: object) => {
 		this.userAgent = userAgent;
 	};
 
@@ -2042,7 +2035,7 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		}).then(Boolean);
 
-	public subscribeDistributionList = (op: String, by: String, dl: String) =>
+	public subscribeDistributionList = (op: string, by: string, dl: string) =>
 		this.jsonRequest({
 			name: 'SubscribeDistributionList',
 			body: {
@@ -2203,7 +2196,7 @@ export class ZimbraBatchClient {
 	/**
 	 * These options are included on every request.
 	 */
-	private getAdditionalRequestOptions = (addCsrfToken: Boolean = true) => ({
+	private getAdditionalRequestOptions = (addCsrfToken: boolean = true) => ({
 		jwtToken: this.jwtToken,
 		...(addCsrfToken && {
 			csrfToken: this.csrfToken

package/src/batch-client/types.ts

@@ -151,7 +151,7 @@ export interface GetMailItemOptions {
 	header?: Array<MailItemHeader>;
 	html?: boolean;
 	id: string;
-	ids: [String];
+	ids: [string];
 	isLocal?: boolean;
 	max?: number;
 	needExp?: boolean;
@@ -180,17 +180,17 @@ export interface AppointmentOptions {
 export interface SaveDocumentInput {
 	content: string;
 	ct: string;
-	descEnabled: Boolean;
+	descEnabled: boolean;
 	id: string;
 	l: string;
 	name: string;
 	upload: UploadDocument;
-	ver: Number;
+	ver: number;
 }
 
 export interface SearchOptions {
-	calExpandInstEnd?: Number;
-	calExpandInstStart?: Number;
+	calExpandInstEnd?: number;
+	calExpandInstStart?: number;
 	cursor?: Cursor;
 	fetch?: string;
 	fullConversation?: boolean;
@@ -210,9 +210,9 @@ export interface SearchOptions {
 }
 
 export interface SearchCalendarResourcesCondition {
-	attr?: String;
-	op?: String;
-	value?: String;
+	attr?: string;
+	op?: string;
+	value?: string;
 }
 export interface SearchCalendarResourcesOptions {
 	attrs?: string;
@@ -228,8 +228,8 @@ export interface SearchCalendarResourcesOptions {
 
 export interface ShareInfoOptions {
 	grantee?: Grantee;
-	includeSelf?: Boolean;
-	internal?: Boolean;
+	includeSelf?: boolean;
+	internal?: boolean;
 	owner?: Owner;
 }
 
@@ -268,7 +268,7 @@ export interface ActionOptions {
 	isLocal?: boolean;
 	name?: string;
 	op: string;
-	recursive?: Boolean;
+	recursive?: boolean;
 	rgb?: string;
 	tagNames?: string;
 }

package/src/normalize/index.ts

@@ -1,6 +1,6 @@
 import { EntityMapping, EntityMappingValue, NormalizedKey } from './types';
 
-function normalizeKey(key: string, schema: Entity, inverse: Boolean = false): NormalizedKey {
+function normalizeKey(key: string, schema: Entity, inverse: boolean = false): NormalizedKey {
 	const getKey = inverse ? schema.inverseKey : schema.key;
 	const schemaValue = getKey(key);
 

package/src/request/index.ts

@@ -21,6 +21,11 @@ export function setCustomFetch(httpRequestAPI: any) {
 }
 
 function soapCommandBody(options: RequestOptions) {
+	// If the request body is already the array of actions, return it directly
+	if (Array.isArray(options.body)) {
+		return options.body;
+	}
+
 	return {
 		_jsns: options.namespace || Namespace.Mail,
 		...options.body
@@ -97,15 +102,18 @@ function faultError(response: ParsedResponse, faults: any) {
  */
 function batchBody(requests: ReadonlyArray<RequestOptions>) {
 	const body: { [key: string]: any } = {};
-
 	for (const request of requests) {
 		const key = `${request.name}Request`;
 		const value = soapCommandBody(request);
 
-		if (body[key]) {
-			body[key].push(value);
+		if (!body[key]) {
+			body[key] = [];
+		}
+
+		if (Array.isArray(value)) {
+			body[key].push(...value);
 		} else {
-			body[key] = [value];
+			body[key].push(value);
 		}
 	}
 
@@ -229,15 +237,19 @@ export function jsonRequest(requestOptions: JsonRequestOptions): Promise<Request
 		options.headers['Cookie'] = `ZM_AUTH_TOKEN=${requestOptions.authToken}`;
 	}
 
-	const body = {
-		[soapRequestName]: soapCommandBody(options)
-	};
+	const body =
+		requestOptions.body && requestOptions.body[soapRequestName]
+			? requestOptions.body
+			: { [soapRequestName]: soapCommandBody(options) };
 
 	let fetchOptions;
 
 	if (requestOptions.fetchOptions) {
 		fetchOptions = {
-			signal: requestOptions.fetchOptions.signal
+			signal: requestOptions.fetchOptions.signal,
+			...(requestOptions.fetchOptions.keepalive && {
+				keepalive: requestOptions.fetchOptions.keepalive
+			})
 		};
 	}
 

package/src/request/types.ts

@@ -19,14 +19,14 @@ export interface BaseRequestOptions {
 	authToken?: string;
 	credentials?: RequestCredentials;
 	csrfToken?: string | null;
-	encrypt?: Boolean;
+	encrypt?: boolean;
 	fetchOptions?: any;
 	headers?: any;
 	jwtToken?: string | null;
 	origin?: string;
 	sessionId?: SessionId;
 	sessionSeq?: SessionSeq;
-	sign?: Boolean;
+	sign?: boolean;
 	singleRequest?: boolean;
 	soapPathname?: string;
 	userAgent?: UserAgent;

package/src/schema/generated-schema-types.ts

@@ -1151,6 +1151,11 @@ export type ConversationConditionInput = {
   where?: InputMaybe<Scalars['String']['input']>;
 };
 
+export enum ConversationOrderBy {
+  DateAsc = 'dateAsc',
+  DateDesc = 'dateDesc'
+}
+
 export type CounterAppointmentInput = {
   componentNum?: InputMaybe<Scalars['Int']['input']>;
   id?: InputMaybe<Scalars['ID']['input']>;
@@ -2669,7 +2674,7 @@ export type Mutation = {
   cancelTask?: Maybe<Scalars['Boolean']['output']>;
   changeFolderColor?: Maybe<Scalars['Boolean']['output']>;
   changePassword?: Maybe<AuthResponse>;
-  checkCalendar?: Maybe<ActionOpResponse>;
+  checkCalendars?: Maybe<Array<Maybe<ActionOpResponse>>>;
   contactAction?: Maybe<ActionOpResponse>;
   conversationAction?: Maybe<Scalars['Boolean']['output']>;
   counterAppointment?: Maybe<Scalars['Boolean']['output']>;
@@ -2836,9 +2841,8 @@ export type MutationChangePasswordArgs = {
 };
 
 
-export type MutationCheckCalendarArgs = {
-  id: Scalars['ID']['input'];
-  value: Scalars['Boolean']['input'];
+export type MutationCheckCalendarsArgs = {
+  actions?: InputMaybe<Array<FolderActionCheckCalendarInput>>;
 };
 
 
@@ -3486,6 +3490,7 @@ export type Preferences = {
   zimbraPrefClientType?: Maybe<PrefClientType>;
   zimbraPrefComposeDirection?: Maybe<Scalars['String']['output']>;
   zimbraPrefComposeFormat?: Maybe<Mode>;
+  zimbraPrefConversationOrder?: Maybe<ConversationOrderBy>;
   zimbraPrefDefaultCalendarId?: Maybe<Scalars['ID']['output']>;
   zimbraPrefDelegatedSendSaveTarget?: Maybe<PrefDelegatedSendSaveTarget>;
   zimbraPrefDeleteInviteOnReply?: Maybe<Scalars['Boolean']['output']>;
@@ -3558,6 +3563,7 @@ export type PreferencesInput = {
   zimbraPrefClientType?: InputMaybe<PrefClientType>;
   zimbraPrefComposeDirection?: InputMaybe<Scalars['String']['input']>;
   zimbraPrefComposeFormat?: InputMaybe<Mode>;
+  zimbraPrefConversationOrder?: InputMaybe<ConversationOrderBy>;
   zimbraPrefDefaultCalendarId?: InputMaybe<Scalars['ID']['input']>;
   zimbraPrefDelegatedSendSaveTarget?: InputMaybe<PrefDelegatedSendSaveTarget>;
   zimbraPrefDeleteInviteOnReply?: InputMaybe<Scalars['Boolean']['input']>;

package/src/schema/schema.graphql

@@ -181,6 +181,11 @@ enum AddressType {
 	rf # resent-from
 }
 
+enum ConversationOrderBy {
+	dateAsc
+	dateDesc
+}
+
 # https://github.com/Zimbra/zm-mailbox/blob/develop/store/docs/acl.md
 enum GranteeType {
 	usr # Zimbra User
@@ -1719,6 +1724,7 @@ type Preferences {
 	zimbraPrefPop3DownloadSince: String
 	zimbraPrefPop3IncludeSpam: Boolean
 	zimbraPrefPop3DeleteOption: Pop3DeleteOption
+	zimbraPrefConversationOrder: ConversationOrderBy
 }
 
 type GetAppointmentResponse {
@@ -2673,7 +2679,7 @@ input FolderActionChangeColorInput {
 	color: Int!
 }
 
-# Special case of FolderAction for `checkCalendar` resolver
+# Special case of FolderAction for `checkCalendars` resolver
 input FolderActionCheckCalendarInput {
 	id: ID!
 	value: Boolean
@@ -2809,6 +2815,7 @@ input PreferencesInput {
 	zimbraPrefPop3DownloadSince: String
 	zimbraPrefPop3IncludeSpam: Boolean
 	zimbraPrefPop3DeleteOption: Pop3DeleteOption
+	zimbraPrefConversationOrder: ConversationOrderBy
 }
 
 input ModifyIdentityInput {
@@ -3750,7 +3757,7 @@ type Mutation {
 		content: String
 		contentType: String
 	): ProfileImageChangeResponse
-	checkCalendar(id: ID!, value: Boolean!): ActionOpResponse
+	checkCalendars(actions: [FolderActionCheckCalendarInput!]): [ActionOpResponse]
 	contactAction(
 		id: ID
 		ids: [ID!]

package/src/schema/schema.ts

@@ -283,8 +283,10 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 					client.createMountpoint(variables as CreateMountpointInput),
 				deleteAppointment: (_, { appointment }) =>
 					client.deleteAppointment(appointment as DeleteAppointmentInput),
-				checkCalendar: (_, variables): Promise<ActionOpResponse> =>
-					client.checkCalendar(variables as FolderActionCheckCalendarInput),
+				checkCalendars: (
+					_,
+					variables: { actions: FolderActionCheckCalendarInput[] }
+				): Promise<ActionOpResponse[]> => client.checkCalendars(variables.actions),
 				counterAppointment: (_, { counterAppointmentInvite }) =>
 					client.counterAppointment(counterAppointmentInvite as CounterAppointmentInput),
 				createCalendar: (_, { name, color, url, parentFolderId }) =>
@@ -389,8 +391,8 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 					(context.local ? localStoreClient : client).sendMessage(
 						message as SendMessageInput,
 						accountName as string,
-						sign as Boolean,
-						encrypt as Boolean
+						sign as boolean,
+						encrypt as boolean
 					),
 				saveSMimeCert: (_, { upload, password }) =>
 					client.saveSMimeCert(upload as SaveSMimeCertInputUpload, password as string),

package/src/utils/normalize-attrs-custommetadata.ts

@@ -1,6 +1,6 @@
 export function setCustomMetaDataBody(data: any) {
 	const { attrs, id, section } = data;
-	const customMetaAttrs: Object[] = [];
+	const customMetaAttrs: object[] = [];
 
 	for (const { key, value } of attrs) {
 		customMetaAttrs.push({

package/src/utils/normalize-mime-parts.ts

@@ -1,7 +1,5 @@
 /** List of content type not show as attachment */
 const ignoreContentTypeToShowAsAttachment = [
-	'application/pkcs7-signature',
-	'application/x-pkcs7-signature',
 	'message/delivery-status', // present in Undelivered mail
 	'message/disposition-notification', // present in read-receipt response
 	'xml/x-zimbra-share' // present in folder share message
@@ -87,16 +85,16 @@ export function normalizeMimeParts(
 			if (forcedContentDisposition === 'attachments') {
 				attachment.contentDisposition = 'attachment';
 			} else if (forcedContentDisposition === 'inlineAttachments') {
-				attachment.contentDisposition === 'inline';
+				attachment.contentDisposition = 'inline';
 			}
 		}
 
 		attachment.contentId = attachment.contentId
 			? normalizeCid(attachment.contentId)
 			: ~normalizeType(attachment.contentType).indexOf('image/') &&
-			  attachment.contentDisposition === 'inline'
-			? `AUTO-GEN-CID-${attachment.messageId}-${attachment.part}-${attachment.size}`
-			: undefined;
+				  attachment.contentDisposition === 'inline'
+				? `AUTO-GEN-CID-${attachment.messageId}-${attachment.part}-${attachment.size}`
+				: undefined;
 
 		return attachment;
 	};
@@ -186,6 +184,12 @@ export function normalizeMimeParts(
 			if (!isBody && type.split('/')[0] !== 'multipart') {
 				let mode = isInline ? 'inlineAttachments' : 'attachments';
 
+				// If inline but NOT an image, treat as regular attachment
+				if (isInline && !type.startsWith('image/')) {
+					mode = 'attachments';
+					part.contentDisposition = 'attachment';
+				}
+
 				!ignoreContentTypeToShowAsAttachment.includes(part.contentType) &&
 					(acc[mode] || (acc[mode] = [])).push(processAttachment(part, mode));
 

package/src/utils/normalize-otherAttribute-contact.ts

@@ -96,9 +96,9 @@ const ignoreAttributes = [
 	'vcardXProps',
 	'imagepart'
 ];
-export function createContactBody(data: any, isDesktop: Boolean) {
+export function createContactBody(data: any, isDesktop: boolean) {
 	const { attributes, ...rest } = data;
-	const contactAttrs = <Object[]>[];
+	const contactAttrs = <object[]>[];
 
 	for (const [key, val] of Object.entries(attributes)) {
 		if (key !== 'other') {

package/.prettierrc

@@ -1,6 +0,0 @@
-{
-	"singleQuote": true,
-  "printWidth": 100,
-  "trailingComma": "none",
-	"arrowParens": "avoid"
-}