@zimbra/api-client 87.0.0 → 88.0.0

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@zimbra/api-client",
   "amdName": "zmApiJsClient",
-  "version": "87.0.0",
+  "version": "88.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",
   "module": "dist/zm-api-js-client.esm.js",
   "umd:main": "dist/zm-api-js-client.umd.js",
@@ -17,9 +18,11 @@
     "build": "npm-run-all clean generateSchemaTypes rollup:* -p build:ts minify:* copySchema",
     "build:ts": "tsc --emitDeclarationOnly --declaration --outDir \"dist\"",
     "copySchema": "copyfiles -f src/schema/schema.graphql dist",
+    "rollup:cjs": "cross-var rollup -c rollup.config.js -m -f cjs -n $npm_package_amdName $npm_package_source -o $npm_package_main",
     "rollup:umd": "cross-var rollup -c rollup.config.js -m -f umd -n $npm_package_amdName $npm_package_source -o $npm_package_umd_main",
     "rollup:esm": "cross-var rollup -c rollup.config.js -m -f es --environment FORMAT:es -n $npm_package_amdName $npm_package_source -o $npm_package_module",
     "linkedBuild": "npm run rollup:esm -- --watch",
+    "minify:cjs": "cross-var uglifyjs $npm_package_main -c pure_getters,pure_funcs=classCallCheck -m toplevel,reserved=['_createClass'] --keep-fnames -o $npm_package_main --source-map content=$npm_package_main.map,url=zm-api-js-client.js.map,filename=$npm_package_main.map",
     "minify:umd": "cross-var uglifyjs $npm_package_umd_main -c pure_getters,pure_funcs=classCallCheck -m toplevel,reserved=['_createClass'] --keep-fnames -o $npm_package_umd_main --source-map content=$npm_package_umd_main.map,url=zm-api-js-client.umd.js.map,filename=$npm_package_umd_main.map",
     "size": "echo \"Gzipped Size: $(gzip-size $npm_package_main | pretty-bytes)\"",
     "prepublishOnly": "npm test && npm run build && git commit -am $npm_package_version && git tag $npm_package_version && git push && git push --tags",
@@ -57,7 +60,10 @@
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.4.11",
     "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@rollup/plugin-graphql": "^1.1.0",
+    "@rollup/plugin-typescript": "^11.1.5",
     "@types/graphql": "^14.5.0",
     "@types/lodash": "^4.14.182",
     "@types/node": "^17.0.35",
@@ -68,15 +74,13 @@
     "cross-var": "^1.1.0",
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
-    "lint-staged": "^13.2.0",
+    "lint-staged": "13.2.3",
     "mocha": "^10.2.0",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.6.2",
     "rimraf": "^5.0.1",
     "rollup": "^2.75.0",
-    "rollup-plugin-graphql": "^0.1.0",
     "rollup-plugin-local-resolve": "^1.0.7",
-    "rollup-plugin-visualizer": "^5.9.2",
     "tslib": "^2.5.0",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",

package/rollup.config.js

@@ -1,8 +1,9 @@
 import babel from '@rollup/plugin-babel';
 import typescript from '@rollup/plugin-typescript';
-import graphql from 'rollup-plugin-graphql';
+import graphql from '@rollup/plugin-graphql';
 import localResolve from 'rollup-plugin-local-resolve';
-import { visualizer } from 'rollup-plugin-visualizer';
+import nodeResolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
 import pkg from './package.json';
 
 let FORMAT = process.env.FORMAT;
@@ -10,10 +11,13 @@ let FORMAT = process.env.FORMAT;
 // graphql-tools currently has a rollup build failure, so always call it an external until they fix it
 // otherwise, make all npm production dependencies external, plus their subpath usages
 // throughout the codebase, which rollup doesn't automatically pick up on
-let external = (Object.keys(pkg.dependencies) || [])
-	.concat(
-		['castArray', 'get','isError', 'isObject', 'mapValues', 'reduce', 'omitBy', 'uniqBy', 'concat', 'uniqBy', 'differenceBy', 'forEach'].map(v => 'lodash/'+v)
-	);
+let external = FORMAT==='es' ?
+	Object.keys(pkg.dependencies)
+		.concat(
+			['castArray', 'get','isError', 'isObject', 'mapValues', 'reduce', 'omitBy', 'uniqBy', 'concat', 'uniqBy', 'differenceBy', 'forEach'].map(v => 'lodash/'+v),
+			['graphql']) :
+	[];
+
 
 export default {
 	external,
@@ -21,13 +25,16 @@ export default {
 	plugins: [
 		graphql(),
 		localResolve(),
+		nodeResolve({
+			extensions: [ '.js', '.ts', '.json' ]
+		}),
+		commonjs(),
 		typescript(),
 		babel({
 			extensions: ['.ts'],
 			exclude: 'node_modules/**',
 			babelHelpers: 'bundled'
-		}),
-		visualizer()
+		})
 	],
 	output: {
 		exports: FORMAT==='es' ? null : 'named'

package/src/batch-client/index.ts

@@ -393,12 +393,12 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		}).then(res => get(res, `${accountType}.0.id`));
 
-	public addMessage = (options: AddMsgInput) => {
-		const { folderId, content, meta } = get(options, 'message');
+	public addMessage = (message: AddMsgInput) => {
+		const { folderId, content, meta } = message;
 		let flags, tags, tagNames, date;
 
 		try {
-			({ flags, tags, tagNames, date } = JSON.parse(meta));
+			({ flags, tags, tagNames, date } = meta && JSON.parse(meta));
 		} catch (err) {}
 
 		return this.jsonRequest({
@@ -641,7 +641,7 @@ export class ZimbraBatchClient {
 			},
 			singleRequest: true
 		}).then(res => {
-			const mappedResult = mapValuesDeep(res, coerceStringToBoolean);
+			const mappedResult: any = mapValuesDeep(res, coerceStringToBoolean);
 			const {
 				_attrs: { zimbraPrefWhenSentToAddresses, zimbraPrefWhenInFolderIds, ...restAttr },
 				...restIdentityProps
@@ -934,6 +934,16 @@ export class ZimbraBatchClient {
 			singleRequest: true
 		});
 
+	public getAccountDistributionLists = (attrs: String, ownerOf: number) =>
+		this.jsonRequest({
+			name: 'GetAccountDistributionLists',
+			body: {
+				attrs,
+				ownerOf
+			},
+			namespace: Namespace.Account
+		}).then(res => ({ dls: res?.dl || [] }));
+
 	public getAppointment = (options: AppointmentOptions) =>
 		this.jsonRequest({
 			name: 'GetAppointment',
@@ -1045,7 +1055,19 @@ export class ZimbraBatchClient {
 				offset
 			},
 			namespace: Namespace.Account
-		}).then(res => normalize(DlGroupMember)(get(res, 'groupMembers.0.groupMember') || []));
+		}).then(res => {
+			if (res?.dlm) {
+				return res;
+			} else {
+				const result = {
+					dlGroupMember:
+						res?.groupMembers?.length && res.groupMembers[0]?.groupMember
+							? normalize(DlGroupMember)(res.groupMembers[0].groupMember)
+							: []
+				};
+				return result;
+			}
+		});
 
 	public getDocumentShareURL = (options: GetDocumentShareURLOptions) =>
 		this.jsonRequest({

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

@@ -96,6 +96,7 @@ export type AccountInfoAttrs = {
   zimbraFeatureChangePasswordEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureConversationsEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureDiscardInFiltersEnabled?: Maybe<Scalars['Boolean']>;
+  zimbraFeatureDistributionListExpandMembersEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureDocumentEditingEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureExportFolderEnabled?: Maybe<Scalars['Boolean']>;
   zimbraFeatureFiltersEnabled?: Maybe<Scalars['Boolean']>;
@@ -601,6 +602,7 @@ export type CalendarItemAttendee = {
 export type CalendarItemAttendeesInput = {
   address: Scalars['String'];
   calendarUserType?: InputMaybe<Scalars['String']>;
+  isGroup?: InputMaybe<Scalars['Boolean']>;
   name?: InputMaybe<Scalars['String']>;
   participationStatus?: InputMaybe<ParticipationStatus>;
   role?: InputMaybe<ParticipationRole>;
@@ -1200,6 +1202,38 @@ export type CustomMetadataMeta = {
   section?: Maybe<Scalars['String']>;
 };
 
+export type DlDetails = {
+  __typename?: 'DLDetails';
+  dlGroupMember?: Maybe<Array<Maybe<DlGroupMember>>>;
+  dlm?: Maybe<Array<Maybe<Dlm>>>;
+  more?: Maybe<Scalars['Boolean']>;
+  total?: Maybe<Scalars['Int']>;
+};
+
+export type Dls = {
+  __typename?: 'DLS';
+  _attrs?: Maybe<DlsAttrs>;
+  d?: Maybe<Scalars['String']>;
+  dynamic?: Maybe<Scalars['Boolean']>;
+  id?: Maybe<Scalars['String']>;
+  isMember?: Maybe<Scalars['Boolean']>;
+  isOwner?: Maybe<Scalars['Boolean']>;
+  name?: Maybe<Scalars['String']>;
+  ref?: Maybe<Scalars['String']>;
+};
+
+export type DlsAttrs = {
+  __typename?: 'DLSAttrs';
+  zimbraDistributionListSubscriptionPolicy?: Maybe<Scalars['String']>;
+  zimbraDistributionListUnsubscriptionPolicy?: Maybe<Scalars['String']>;
+  zimbraHideInGal?: Maybe<Scalars['String']>;
+};
+
+export type DlsDetails = {
+  __typename?: 'DLSDetails';
+  dls?: Maybe<Array<Maybe<Dls>>>;
+};
+
 export type DataSource = {
   __typename?: 'DataSource';
   connectionType?: Maybe<Scalars['String']>;
@@ -1302,6 +1336,11 @@ export type DlGroupMember = {
   name?: Maybe<Scalars['String']>;
 };
 
+export type Dlm = {
+  __typename?: 'Dlm';
+  _content?: Maybe<Scalars['String']>;
+};
+
 export type Document = {
   __typename?: 'Document';
   acl?: Maybe<Acl>;
@@ -1358,6 +1397,7 @@ export type EmailAddress = {
   __typename?: 'EmailAddress';
   address?: Maybe<Scalars['String']>;
   displayName?: Maybe<Scalars['String']>;
+  isGroup?: Maybe<Scalars['Boolean']>;
   name?: Maybe<Scalars['String']>;
   type?: Maybe<Scalars['String']>;
 };
@@ -1480,6 +1520,13 @@ export type ExternalAccountTestResponse = {
   success: Scalars['Boolean'];
 };
 
+export enum ExternalSendersType {
+  All = 'ALL',
+  Allnotinab = 'ALLNOTINAB',
+  Inab = 'INAB',
+  Insd = 'INSD'
+}
+
 export type FileIntoAction = {
   __typename?: 'FileIntoAction';
   copy?: Maybe<Scalars['Boolean']>;
@@ -3232,6 +3279,7 @@ export type Preferences = {
   zimbraPrefDeleteInviteOnReply?: Maybe<Scalars['Boolean']>;
   zimbraPrefDisplayExternalImages?: Maybe<Scalars['Boolean']>;
   zimbraPrefDisplayTimeInMailList?: Maybe<Scalars['Boolean']>;
+  zimbraPrefExternalSendersType?: Maybe<ExternalSendersType>;
   zimbraPrefGroupMailBy?: Maybe<Scalars['String']>;
   zimbraPrefHtmlEditorDefaultFontColor?: Maybe<Scalars['String']>;
   zimbraPrefHtmlEditorDefaultFontFamily?: Maybe<Scalars['String']>;
@@ -3293,6 +3341,7 @@ export type PreferencesInput = {
   zimbraPrefDelegatedSendSaveTarget?: InputMaybe<PrefDelegatedSendSaveTarget>;
   zimbraPrefDisplayExternalImages?: InputMaybe<Scalars['Boolean']>;
   zimbraPrefDisplayTimeInMailList?: InputMaybe<Scalars['Boolean']>;
+  zimbraPrefExternalSendersType?: InputMaybe<ExternalSendersType>;
   zimbraPrefGroupMailBy?: InputMaybe<Scalars['String']>;
   zimbraPrefHtmlEditorDefaultFontColor?: InputMaybe<Scalars['String']>;
   zimbraPrefHtmlEditorDefaultFontFamily?: InputMaybe<Scalars['String']>;
@@ -3371,6 +3420,7 @@ export type Query = {
   downloadDocument?: Maybe<Attachment>;
   downloadMessage?: Maybe<SMimeMessage>;
   freeBusy?: Maybe<Array<Maybe<FreeBusy>>>;
+  getAccountDistributionLists?: Maybe<DlsDetails>;
   getAppSpecificPasswords?: Maybe<AppSpecificPasswordsResponse>;
   getAppointment?: Maybe<GetAppointmentResponse>;
   getAppointments?: Maybe<SearchResponse>;
@@ -3381,7 +3431,7 @@ export type Query = {
   getCustomMetadata?: Maybe<CustomMetadata>;
   getDataSources: DataSources;
   getDeviceStatus?: Maybe<Array<Maybe<Device>>>;
-  getDistributionListMembers?: Maybe<Array<Maybe<DlGroupMember>>>;
+  getDistributionListMembers?: Maybe<DlDetails>;
   getDocumentShareURL?: Maybe<GetDocumentShareUrlResponse>;
   getFilterRules?: Maybe<Array<Maybe<Filter>>>;
   getFolder?: Maybe<Folder>;
@@ -3470,6 +3520,12 @@ export type QueryFreeBusyArgs = {
 };
 
 
+export type QueryGetAccountDistributionListsArgs = {
+  attrs?: InputMaybe<Scalars['String']>;
+  ownerOf?: InputMaybe<Scalars['Int']>;
+};
+
+
 export type QueryGetAppointmentArgs = {
   id: Scalars['ID'];
 };

package/src/schema/schema.graphql

@@ -20,6 +20,13 @@ enum SortBy {
 	sizeDesc
 }
 
+enum ExternalSendersType {
+	ALL
+	ALLNOTINAB
+	INAB
+	INSD
+}
+
 enum ShareInputAction {
 	edit
 	revoke
@@ -448,7 +455,8 @@ type EmailAddress {
 	address: String
 	name: String
 	type: String
-	displayName: String
+	displayName: String,
+	isGroup: Boolean
 }
 
 type ShareNotification {
@@ -1165,11 +1173,43 @@ type DlAttrs {
 	lastName: String
 }
 
+type Dlm {
+	_content: String
+}
+
 type DlGroupMember {
 	name: String
 	attributes: DlAttrs
 }
 
+type DLSAttrs {
+	zimbraDistributionListSubscriptionPolicy: String
+	zimbraDistributionListUnsubscriptionPolicy: String
+	zimbraHideInGal: String
+}
+
+ type DLS {
+	d: String
+	dynamic: Boolean
+	id: String
+	isMember: Boolean
+	isOwner: Boolean
+	name: String
+	ref: String
+	_attrs: DLSAttrs
+ }
+
+  type DLSDetails {
+	dls: [DLS]
+ }
+
+  type DLDetails {
+	dlm: [Dlm]
+	dlGroupMember: [DlGroupMember]
+	more: Boolean,
+	total: Int
+ }
+
 type HabGroup {
 	name: String
 	id: String
@@ -1401,6 +1441,7 @@ type AccountInfoAttrs {
 	zimbraFeatureImportFolderEnabled: Boolean
 	zimbraFeatureExportFolderEnabled: Boolean
 	zimbraFeatureGroupCalendarEnabled: Boolean
+	zimbraFeatureDistributionListExpandMembersEnabled: Boolean
 }
 
 type AccountCos {
@@ -1511,6 +1552,7 @@ type Preferences {
 	zimbraPrefDeleteInviteOnReply: Boolean
 	zimbraPrefDelegatedSendSaveTarget: PrefDelegatedSendSaveTarget
 	zimbraPrefDisplayExternalImages: Boolean
+	zimbraPrefExternalSendersType: ExternalSendersType
 	zimbraPrefGroupMailBy: String
 	zimbraPrefMailPollingInterval: String
 	zimbraPrefMailRequestReadReceipts: Boolean
@@ -2279,6 +2321,7 @@ input CalendarItemAttendeesInput {
 	address: String!
 	name: String
 	calendarUserType: String
+	isGroup: Boolean
 }
 
 type CalendarItemAlarmTriggerRelative {
@@ -2556,6 +2599,7 @@ input PreferencesInput {
 	zimbraPrefCalendarAlwaysShowMiniCal: Boolean
 	zimbraPrefComposeDirection: String
 	zimbraPrefComposeFormat: Mode
+	zimbraPrefExternalSendersType: ExternalSendersType
 	zimbraPrefHtmlEditorDefaultFontColor: String
 	zimbraPrefHtmlEditorDefaultFontFamily: String
 	zimbraPrefHtmlEditorDefaultFontSize: String
@@ -3336,11 +3380,15 @@ type Query {
 		local: Boolean
 	): Folder
 	getHAB(habRootGroupId: ID): HabGroup
+	getAccountDistributionLists(
+		attrs: String
+		ownerOf: Int
+	): DLSDetails
 	getDistributionListMembers(
 		limit: Int
 		offset: Int
 		dl: String
-	): [DlGroupMember]
+	): DLDetails
 	getCustomMetadata(id: ID!, section: String): CustomMetadata
 	getMailboxMetadata(section: String): MailboxMetadata
 	getMessage(
@@ -3639,4 +3687,4 @@ type Mutation {
 schema {
 	query: Query
 	mutation: Mutation
-}
+}

package/src/schema/schema.ts

@@ -142,6 +142,8 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 					return client.getFolder(variables as GetFolderOptions);
 				},
 				getHAB: (_, { habRootGroupId }) => client.getHAB(habRootGroupId),
+				getAccountDistributionLists: (_, { attrs, ownerOf }) =>
+					client.getAccountDistributionLists(attrs, ownerOf),
 				getDistributionListMembers: (_, { limit, offset, dl }) =>
 					client.getDistributionListMembers(limit, offset, dl),
 				getAppointment: (_: any, variables) =>
@@ -220,12 +222,13 @@ export function createZimbraSchema(options: ZimbraSchemaOptions): {
 				},
 				addMessage: (_, variables, context = {}) => {
 					const { local } = context;
+					const { message } = variables;
 
 					if (local) {
 						return localStoreClient.addMessage(variables as AddMsgInput);
 					}
 
-					return client.addMessage(variables as AddMsgInput);
+					return client.addMessage(message as AddMsgInput);
 				},
 				applyFilterRules: (_, variables) =>
 					client.applyFilterRules(variables as ApplyFilterRulesOptions),