Merge branch 'develop'

src/apollo/zimbra-in-memory-cache.ts

@@ -1,7 +1,8 @@
 import {
 	ApolloReducerConfig,
 	defaultDataIdFromObject,
-	InMemoryCache
+	InMemoryCache,
+	IntrospectionFragmentMatcher
 } from 'apollo-cache-inmemory';
 import get from 'lodash/get';
 
@@ -32,13 +33,42 @@ const dataIdFromObject = (object: any): string | null | undefined => {
 	}
 };
 
+function createFragmentMatcher(fragmentMatcherFactory = Object) {
+	return new IntrospectionFragmentMatcher(
+		fragmentMatcherFactory({
+			introspectionQueryResultData: {
+				__schema: {
+					types: [
+						{
+							kind: 'INTERFACE',
+							name: 'MailItem',
+							possibleTypes: [
+								{ name: 'Conversation' },
+								{ name: 'MessageInfo' },
+								{ name: 'MsgWithGroupInfo' }
+							]
+						}
+					]
+				}
+			}
+		})
+	);
+}
+
 /**
  * Provide a light wrapper over Apollo's inmemory cache with
  * special optimizations for identifying Zimbra object types via
  * `dataIdFromObject`.
  */
 export class ZimbraInMemoryCache extends InMemoryCache {
 	constructor(config: ApolloReducerConfig = {}) {
+		if (
+			!config.fragmentMatcher ||
+			typeof config.fragmentMatcher === 'function'
+		) {
+			config.fragmentMatcher = createFragmentMatcher(config.fragmentMatcher);
+		}
+
 		super({
 			dataIdFromObject,
 			...config

src/batch-client/index.ts

@@ -64,7 +64,10 @@ import {
 } from '../utils/coerce-boolean';
 import { mapValuesDeep } from '../utils/map-values-deep';
 import { normalizeEmailAddresses } from '../utils/normalize-email-addresses';
-import { normalizeMimeParts } from '../utils/normalize-mime-parts';
+import {
+	getAttachmentUrl,
+	normalizeMimeParts
+} from '../utils/normalize-mime-parts';
 import {
 	ActionOptions,
 	ActionType,
@@ -97,15 +100,15 @@ const DEBUG = false;
 
 function normalizeMessage(
 	message: { [key: string]: any },
-	zimbraOrigin?: string
+	{ origin, jwtToken }: { jwtToken?: string; origin?: string }
 ) {
 	const normalizedMessage = normalize(MessageInfo)(message);
 	normalizedMessage.attributes =
 		normalizedMessage.attributes &&
 		mapValuesDeep(normalizedMessage.attributes, coerceStringToBoolean);
 
 	return normalizeEmailAddresses(
-		normalizeMimeParts(normalizedMessage, zimbraOrigin)
+		normalizeMimeParts(normalizedMessage, { origin, jwtToken })
 	);
 }
 
@@ -115,9 +118,11 @@ export class ZimbraBatchClient {
 	public soapPathname: string;
 	private batchDataLoader: DataLoader<RequestOptions, RequestBody>;
 	private dataLoader: DataLoader<RequestOptions, RequestBody>;
+	private jwtToken?: string;
 	private notificationHandler?: NotificationHandler;
 
 	constructor(options: ZimbraClientOptions = {}) {
+		this.jwtToken = options.jwtToken;
 		this.origin = options.zimbraOrigin || DEFAULT_HOSTNAME;
 		this.soapPathname = options.soapPathname || DEFAULT_SOAP_PATHNAME;
 		this.notificationHandler = options.notificationHandler;
@@ -369,6 +374,12 @@ export class ZimbraBatchClient {
 			}
 		}).then(res => normalize(FreeBusy)(res.usr));
 
+	public getAttachmentUrl = (attachment: any) =>
+		getAttachmentUrl(attachment, {
+			origin: this.origin,
+			jwtToken: this.jwtToken
+		});
+
 	public getContact = ({ id }: GetContactOptions) =>
 		this.jsonRequest({
 			name: 'GetContacts',
@@ -391,7 +402,7 @@ export class ZimbraBatchClient {
 			}
 		}).then(res => {
 			const c = normalize(Conversation)(res.c[0]);
-			c.messages = c.messages.map((m: any) => normalizeMessage(m, this.origin));
+			c.messages = c.messages.map(this.normalizeMessage);
 			return c;
 		});
 
@@ -452,9 +463,7 @@ export class ZimbraBatchClient {
 					...(ridZ && { ridZ: ridZ })
 				}
 			}
-		}).then(
-			res => (res && res.m ? normalizeMessage(res.m[0], this.origin) : null)
-		);
+		}).then(res => (res && res.m ? this.normalizeMessage(res.m[0]) : null));
 
 	public getSearchFolder = () =>
 		this.jsonRequest({
@@ -499,14 +508,9 @@ export class ZimbraBatchClient {
 	public itemAction = (options: ActionOptions) =>
 		this.action(ActionType.item, options);
 
-	public jsonRequest = (options: JsonRequestOptions) => {
-		const { accountName } = options;
-
+	public jsonRequest = (options: JsonRequestOptions) =>
 		// If account name is present that means we will not be able to batch requests
-		return accountName
-			? this.dataLoader.load(options)
-			: this.batchDataLoader.load(options);
-	};
+		this[options.accountName ? 'dataLoader' : 'batchDataLoader'].load(options);
 
 	public login = ({
 		username,
@@ -691,8 +695,7 @@ export class ZimbraBatchClient {
 			name: 'SaveDraft',
 			body: denormalize(SendMessageInfo)(options)
 		}).then(({ m: messages }) => ({
-			message:
-				messages && messages.map((m: any) => normalizeMessage(m, this.origin))
+			message: messages && messages.map(this.normalizeMessage)
 		}));
 
 	public search = (options: SearchOptions) =>
@@ -705,9 +708,7 @@ export class ZimbraBatchClient {
 		}).then(res => {
 			const normalized = normalize(SearchResponse)(res);
 			if (normalized.messages) {
-				normalized.messages = normalized.messages.map((m: any) =>
-					normalizeMessage(m, this.origin)
-				);
+				normalized.messages = normalized.messages.map(this.normalizeMessage);
 			}
 			return normalized;
 		});
@@ -734,6 +735,10 @@ export class ZimbraBatchClient {
 			}
 		});
 
+	public setJwtToken = (jwtToken: string) => {
+		this.jwtToken = jwtToken;
+	};
+
 	public setRecoveryAccount = (options: SetRecoveryAccountOptions) =>
 		this.jsonRequest({
 			name: 'SetRecoveryAccount',
@@ -827,8 +832,7 @@ export class ZimbraBatchClient {
 	private batchDataHandler = (requests: Array<RequestOptions>) =>
 		batchJsonRequest({
 			requests,
-			sessionId: this.sessionId,
-			origin: this.origin
+			...this.getAdditionalRequestOptions()
 		}).then(response => {
 			const sessionId = get(response, 'header.context.session.id');
 			const notifications = get(response, 'header.context.notify.0');
@@ -856,8 +860,7 @@ export class ZimbraBatchClient {
 	private dataHandler = (requests: Array<JsonRequestOptions>) =>
 		jsonRequest({
 			...requests[0],
-			sessionId: this.sessionId,
-			origin: this.origin
+			...this.getAdditionalRequestOptions()
 		}).then(response => {
 			const sessionId = get(response, 'header.context.session.id');
 			const notifications = get(response, 'header.context.notify.0');
@@ -872,4 +875,19 @@ export class ZimbraBatchClient {
 
 			return isError(response) ? [response] : [response.body];
 		});
+
+	/**
+	 * These options are included on every request.
+	 */
+	private getAdditionalRequestOptions = () => ({
+		jwtToken: this.jwtToken,
+		sessionId: this.sessionId,
+		origin: this.origin
+	});
+
+	private normalizeMessage = (message: any) =>
+		normalizeMessage(message, {
+			origin: this.origin,
+			jwtToken: this.jwtToken
+		});
 }

src/batch-client/types.ts

@@ -32,6 +32,7 @@ export interface Notification {
 export type NotificationHandler = (notificaton: Notification) => void;
 
 export interface ZimbraClientOptions {
+	jwtToken?: string;
 	notificationHandler?: NotificationHandler;
 	soapPathname?: string;
 	zimbraOrigin?: string;

src/normalize/entities.ts

@@ -171,14 +171,14 @@ const commonMailItemFields = {
 	mp: ['mimeParts', MimePart],
 	shr: 'share',
 	su: 'subject',
+	origid: 'origId',
 	attach: ['attachments', AttachmentsInfo],
 	rt: 'replyType'
 };
 
 const SendMessageFields = new Entity({
 	...commonMailItemFields,
 	id: 'id',
-	origid: 'origId',
 	aid: 'attachmentId',
 	irt: 'inReplyTo',
 	rt: 'replyType',

src/request/index.ts

@@ -198,6 +198,12 @@ export function jsonRequest(
 		};
 	}
 
+	if (requestOptions.jwtToken) {
+		header.context.jwtToken = {
+			_content: requestOptions.jwtToken
+		};
+	}
+
 	const body = {
 		[soapRequestName]: soapCommandBody(options)
 	};

src/request/types.ts

@@ -13,6 +13,7 @@ export interface BaseRequestOptions {
 	accountName?: string | null;
 	credentials?: RequestCredentials;
 	headers?: any;
+	jwtToken?: string | null;
 	origin?: string;
 	sessionId?: SessionId;
 	sessionSeq?: SessionSeq;
@@ -82,6 +83,9 @@ export interface SOAPHeader {
 			by: 'name' | 'id'; // name is the account's email address
 		};
 		csrfToken?: string;
+		jwtToken?: {
+			_content: string;
+		};
 		notify?: {
 			seq: SessionSeq;
 		};

src/schema/generated-schema-types.ts

@@ -335,6 +335,7 @@ export interface MessageInfo extends MailItem {
 	size?: number | null;
 	date?: number | null;
 	folderId?: string | null;
+	origId?: string | null;
 	subject?: string | null;
 	emailAddresses?: EmailAddress[] | null;
 	excerpt?: string | null;

src/schema/schema.graphql

@@ -364,6 +364,7 @@ type MessageInfo implements MailItem {
 	size: Float # s
 	date: Float # d
 	folderId: ID # l
+	origId: ID #origid
 	subject: String # su
 	emailAddresses: [EmailAddress]
 	excerpt: String # fr

src/utils/normalize-mime-parts.ts

@@ -35,20 +35,25 @@ function reduceMimeParts(
 	return accumulator;
 }
 
-function getUrl(attachment: { [key: string]: any }, origin: string = '') {
+export function getAttachmentUrl(
+	attachment: { [key: string]: any },
+	{ origin = '', jwtToken }: { jwtToken?: string; origin?: string }
+) {
 	let { messageId, mid, part } = attachment;
-	return `${origin}/service/home/~/?auth=co&id=${encodeURIComponent(
-		messageId || mid
-	)}&part=${encodeURIComponent(part)}`;
+	return `${origin}/service/home/~/?auth=${
+		jwtToken ? 'jwt' : 'co'
+	}&id=${encodeURIComponent(messageId || mid)}&part=${encodeURIComponent(
+		part
+	)}${jwtToken ? `&zjwt=${jwtToken}` : ''}`;
 }
 
 export function normalizeMimeParts(
 	message: { [key: string]: any },
-	origin?: string
+	{ origin, jwtToken }: { jwtToken?: string; origin?: string }
 ) {
 	const processAttachment = ({ ...attachment }) => {
 		attachment.messageId = attachment.messageId || message.id;
-		attachment.url = getUrl(attachment, origin);
+		attachment.url = getAttachmentUrl(attachment, { origin, jwtToken });
 		if (attachment.contentId) {
 			attachment.contentId = normalizeCid(attachment.contentId);
 		}