Merge branch 'master' into PREAPPS-803

Author: silentsakky

.github/CODEOWNERS

@@ -0,0 +1,8 @@
+# Global owners
+*                          @silentsakky @pl12133
+
+# Anything which is not testcafe, used for all devs
+!tests/testcafe/           @itsmeprashant @jkester1986 @lavegupta @panditsavitags @sachinpatel88 @SantoshKShetty @Sigafoos @yashrajpchavda
+
+# Test cafe owners, used for qa team
+tests/testcafe/            @jiteshsojitra @miteshsavani @pasch-synacor @shubhamvitec @ycai-synacor

package-lock.json

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

@@ -1,4 +1,5 @@
 import DataLoader from 'dataloader';
+import castArray from 'lodash/castArray';
 import get from 'lodash/get';
 import isError from 'lodash/isError';
 import mapValues from 'lodash/mapValues';
@@ -121,17 +122,25 @@ export class ZimbraBatchClient {
 		this.jsonRequest({
 			name: 'GetInfo',
 			namespace: Namespace.Account
-		}).then(res => ({
-			...res,
-			attrs: mapValuesDeep(res.attrs._attrs, coerceStringToBoolean),
-			prefs: mapValuesDeep(res.prefs._attrs, coerceStringToBoolean),
-			...(get(res, 'license.attr') && {
-				license: {
-					status: res.license.status,
-					attr: mapValuesDeep(res.license.attr, coerceStringToBoolean)
-				}
-			})
-		}));
+		}).then(res => {
+			let prefs: any = mapValuesDeep(res.prefs._attrs, coerceStringToBoolean);
+			prefs.zimbraPrefMailTrustedSenderList =
+				typeof prefs.zimbraPrefMailTrustedSenderList === 'string'
+					? castArray(prefs.zimbraPrefMailTrustedSenderList)
+					: prefs.zimbraPrefMailTrustedSenderList;
+
+			return {
+				...res,
+				attrs: mapValuesDeep(res.attrs._attrs, coerceStringToBoolean),
+				prefs,
+				...(get(res, 'license.attr') && {
+					license: {
+						status: res.license.status,
+						attr: mapValuesDeep(res.license.attr, coerceStringToBoolean)
+					}
+				})
+			};
+		});
 
 	public action = (type: ActionType, options: ActionOptions) => {
 		const { ids, id, ...rest } = options;

src/batch-client/index.ts

@@ -140,6 +140,7 @@ export interface AccountInfoAttrs {
 	zimbraFeatureRelatedContactsEnabled?: boolean | null;
 	zimbraFeatureChangePasswordEnabled?: boolean | null;
 	zimbraFeatureResetPasswordEnabled?: boolean | null;
+	zimbraMailBlacklistMaxNumEntries?: number | null;
 }
 
 export interface Preferences {
@@ -345,7 +346,7 @@ export interface EmailAddress {
 }
 
 export interface InviteInfo {
-	type: InviteType;
+	type?: InviteType | null;
 	components?: InviteComponent[] | null;
 }
 
@@ -400,7 +401,7 @@ export interface CalendarItemAlarmTriggerRelative {
 	hours?: number | null;
 	minutes?: number | null;
 	seconds?: number | null;
-	relatedTo: AlarmRelatedTo;
+	relatedTo?: AlarmRelatedTo | null;
 	negative: boolean;
 }
 
@@ -1974,7 +1975,8 @@ export enum AlarmAction {
 	EMAIL = 'EMAIL',
 	PROCEDURE = 'PROCEDURE',
 	X_YAHOO_CALENDAR_ACTION_IM = 'X_YAHOO_CALENDAR_ACTION_IM',
-	X_YAHOO_CALENDAR_ACTION_MOBILE = 'X_YAHOO_CALENDAR_ACTION_MOBILE'
+	X_YAHOO_CALENDAR_ACTION_MOBILE = 'X_YAHOO_CALENDAR_ACTION_MOBILE',
+	NONE = 'NONE'
 }
 
 export enum AlarmRelatedTo {

src/schema/generated-schema-types.ts

@@ -55,6 +55,7 @@ enum AlarmAction {
 	PROCEDURE
 	X_YAHOO_CALENDAR_ACTION_IM
 	X_YAHOO_CALENDAR_ACTION_MOBILE
+	NONE
 }
 
 enum AlarmRelatedTo {
@@ -440,7 +441,7 @@ enum InviteType {
 }
 
 type InviteInfo {
-	type: InviteType!
+	type: InviteType #though type is a required value on the response, outdated invites come back as empty InviteInfo objects
 	components: [InviteComponent] #comp
 }
 
@@ -939,6 +940,7 @@ type AccountInfoAttrs {
 	zimbraFeatureRelatedContactsEnabled: Boolean
 	zimbraFeatureChangePasswordEnabled: Boolean
 	zimbraFeatureResetPasswordEnabled: Boolean
+	zimbraMailBlacklistMaxNumEntries: Int
 }
 
 type Identities {
@@ -1367,7 +1369,7 @@ type CalendarItemAlarmTriggerRelative {
 	hours: Int
 	minutes: Int
 	seconds: Int
-	relatedTo: AlarmRelatedTo!
+	relatedTo: AlarmRelatedTo
 	negative: Boolean!
 }