@zimbra/api-client 74.0.0 → 77.0.0

package/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zimbra/api-client",
-	"version": "74.0.0",
+	"version": "77.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@zimbra/api-client",
   "amdName": "zmApiJsClient",
-  "version": "74.0.0",
+  "version": "77.0.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",

package/src/batch-client/index.ts

@@ -819,7 +819,8 @@ export class ZimbraBatchClient {
 		password,
 		authToken,
 		twoFactorCode,
-		csrfTokenSecured
+		csrfTokenSecured,
+		ignoreSameSite
 	}: EnableTwoFactorAuthInput) =>
 		this.jsonRequest({
 			name: 'EnableTwoFactorAuth',
@@ -842,6 +843,7 @@ export class ZimbraBatchClient {
 						_content: twoFactorCode
 					}
 				}),
+				...(ignoreSameSite && { ignoreSameSite }),
 				csrfTokenSecured
 			},
 			namespace: Namespace.Account,
@@ -1324,7 +1326,8 @@ export class ZimbraBatchClient {
 		persistAuthTokenCookie,
 		twoFactorCode,
 		deviceTrusted,
-		csrfTokenSecured
+		csrfTokenSecured,
+		ignoreSameSite
 	}: LoginOptions) =>
 		this.jsonRequest({
 			name: 'Auth',
@@ -1337,6 +1340,7 @@ export class ZimbraBatchClient {
 					by: 'name',
 					_content: username
 				},
+				...(ignoreSameSite && { ignoreSameSite }),
 				...(password && { password }),
 				...(recoveryCode && {
 					recoveryCode: {

package/src/batch-client/types.ts

@@ -244,6 +244,7 @@ export interface ModifyProfileImageOptions {
 export interface LoginOptions {
 	csrfTokenSecured: boolean;
 	deviceTrusted?: boolean;
+	ignoreSameSite?: boolean;
 	password: string;
 	persistAuthTokenCookie?: boolean;
 	recoveryCode?: string;

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

@@ -83,6 +83,7 @@ export type AccountInfoAttrs = {
   zimbraDomainTrialExpirationDate?: Maybe<Scalars['String']>;
   zimbraDumpsterEnabled?: Maybe<Scalars['Boolean']>;
   zimbraExternalSharingEnabled?: Maybe<Scalars['Boolean']>;
+  zimbraFeatureAntispamEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureAppSpecificPasswordsEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureBriefcasesEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureCalendarEnabled?: Maybe<Scalars['Boolean']>;
@@ -108,6 +109,7 @@ export type AccountInfoAttrs = {
   zimbraFeatureResetPasswordStatus?: Maybe<ResetPasswordStatus>;
   zimbraFeatureSharingEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureTaggingEnabled?: Maybe<Scalars['Boolean']>;
+  zimbraFeatureTasksEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureTrustedDevicesEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureTwoFactorAuthAvailable?: Maybe<Scalars['Boolean']>;
   zimbraFeatureTwoFactorAuthRequired?: Maybe<Scalars['Boolean']>;
@@ -887,8 +889,7 @@ export type ContactAttributes = {
   otherURL?: Maybe<Scalars['String']>;
   pager?: Maybe<Scalars['String']>;
   pager2?: Maybe<Scalars['String']>;
-  phone?: Maybe<Scalars['String']>;
-  phone2?: Maybe<Scalars['String']>;
+  phoneticCompany?: Maybe<Scalars['String']>;
   phoneticFirstName?: Maybe<Scalars['String']>;
   phoneticLastName?: Maybe<Scalars['String']>;
   thumbnailPhoto?: Maybe<Scalars['String']>;
@@ -966,8 +967,7 @@ export type ContactAttrsInput = {
   otherURL?: Maybe<Scalars['String']>;
   pager?: Maybe<Scalars['String']>;
   pager2?: Maybe<Scalars['String']>;
-  phone?: Maybe<Scalars['String']>;
-  phone2?: Maybe<Scalars['String']>;
+  phoneticCompany?: Maybe<Scalars['String']>;
   phoneticFirstName?: Maybe<Scalars['String']>;
   phoneticLastName?: Maybe<Scalars['String']>;
   type?: Maybe<Scalars['String']>;
@@ -1129,7 +1129,7 @@ export type Cursor = {
   endSortVal?: Maybe<Scalars['String']>;
   id?: Maybe<Scalars['ID']>;
   includeOffset?: Maybe<Scalars['Boolean']>;
-  sortField?: Maybe<Scalars['String']>;
+  sortVal?: Maybe<Scalars['String']>;
 };
 
 export type CustomMetadata = {
@@ -1326,6 +1326,7 @@ export type EmailAddressInput = {
 export type EnableTwoFactorAuthInput = {
   authToken?: Maybe<Scalars['String']>;
   csrfTokenSecured: Scalars['Boolean'];
+  ignoreSameSite?: Maybe<Scalars['Boolean']>;
   name: Scalars['String'];
   password?: Maybe<Scalars['String']>;
   twoFactorCode?: Maybe<Scalars['String']>;
@@ -2749,6 +2750,7 @@ export type MutationItemActionArgs = {
 export type MutationLoginArgs = {
   csrfTokenSecured: Scalars['Boolean'];
   deviceTrusted?: Maybe<Scalars['Boolean']>;
+  ignoreSameSite?: Maybe<Scalars['Boolean']>;
   password?: Maybe<Scalars['String']>;
   persistAuthTokenCookie?: Maybe<Scalars['Boolean']>;
   recoveryCode?: Maybe<Scalars['String']>;

package/src/schema/schema.graphql

@@ -1344,6 +1344,7 @@ type AccountInfoAttrs {
 	zimbraFeatureDocumentEditingEnabled: Boolean
 	zimbraTwoFactorAuthEnabled: Boolean
 	zimbraFeatureTrustedDevicesEnabled: Boolean
+	zimbraFeatureAntispamEnabled: Boolean
 	zimbraFeatureAppSpecificPasswordsEnabled: Boolean
 	zimbraFeatureMailPriorityEnabled: Boolean
 	zimbraFileUploadMaxSize: Float
@@ -1361,6 +1362,7 @@ type AccountInfoAttrs {
 	zimbraFeaturePop3DataSourceEnabled: Boolean
 	zimbraSignupAffiliate: String
 	zimbraSignupRecoveryEmail: String
+	zimbraFeatureTasksEnabled: Boolean
 	zimbraTrialExpirationDate: String
 	zimbraTrialConvertAtExpiration: Boolean
 	zimbraHierarchicalAddressBookRoot: String
@@ -1655,6 +1657,7 @@ type OtherContactAttribute {
 type ContactAttributes {
 	firstName: String
 	phoneticFirstName: String
+	phoneticCompany: String
 	middleName: String
 	lastName: String
 	phoneticLastName: String
@@ -1668,8 +1671,6 @@ type ContactAttributes {
 	workEmail2: String
 	homeEmail: String
 	homeEmail2: String
-	phone: String
-	phone2: String
 	companyPhone: String
 	companyPhone2: String
 	otherPhone: String
@@ -1761,6 +1762,7 @@ input OtherContactAttributeInput {
 input ContactAttrsInput {
 	firstName: String
 	phoneticFirstName: String
+	phoneticCompany: String
 	middleName: String
 	lastName: String
 	phoneticLastName: String
@@ -1774,8 +1776,6 @@ input ContactAttrsInput {
 	workEmail2: String
 	homeEmail: String
 	homeEmail2: String
-	phone: String
-	phone2: String
 	companyPhone: String
 	companyPhone2: String
 	otherPhone: String
@@ -2838,6 +2838,7 @@ input EnableTwoFactorAuthInput {
 	twoFactorCode: String
 	authToken: String
 	csrfTokenSecured: Boolean!
+	ignoreSameSite: Boolean
 }
 
 input ExternalAccountImportInput {
@@ -2861,7 +2862,7 @@ input GetDocumentShareURLItemInput {
 
 input Cursor {
 	id: ID
-	sortField: String
+	sortVal: String
 	endSortVal: String
 	includeOffset: Boolean
 }
@@ -3461,6 +3462,7 @@ type Mutation {
 		twoFactorCode: String
 		deviceTrusted: Boolean
 		csrfTokenSecured: Boolean!
+		ignoreSameSite: Boolean
 	): AuthResponse
 	enableTwoFactorAuth(
 		options: EnableTwoFactorAuthInput!

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

@@ -7,6 +7,8 @@ const ignoreContentTypeToShowAsAttachment = [
 	'xml/x-zimbra-share' // present in folder share message
 ];
 
+const MORE_TEXT_TYPES = ['text/rfc822-headers'];
+
 function normalizeCid(cid: string) {
 	return cid.replace(/[<>]/g, '');
 }
@@ -107,11 +109,11 @@ export function normalizeMimeParts(
 			// obey scapi's isBody flag:
 			if (isBody) acc.body = content;
 
+			const isInline = disposition === 'inline';
+
 			// if not explicitly an attachment, discover html/text body:
 			if (disposition !== 'attachment') {
-				let bodyType = type === 'text/html' ? 'html' : type === 'text/plain' && 'text';
-
-				if (~type.indexOf('image/') && disposition === 'inline' && !part.contentId) {
+				if (isInline && ~type.indexOf('image/') && !part.contentId) {
 					/**
 					 * Different email clients work in different ways.
 					 * E.g. iOS email client doesn't put `contentId` for image inline attachments when there are other type (normal) of attachments as well in email body.
@@ -129,29 +131,24 @@ export function normalizeMimeParts(
 					);
 
 					acc['html'] = acc['text']; // And then update `html` part so that we render `html` in `viewer`.
-				} else if (
-					//bodyType can be either 'text/html' or 'text/plain' so to handle such inline attachments the below condition is added
-					part.filename &&
-					bodyType &&
-					disposition === 'inline'
-				) {
-					(acc['inlineAttachments'] || (acc['inlineAttachments'] = [])).concat(
-						processAttachment(part)
-					);
-				} else if (bodyType && (!acc[bodyType] || disposition !== 'inline')) {
-					if ((bodyType === 'html' || bodyType === 'text') && acc[bodyType]) {
-						acc[bodyType] = acc[bodyType].concat(content);
-					} else {
-						acc[bodyType] = content;
+				} else {
+					const isTextType = MORE_TEXT_TYPES.includes(type);
+					let bodyType =
+						type === 'text/html' ? 'html' : (type === 'text/plain' || isTextType) && 'text';
+
+					if (bodyType) {
+						//bodyType can be either 'text/html' or 'text/plain' so to handle such inline attachments the below condition is added
+						if (!(part.filename && isTextType && isInline)) {
+							isBody = true;
+						}
+						acc[bodyType] = (acc[bodyType] || '').concat(content);
 					}
-
-					isBody = true;
 				}
 			}
 
 			// remaining non-body, non-enclosure parts are attachments:
 			if (!isBody && type.split('/')[0] !== 'multipart') {
-				let mode = disposition === 'inline' ? 'inlineAttachments' : 'attachments';
+				let mode = isInline ? 'inlineAttachments' : 'attachments';
 
 				!ignoreContentTypeToShowAsAttachment.includes(part.contentType) &&
 					(acc[mode] || (acc[mode] = [])).push(processAttachment(part, mode));

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

@@ -7,6 +7,7 @@ import { ContactInputRequest } from '../normalize/entities';
 const supportedContactAttributes = [
 	'firstName',
 	'phoneticFirstName',
+	'phoneticCompany',
 	'middleName',
 	'lastName',
 	'phoneticLastName',
@@ -20,8 +21,6 @@ const supportedContactAttributes = [
 	'workEmail2',
 	'homeEmail',
 	'homeEmail2',
-	'phone',
-	'phone2',
 	'companyPhone',
 	'companyPhone2',
 	'otherPhone',