Merge pull request #58 from Zimbra/PREAPPS-965

PREAPPS-965: graphql fixes and account attr addition

Author: silentsakky

src/batch-client/index.ts

@@ -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';
@@ -120,17 +121,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/schema/generated-schema-types.ts

@@ -140,6 +140,7 @@ export interface AccountInfoAttrs {
 	zimbraFeatureRelatedContactsEnabled?: boolean | null;
 	zimbraFeatureChangePasswordEnabled?: boolean | null;
 	zimbraFeatureResetPasswordEnabled?: boolean | null;
+	zimbraMailBlacklistMaxNumEntries?: number | null;
 }
 
 export interface Preferences {

src/schema/schema.graphql

@@ -940,6 +940,7 @@ type AccountInfoAttrs {
 	zimbraFeatureRelatedContactsEnabled: Boolean
 	zimbraFeatureChangePasswordEnabled: Boolean
 	zimbraFeatureResetPasswordEnabled: Boolean
+	zimbraMailBlacklistMaxNumEntries: Int
 }
 
 type Identities {