@zimbra/api-client 73.0.0 → 76.0.0

package/package-lock.json

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

package/package.json

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

@@ -44,6 +44,7 @@ import {
 	SearchResponse,
 	SendMessageInfo,
 	ShareNotification,
+	SmimeCertInfoResponse,
 	Tag,
 	ZimletConfigEntity
 } from '../normalize/entities';
@@ -82,6 +83,7 @@ import {
 	ModifyIdentityInput,
 	PreferencesInput,
 	RevokeRightsInput,
+	SaveSMimeCertInputUpload,
 	SearchFolderInput,
 	SendMessageInput,
 	ShareNotificationInput,
@@ -118,6 +120,7 @@ import {
 	ChangePasswordOptions,
 	CreateFolderOptions,
 	CreateSearchFolderOptions,
+	DiscoverRightOptions,
 	ExternalAccountDeleteInput,
 	ExternalAccountModifyInput,
 	FreeBusyOptions,
@@ -155,10 +158,8 @@ function normalizeMessage(
 	message: { [key: string]: any },
 	{ origin, jwtToken, isDesktop }: { isDesktop?: string; jwtToken?: string; origin?: string }
 ) {
-	const normalizedMessage = normalize(MessageInfo)(message);
-	normalizedMessage.attributes =
-		normalizedMessage.attributes &&
-		mapValuesDeep(normalizedMessage.attributes, coerceStringToBoolean);
+	let normalizedMessage = normalize(MessageInfo)(message);
+	normalizedMessage = normalizedMessage && mapValuesDeep(normalizedMessage, coerceStringToBoolean);
 
 	return normalizeEmailAddresses(
 		normalizeMimeParts(normalizedMessage, { origin, jwtToken, isDesktop })
@@ -589,7 +590,7 @@ export class ZimbraBatchClient {
 	public createContact = (data: CreateContactInput) =>
 		this.jsonRequest({
 			name: 'CreateContact',
-			body: createContactBody(data),
+			body: createContactBody(data, this.localStoreClient !== undefined),
 			singleRequest: true
 		}).then(res => normalize(Contact)(normalizeOtherAttr(res.cn)[0]));
 
@@ -753,19 +754,12 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		}).then(Boolean);
 
-	public discoverRights = () =>
+	public discoverRights = ({ right }: DiscoverRightOptions) =>
 		this.jsonRequest({
 			name: 'DiscoverRights',
 			namespace: Namespace.Account,
 			body: {
-				right: [
-					{
-						_content: 'sendAs'
-					},
-					{
-						_content: 'sendOnBehalfOf'
-					}
-				]
+				right
 			}
 		}).then(res => normalize(DiscoverRightsResponse)(res));
 
@@ -1156,7 +1150,7 @@ export class ZimbraBatchClient {
 					needExp: 1,
 					neuter: 0,
 					// max body length (look for mp.truncated=1)
-					max: max || 250000,
+					...(max && { max: max }),
 					raw: raw ? 1 : 0,
 					...(ridZ && { ridZ: ridZ }),
 					...(part && { part: part })
@@ -1233,6 +1227,12 @@ export class ZimbraBatchClient {
 			namespace: Namespace.Account
 		}).then(res => mapValuesDeep(res, coerceStringToBoolean));
 
+	public getSMimeCertInfo = () =>
+		this.jsonRequest({
+			name: 'GetSmimeCertificateInfo',
+			namespace: Namespace.Account
+		}).then(certificate => normalize(SmimeCertInfoResponse)(certificate || {}));
+
 	public getSMimePublicCerts = (options: GetSMimePublicCertsOptions) =>
 		this.jsonRequest({
 			name: 'GetSMIMEPublicCerts',
@@ -1374,7 +1374,7 @@ export class ZimbraBatchClient {
 	public modifyContact = (data: ModifyContactInput) =>
 		this.jsonRequest({
 			name: 'ModifyContact',
-			body: createContactBody(data),
+			body: createContactBody(data, this.localStoreClient !== undefined),
 			singleRequest: true
 		}).then(res => normalize(Contact)(normalizeOtherAttr(res.cn)[0]));
 
@@ -1645,6 +1645,16 @@ export class ZimbraBatchClient {
 			message: messages && messages.map(this.normalizeMessage)
 		}));
 
+	public saveSMimeCert = (upload: SaveSMimeCertInputUpload, password: string) =>
+		this.jsonRequest({
+			name: 'SaveSmimeCertificate',
+			body: {
+				upload,
+				password
+			},
+			namespace: Namespace.Account
+		}).then(certificate => normalize(SmimeCertInfoResponse)(certificate || {}));
+
 	public search = (options: SearchOptions) =>
 		this.jsonRequest({
 			name: 'Search',
@@ -1674,7 +1684,12 @@ export class ZimbraBatchClient {
 			name: 'SearchGal',
 			body: options,
 			namespace: Namespace.Account
-		}).then(normalize(SearchResponse));
+		}).then(res => {
+			if (res.cn) {
+				res.cn = normalizeOtherAttr(res.cn);
+			}
+			return normalize(SearchResponse)(res);
+		});
 
 	public sendDeliveryReport = (messageId: string) =>
 		this.jsonRequest({
@@ -1694,10 +1709,19 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		}).then(res => normalize(CalendarItemHitInfo)(res));
 
-	public sendMessage = (message: SendMessageInput, accountName: string) =>
+	public sendMessage = (
+		message: SendMessageInput,
+		accountName: string,
+		sign: Boolean,
+		encrypt: Boolean
+	) =>
 		this.jsonRequest({
-			name: 'SendMsg',
-			body: denormalize(SendMessageInfo)({ message }),
+			name: !(sign || encrypt) ? 'SendMsg' : 'SendSecureMsg',
+			body: {
+				...denormalize(SendMessageInfo)({ message }),
+				...(sign && { sign: true }),
+				...(encrypt && { encrypt: true })
+			},
 			singleRequest: true,
 			accountName: accountName
 		}).then(normalize(SendMessageInfo));

package/src/batch-client/types.ts

@@ -365,3 +365,10 @@ export interface NoOpOptions {
 	limitToOneBlocked: number;
 	wait: number;
 }
+
+export interface DiscoverRightInput {
+	_content: string;
+}
+export interface DiscoverRightOptions {
+	right: Array<DiscoverRightInput>;
+}

package/src/normalize/entities.ts

@@ -13,9 +13,7 @@ const MimePart = new Entity({
 	cl: 'contentLocation',
 	ct: 'contentType',
 	s: 'size',
-	part: 'part',
-	mid: 'messageId',
-	content: 'content'
+	mid: 'messageId'
 });
 
 const CalendarItemAlarmTriggerRelative = new Entity({
@@ -201,6 +199,43 @@ MimePart.addMapping({
 	attach: ['attachments', AttachmentsInfo]
 });
 
+const SmimeCertsSubjectRfc822Name = new Entity({
+	_content: 'content'
+});
+
+const SmimeCertsSubjectAltName = new Entity({
+	rfc822Name: ['rfc822Name', SmimeCertsSubjectRfc822Name]
+});
+
+const commonSmimeCertsFields = {
+	c: 'country',
+	cn: 'commonName',
+	o: 'organizationName',
+	st: 'state'
+};
+
+const SmimeCertsIssuedBy = new Entity({
+	...commonSmimeCertsFields,
+	l: 'locality'
+});
+
+const SmimeCertsIssuedTo = new Entity({
+	...commonSmimeCertsFields,
+	ou: 'organizationUnit'
+});
+
+const SmimeCert = new Entity({
+	issuedBy: ['issuedBy', SmimeCertsIssuedBy],
+	issuedTo: ['issuedTo', SmimeCertsIssuedTo],
+	pubCertId: 'publicCertificateId',
+	pvtKeyId: 'privateKeyId',
+	subjectAltName: ['subjectAltName', SmimeCertsSubjectAltName]
+});
+
+export const SmimeCertInfoResponse = new Entity({
+	certificate: ['certificates', SmimeCert]
+});
+
 const commonMailItemFields = {
 	...commonMessageFields,
 	e: ['emailAddresses', MailItemEmailAddress],
@@ -210,7 +245,8 @@ const commonMailItemFields = {
 	su: 'subject',
 	origid: 'origId',
 	attach: ['attachments', AttachmentsInfo],
-	rt: 'replyType'
+	rt: 'replyType',
+	certificate: ['certificate', SmimeCert]
 };
 
 const SendMessageFields = new Entity({
@@ -446,7 +482,8 @@ const contactFields = {
 	sf: 'sortField',
 	t: 'tags',
 	tn: 'tagNames',
-	_attrs: ['attributes', ContactAttributes]
+	_attrs: ['attributes', ContactAttributes],
+	certificate: ['certificate', SmimeCert]
 };
 
 const contactListMembers = new Entity({

package/src/request/types.ts

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

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']>;
@@ -817,6 +819,7 @@ export enum ConnectionType {
 export type Contact = {
   __typename?: 'Contact';
   attributes?: Maybe<ContactAttributes>;
+  certificate?: Maybe<Array<Maybe<SmimeCert>>>;
   date?: Maybe<Scalars['Float']>;
   fileAsStr?: Maybe<Scalars['String']>;
   folderId?: Maybe<Scalars['ID']>;
@@ -886,8 +889,6 @@ export type ContactAttributes = {
   otherURL?: Maybe<Scalars['String']>;
   pager?: Maybe<Scalars['String']>;
   pager2?: Maybe<Scalars['String']>;
-  phone?: Maybe<Scalars['String']>;
-  phone2?: Maybe<Scalars['String']>;
   phoneticFirstName?: Maybe<Scalars['String']>;
   phoneticLastName?: Maybe<Scalars['String']>;
   thumbnailPhoto?: Maybe<Scalars['String']>;
@@ -965,8 +966,6 @@ export type ContactAttrsInput = {
   otherURL?: Maybe<Scalars['String']>;
   pager?: Maybe<Scalars['String']>;
   pager2?: Maybe<Scalars['String']>;
-  phone?: Maybe<Scalars['String']>;
-  phone2?: Maybe<Scalars['String']>;
   phoneticFirstName?: Maybe<Scalars['String']>;
   phoneticLastName?: Maybe<Scalars['String']>;
   type?: Maybe<Scalars['String']>;
@@ -1128,7 +1127,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 = {
@@ -1234,6 +1233,10 @@ export type Device = {
   ua?: Maybe<Scalars['String']>;
 };
 
+export type DiscoverRightInput = {
+  _content?: Maybe<Scalars['String']>;
+};
+
 export type DiscoverRights = {
   __typename?: 'DiscoverRights';
   targets?: Maybe<Array<Maybe<Targets>>>;
@@ -2222,9 +2225,11 @@ export type MessageInfo = MailItem & {
   autoSendTime?: Maybe<Scalars['Float']>;
   bcc?: Maybe<Array<Maybe<EmailAddress>>>;
   cc?: Maybe<Array<Maybe<EmailAddress>>>;
+  certificate?: Maybe<Array<Maybe<SmimeCert>>>;
   changeDate?: Maybe<Scalars['Float']>;
   conversationId?: Maybe<Scalars['ID']>;
   date?: Maybe<Scalars['Float']>;
+  decryptionErrorCode?: Maybe<Scalars['String']>;
   emailAddresses?: Maybe<Array<Maybe<EmailAddress>>>;
   excerpt?: Maybe<Scalars['String']>;
   flags?: Maybe<Scalars['String']>;
@@ -2234,6 +2239,8 @@ export type MessageInfo = MailItem & {
   id?: Maybe<Scalars['ID']>;
   inlineAttachments?: Maybe<Array<Maybe<MimePart>>>;
   invitations?: Maybe<Array<Maybe<InviteInfo>>>;
+  isEncrypted?: Maybe<Scalars['Boolean']>;
+  isSigned?: Maybe<Scalars['Boolean']>;
   local?: Maybe<Scalars['Boolean']>;
   mimeParts?: Maybe<Array<Maybe<MimePart>>>;
   modifiedSequence?: Maybe<Scalars['Float']>;
@@ -2287,6 +2294,7 @@ export type MimePart = {
   mimeParts?: Maybe<Array<Maybe<MimePart>>>;
   part?: Maybe<Scalars['ID']>;
   size?: Maybe<Scalars['Float']>;
+  truncated?: Maybe<Scalars['Boolean']>;
   url?: Maybe<Scalars['String']>;
 };
 
@@ -2303,6 +2311,7 @@ export type MimePartInput = {
   mimeParts?: Maybe<Array<Maybe<MimePartInput>>>;
   part?: Maybe<Scalars['ID']>;
   size?: Maybe<Scalars['Float']>;
+  truncated?: Maybe<Scalars['Boolean']>;
   url?: Maybe<Scalars['String']>;
 };
 
@@ -2449,6 +2458,7 @@ export type Mutation = {
   revokeTrustedDevice?: Maybe<Scalars['Boolean']>;
   saveDocument?: Maybe<SaveDocumentResponse>;
   saveDraft?: Maybe<SaveDraftResponse>;
+  saveSMimeCert?: Maybe<SmimeCertInfoResponse>;
   sendDeliveryReport?: Maybe<Scalars['Boolean']>;
   sendInviteReply?: Maybe<InviteReplyResponse>;
   sendMessage?: Maybe<SendMessageResponse>;
@@ -2909,6 +2919,12 @@ export type MutationSaveDraftArgs = {
 };
 
 
+export type MutationSaveSMimeCertArgs = {
+  password?: Maybe<Scalars['String']>;
+  upload: SaveSMimeCertInputUpload;
+};
+
+
 export type MutationSendDeliveryReportArgs = {
   messageId: Scalars['ID'];
 };
@@ -2921,7 +2937,9 @@ export type MutationSendInviteReplyArgs = {
 
 export type MutationSendMessageArgs = {
   accountName?: Maybe<Scalars['String']>;
+  encrypt?: Maybe<Scalars['Boolean']>;
   message: SendMessageInput;
+  sign?: Maybe<Scalars['Boolean']>;
 };
 
 
@@ -3283,6 +3301,7 @@ export type Query = {
   getPreferences?: Maybe<Preferences>;
   getReminders?: Maybe<RemindersResponse>;
   getRights?: Maybe<RightsResponse>;
+  getSMimeCertInfo?: Maybe<SmimeCertInfoResponse>;
   getSMimePublicCerts?: Maybe<SMimePublicCertsResponse>;
   getScratchCodes?: Maybe<ScratchCodes>;
   getSearchFolder?: Maybe<Folder>;
@@ -3326,6 +3345,11 @@ export type QueryClientInfoArgs = {
 };
 
 
+export type QueryDiscoverRightsArgs = {
+  right: Array<DiscoverRightInput>;
+};
+
+
 export type QueryDownloadAttachmentArgs = {
   id: Scalars['ID'];
   part: Scalars['ID'];
@@ -3468,6 +3492,11 @@ export type QueryGetRightsArgs = {
 };
 
 
+export type QueryGetSMimeCertInfoArgs = {
+  certId?: Maybe<Scalars['String']>;
+};
+
+
 export type QueryGetSMimePublicCertsArgs = {
   contactAddr: Scalars['String'];
   store: Scalars['String'];
@@ -3766,6 +3795,10 @@ export type SaveMessageDataInput = {
   meta: Scalars['String'];
 };
 
+export type SaveSMimeCertInputUpload = {
+  id?: Maybe<Scalars['String']>;
+};
+
 export type ScratchCode = {
   __typename?: 'ScratchCode';
   scratchCode?: Maybe<Array<Maybe<ScratchCodeType>>>;
@@ -3984,6 +4017,67 @@ export type Skin = {
   _content?: Maybe<Scalars['String']>;
 };
 
+export type SmimeCert = {
+  __typename?: 'SmimeCert';
+  default?: Maybe<Scalars['Boolean']>;
+  emailAddress?: Maybe<Scalars['String']>;
+  errorCode?: Maybe<Scalars['String']>;
+  issuedBy?: Maybe<SmimeCertIssuedBy>;
+  issuedTo?: Maybe<SmimeCertIssuedTo>;
+  privateKeyId?: Maybe<Scalars['String']>;
+  publicCertificateId?: Maybe<Scalars['String']>;
+  signature?: Maybe<SmimeCertSignature>;
+  subjectAltName?: Maybe<SmimeCertSubjectAltName>;
+  validity?: Maybe<SmimeCertValidity>;
+};
+
+export type SmimeCertInfoResponse = {
+  __typename?: 'SmimeCertInfoResponse';
+  certificates?: Maybe<Array<Maybe<SmimeCert>>>;
+};
+
+export type SmimeCertIssuedBy = {
+  __typename?: 'SmimeCertIssuedBy';
+  commonName?: Maybe<Scalars['String']>;
+  country?: Maybe<Scalars['String']>;
+  emailAddress?: Maybe<Scalars['String']>;
+  locality?: Maybe<Scalars['String']>;
+  organizationName?: Maybe<Scalars['String']>;
+  state?: Maybe<Scalars['String']>;
+};
+
+export type SmimeCertIssuedTo = {
+  __typename?: 'SmimeCertIssuedTo';
+  commonName?: Maybe<Scalars['String']>;
+  country?: Maybe<Scalars['String']>;
+  emailAddress?: Maybe<Scalars['String']>;
+  organizationName?: Maybe<Scalars['String']>;
+  organizationUnit?: Maybe<Scalars['String']>;
+  state?: Maybe<Scalars['String']>;
+};
+
+export type SmimeCertSignature = {
+  __typename?: 'SmimeCertSignature';
+  algorithm?: Maybe<Scalars['String']>;
+  serialNo?: Maybe<Scalars['String']>;
+};
+
+export type SmimeCertSubjectAltName = {
+  __typename?: 'SmimeCertSubjectAltName';
+  rfc822Name?: Maybe<Array<Maybe<SmimeCertSubjectRfc822Name>>>;
+};
+
+export type SmimeCertSubjectRfc822Name = {
+  __typename?: 'SmimeCertSubjectRfc822Name';
+  content?: Maybe<Scalars['String']>;
+};
+
+export type SmimeCertValidity = {
+  __typename?: 'SmimeCertValidity';
+  endDate?: Maybe<Scalars['Float']>;
+  startDate?: Maybe<Scalars['Float']>;
+};
+
 export type SnoozeInput = {
   id: Scalars['ID'];
   until: Scalars['Float'];

package/src/schema/schema.graphql

@@ -513,6 +513,8 @@ type MessageInfo implements MailItem {
 	modifiedSequence: Float # ms
 	invitations: [InviteInfo] # inv
 	sortField: String # sf, Sort field used for cursor-based pagination
+	decryptionErrorCode: String
+	certificate: [SmimeCert]
 	mimeParts: [MimePart]
 	to: [EmailAddress]
 	from: [EmailAddress]
@@ -527,6 +529,8 @@ type MessageInfo implements MailItem {
 	share: [ShareNotification] # shr
 	replyType: String #rt
 	attributes: MessageAttributes
+	isEncrypted: Boolean
+	isSigned: Boolean
 	autoSendTime: Float
 	local: Boolean
 	part: String
@@ -1340,6 +1344,7 @@ type AccountInfoAttrs {
 	zimbraFeatureDocumentEditingEnabled: Boolean
 	zimbraTwoFactorAuthEnabled: Boolean
 	zimbraFeatureTrustedDevicesEnabled: Boolean
+	zimbraFeatureAntispamEnabled: Boolean
 	zimbraFeatureAppSpecificPasswordsEnabled: Boolean
 	zimbraFeatureMailPriorityEnabled: Boolean
 	zimbraFileUploadMaxSize: Float
@@ -1357,6 +1362,7 @@ type AccountInfoAttrs {
 	zimbraFeaturePop3DataSourceEnabled: Boolean
 	zimbraSignupAffiliate: String
 	zimbraSignupRecoveryEmail: String
+	zimbraFeatureTasksEnabled: Boolean
 	zimbraTrialExpirationDate: String
 	zimbraTrialConvertAtExpiration: Boolean
 	zimbraHierarchicalAddressBookRoot: String
@@ -1640,6 +1646,7 @@ type Contact {
 	tagNames: String # tn
 	attributes: ContactAttributes
 	members: [ContactListMember]
+	certificate: [SmimeCert]
 }
 
 type OtherContactAttribute {
@@ -1663,8 +1670,6 @@ type ContactAttributes {
 	workEmail2: String
 	homeEmail: String
 	homeEmail2: String
-	phone: String
-	phone2: String
 	companyPhone: String
 	companyPhone2: String
 	otherPhone: String
@@ -1769,8 +1774,6 @@ input ContactAttrsInput {
 	workEmail2: String
 	homeEmail: String
 	homeEmail2: String
-	phone: String
-	phone2: String
 	companyPhone: String
 	companyPhone2: String
 	otherPhone: String
@@ -1976,6 +1979,7 @@ type MimePart {
 	url: String
 	messageId: ID
 	base64: String
+	truncated: Boolean
 }
 
 type ActionData {
@@ -2002,7 +2006,8 @@ input MimePartInput {
 	url: String
 	messageId: ID
 	attachments: [AttachmentInput]
-	base64: String
+	base64: String,
+	truncated: Boolean
 }
 
 input ExistingAttachmentInput {
@@ -2112,6 +2117,10 @@ input SendMessageInput {
 	inlineAttachments: [MimePartInput] #attach
 }
 
+input SaveSMimeCertInputUpload {
+	id: String
+}
+
 input CalendarItemInviteInput {
 	components: [CalendarItemInviteComponentInput]!
 }
@@ -2850,7 +2859,7 @@ input GetDocumentShareURLItemInput {
 
 input Cursor {
 	id: ID
-	sortField: String
+	sortVal: String
 	endSortVal: String
 	includeOffset: Boolean
 }
@@ -2988,6 +2997,59 @@ type SMimePublicCertsResponse {
 	certs: [SMimePublicCerts]
 }
 
+type SmimeCertIssuedBy {
+	country: String
+	commonName: String
+	emailAddress: String
+	locality: String
+	organizationName: String
+	state: String
+}
+
+type SmimeCertIssuedTo {
+	country: String
+	commonName: String
+	emailAddress: String
+	organizationName: String
+	organizationUnit: String
+	state: String
+}
+
+type SmimeCertSignature {
+	algorithm: String
+	serialNo: String
+}
+
+type SmimeCertSubjectRfc822Name {
+	content: String
+}
+
+type SmimeCertSubjectAltName {
+	rfc822Name: [SmimeCertSubjectRfc822Name]
+}
+
+type SmimeCertValidity {
+	endDate: Float
+	startDate: Float
+}
+
+type SmimeCert {
+	default: Boolean
+	emailAddress: String
+	issuedBy: SmimeCertIssuedBy
+	issuedTo: SmimeCertIssuedTo
+	publicCertificateId: String
+	privateKeyId: String
+	signature: SmimeCertSignature
+	subjectAltName: SmimeCertSubjectAltName
+	validity: SmimeCertValidity
+	errorCode: String
+}
+
+type SmimeCertInfoResponse {
+	certificates: [SmimeCert]
+}
+
 type SMimeMessage {
 	id: ID
 	content: String
@@ -3095,6 +3157,10 @@ input SearchConditionsInput {
 	conds: ConditionsInput
 }
 
+input DiscoverRightInput {
+	_content: String
+}
+
 # Zimbra GraphQL Queries
 # - [[SOAP API Reference]](https://files.zimbra.com/docs/soap_api/8.7.11/api-reference/index.html)
 # - [[SOAP Documentation]](https://github.com/Zimbra/zm-mailbox/blob/develop/store/docs/soap.txt)
@@ -3118,7 +3184,7 @@ type Query {
 	downloadMessage(id: ID!, isSecure: Boolean, isLocal: Boolean): SMimeMessage
 	downloadAttachment(id: ID!, part: ID!): Attachment
 	downloadDocument(id: ID!, url: String!): Attachment
-	discoverRights: DiscoverRights
+	discoverRights(right: [DiscoverRightInput!]!): DiscoverRights
 	freeBusy(names: [String!]!, start: Float, end: Float): [FreeBusy]
 	getContact(
 		id: ID
@@ -3205,6 +3271,7 @@ type Query {
 		contactAddr: String!
 		store: String!
 	): SMimePublicCertsResponse
+	getSMimeCertInfo(certId: String): SmimeCertInfoResponse
 	getScratchCodes(username: String!): ScratchCodes
 	getSearchFolder: Folder
 	getTrustedDevices: GetTrustedDevicesResponse
@@ -3443,7 +3510,10 @@ type Mutation {
 	sendMessage(
 		message: SendMessageInput!
 		accountName: String
+		sign: Boolean
+		encrypt: Boolean
 	): SendMessageResponse
+	saveSMimeCert(upload: SaveSMimeCertInputUpload!, password: String): SmimeCertInfoResponse
 	sendDeliveryReport(messageId: ID!): Boolean
 	sendInviteReply(inviteReply: InviteReplyInput!): InviteReplyResponse
 	sendShareNotification(shareNotification: ShareNotificationInput!): Boolean