@zimbra/api-client 71.0.0 → 75.0.0

package/src/schema/schema.ts

@@ -30,6 +30,7 @@ import {
 	PreferencesInput,
 	PropertiesInput,
 	RevokeRightsInput,
+	SaveSMimeCertInputUpload,
 	SearchFolderInput,
 	SendMessageInput,
 	ShareNotificationInput,
@@ -54,6 +55,7 @@ import {
 	ClientInfoInput,
 	CreateFolderOptions,
 	CreateSearchFolderOptions,
+	DiscoverRightOptions,
 	ExternalAccountDeleteInput,
 	ExternalAccountModifyInput,
 	FreeBusyOptions,
@@ -103,7 +105,7 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 				autoComplete: (_, variables) => client.autoComplete(variables as AutoCompleteOptions),
 				autoCompleteGAL: (_, variables) =>
 					client.autoCompleteGAL(variables as AutoCompleteGALOptions),
-				discoverRights: client.discoverRights,
+				discoverRights: (_, variables) => client.discoverRights(variables as DiscoverRightOptions),
 				downloadAttachment: (_, variables) => client.downloadAttachment(variables),
 				downloadDocument: (_, variables) => client.downloadDocument(variables),
 				downloadMessage: (_, variables, context = {}) => {
@@ -169,6 +171,7 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 				getSearchFolder: client.getSearchFolder,
 				getSMimePublicCerts: (_, variables) =>
 					client.getSMimePublicCerts(variables as GetSMimePublicCertsOptions),
+				getSMimeCertInfo: client.getSMimeCertInfo,
 				getTrustedDevices: client.getTrustedDevices,
 				getDeviceStatus: client.getDeviceStatus,
 				getWorkingHours: (_, variables) => client.getWorkingHours(variables as WorkingHoursOptions),
@@ -368,11 +371,15 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 						message as SendMessageInput,
 						accountName as string
 					),
-				sendMessage: (_, { message, accountName }, context = {}) =>
+				sendMessage: (_, { message, accountName, sign = false, encrypt = false }, context = {}) =>
 					(context.local ? localStoreClient : client).sendMessage(
 						message as SendMessageInput,
-						accountName as string
+						accountName as string,
+						sign as Boolean,
+						encrypt as Boolean
 					),
+				saveSMimeCert: (_, { upload, password }) =>
+					client.saveSMimeCert(upload as SaveSMimeCertInputUpload, password as string),
 				sendDeliveryReport: (_, { messageId }) => client.sendDeliveryReport(messageId),
 				uploadMessage: (_, { value }) => client.uploadMessage(value),
 				createTask: (_, { task }) => client.createTask(task as CalendarItemInput),

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

@@ -1,3 +1,12 @@
+/** 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
+];
+
 function normalizeCid(cid: string) {
 	return cid.replace(/[<>]/g, '');
 }
@@ -144,8 +153,7 @@ export function normalizeMimeParts(
 			if (!isBody && type.split('/')[0] !== 'multipart') {
 				let mode = disposition === 'inline' ? 'inlineAttachments' : 'attachments';
 
-				part.contentType !== 'application/pkcs7-signature' &&
-					part.contentType !== 'application/x-pkcs7-signature' &&
+				!ignoreContentTypeToShowAsAttachment.includes(part.contentType) &&
 					(acc[mode] || (acc[mode] = [])).push(processAttachment(part, mode));
 
 				if (isDesktop) {

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

@@ -20,8 +20,6 @@ const supportedContactAttributes = [
 	'workEmail2',
 	'homeEmail',
 	'homeEmail2',
-	'phone',
-	'phone2',
 	'companyPhone',
 	'companyPhone2',
 	'otherPhone',
@@ -65,6 +63,7 @@ const supportedContactAttributes = [
 	'website',
 	'notes',
 	'image',
+	'thumbnailPhoto',
 	'userCertificate',
 	'assistantPhone',
 	'callbackPhone',
@@ -79,7 +78,26 @@ const supportedContactAttributes = [
 	'fileAs',
 	'type'
 ];
-export function createContactBody(data: any) {
+
+const ignoreAttributes = [
+	'modifyTimeStamp',
+	'createTimeStamp',
+	'zimbraId',
+	'objectClass',
+	'zimbraMailForwardingAddress',
+	'zimbraAccountCalendarUserType',
+	'zimbraCalResLocationDisplayName',
+	'zimbraCalResType',
+	'cardOwner',
+	'homeCardMessage',
+	'homePhotoURL',
+	'workCardMessage',
+	'workPhotoURL',
+	'firstLast',
+	'vcardXProps',
+	'imagepart'
+];
+export function createContactBody(data: any, isDesktop: Boolean) {
 	const { attributes, ...rest } = data;
 	const contactAttrs = <Object[]>[];
 
@@ -87,7 +105,7 @@ export function createContactBody(data: any) {
 		key !== 'other'
 			? contactAttrs.push({
 					name: key,
-					[key === 'image' ? 'aid' : 'content']: val
+					[key === 'image' || (!isDesktop && key === 'userCertificate') ? 'aid' : 'content']: val
 			  })
 			: forEach(val, otherValue =>
 					contactAttrs.push({
@@ -129,7 +147,7 @@ export function normalizeOtherAttr(data: any) {
 		}
 
 		Object.keys(contact._attrs)
-			.filter(key => !supportedContactAttributes.includes(key))
+			.filter(key => !supportedContactAttributes.includes(key) && !ignoreAttributes.includes(key))
 			.forEach(
 				key =>
 					typeof contact._attrs[key] === 'string' &&