@pnp/cli-microsoft365 5.0.0-beta.aff293c → 5.0.0-beta.c4100fe

package/dist/m365/spo/commands/site/site-remove.js

@@ -25,26 +25,65 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeSite = () => {
             this.dots = '';
-            this
-                .getSiteGroupId(args.options.url, logger)
-                .then((_groupId) => {
-                if (_groupId === '00000000-0000-0000-0000-000000000000') {
-                    if (this.debug) {
-                        logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
-                    }
-                    return this.deleteSiteWithoutGroup(logger, args);
-                }
-                else {
-                    if (this.debug) {
-                        logger.logToStderr(`Site attached to group ${_groupId}. Initiating group delete operation via Graph API`);
+            if (args.options.fromRecycleBin) {
+                this
+                    .deleteSiteWithoutGroup(logger, args)
+                    .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+            }
+            else {
+                this
+                    .getSiteGroupId(args.options.url, logger)
+                    .then((groupId) => {
+                    if (groupId === '00000000-0000-0000-0000-000000000000') {
+                        if (this.debug) {
+                            logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
+                        }
+                        return this.deleteSiteWithoutGroup(logger, args);
                     }
-                    if (args.options.fromRecycleBin || args.options.skipRecycleBin || args.options.wait) {
-                        logger.log(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'fromRecycleBin' or 'skipRecycleBin' or 'wait' will not be applicable.`));
+                    else {
+                        if (this.debug) {
+                            logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
+                        }
+                        return this
+                            .getSiteGroup(groupId)
+                            .then((group) => {
+                            if (args.options.skipRecycleBin || args.options.wait) {
+                                logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
+                            }
+                            return this.deleteGroupifiedSite(group.id, logger);
+                        })
+                            .catch((err) => {
+                            if (err.response.status === 404) {
+                                if (this.verbose) {
+                                    logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                                }
+                                return this
+                                    .isSiteGroupDeleted(groupId)
+                                    .then((deletedGroups) => {
+                                    if (deletedGroups.value.length === 0) {
+                                        if (this.verbose) {
+                                            logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
+                                        }
+                                        if (args.options.wait) {
+                                            logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
+                                        }
+                                        return Promise.resolve();
+                                    }
+                                    else {
+                                        return Promise.reject(`Site group still exists in the deleted groups. The site won't be removed.`);
+                                    }
+                                })
+                                    .then(_ => this.deleteOrphanedSite(logger, args.options.url))
+                                    .catch((err) => Promise.reject(err));
+                            }
+                            else {
+                                return Promise.reject(err);
+                            }
+                        });
                     }
-                    return this.deleteGroupifiedSite(_groupId, logger);
-                }
-            })
-                .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+                })
+                    .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+            }
         };
         if (args.options.confirm) {
             removeSite();
@@ -65,32 +104,64 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
             });
         }
     }
+    getSiteGroup(groupId) {
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/groups/${groupId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    isSiteGroupDeleted(groupId) {
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/directory/deletedItems/Microsoft.Graph.Group?$select=id&$filter=groupTypes/any(c:c+eq+'Unified') and startswith(id, '${groupId}')`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions);
+    }
+    deleteOrphanedSite(logger, url) {
+        return this
+            .getSpoAdminUrl(logger, this.debug)
+            .then((spoAdminUrl) => {
+            const requestOptions = {
+                url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        });
+    }
     deleteSiteWithoutGroup(logger, args) {
         return this
             .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            this.spoAdminUrl = _spoAdminUrl;
+            .then((spoAdminUrl) => {
+            this.spoAdminUrl = spoAdminUrl;
             return this.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
             .then((res) => {
             this.context = res;
             if (args.options.fromRecycleBin) {
                 if (this.verbose) {
-                    logger.logToStderr(`Deleting site collection from recycle bin ${args.options.url}...`);
+                    logger.logToStderr(`Deleting site from recycle bin ${args.options.url}...`);
                 }
                 return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
             }
             else {
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting site collection ${args.options.url}...`);
-                }
                 return this.deleteSite(args.options.url, args.options.wait, logger);
             }
         })
             .then(() => {
             if (args.options.skipRecycleBin) {
                 if (this.verbose) {
-                    logger.logToStderr(`Also deleting site collection from recycle bin ${args.options.url}...`);
+                    logger.logToStderr(`Also deleting site from tenant recycle bin ${args.options.url}...`);
                 }
                 return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
             }
@@ -106,7 +177,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                 .then((res) => {
                 this.context = res;
                 if (this.verbose) {
-                    logger.logToStderr(`Deleting site ${url} ...`);
+                    logger.logToStderr(`Deleting site ${url}...`);
                 }
                 const requestOptions = {
                     url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -143,9 +214,6 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
-                }
                 const requestOptions = {
                     url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
@@ -185,7 +253,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
             .then((res) => {
             this.context = res;
             if (this.verbose) {
-                logger.logToStderr(`Retrieving the GroupId of the site  ${url}`);
+                logger.logToStderr(`Retrieving the group Id of the site ${url}`);
             }
             const requestOptions = {
                 url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,

package/dist/m365/spo/commands/web/web-installedlanguage-list.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoWebInstalledLanguageListCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.WEB_INSTALLEDLANGUAGE_LIST;
+    }
+    get description() {
+        return 'Lists all installed languages on site';
+    }
+    defaultProperties() {
+        return ['DisplayName', 'LanguageTag', 'Lcid'];
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving all installed languages on site ${args.options.webUrl}...`);
+        }
+        const requestOptions = {
+            url: `${args.options.webUrl}/_api/web/RegionalSettings/InstalledLanguages`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((webInstalledLanguageProperties) => {
+            logger.log(webInstalledLanguageProperties.Items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoWebInstalledLanguageListCommand();
+//# sourceMappingURL=web-installedlanguage-list.js.map

package/dist/m365/spo/commands.js

@@ -22,9 +22,10 @@ exports.default = {
     CDN_POLICY_SET: `${prefix} cdn policy set`,
     CDN_SET: `${prefix} cdn set`,
     CONTENTTYPE_ADD: `${prefix} contenttype add`,
-    CONTENTTYPE_GET: `${prefix} contenttype get`,
     CONTENTTYPE_FIELD_REMOVE: `${prefix} contenttype field remove`,
     CONTENTTYPE_FIELD_SET: `${prefix} contenttype field set`,
+    CONTENTTYPE_GET: `${prefix} contenttype get`,
+    CONTENTTYPE_LIST: `${prefix} contenttype list`,
     CONTENTTYPE_REMOVE: `${prefix} contenttype remove`,
     CONTENTTYPEHUB_GET: `${prefix} contenttypehub get`,
     CUSTOMACTION_ADD: `${prefix} customaction add`,
@@ -63,6 +64,7 @@ exports.default = {
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
+    GROUP_USER_REMOVE: `${prefix} group user remove`,
     HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
     HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
     HOMESITE_GET: `${prefix} homesite get`,
@@ -107,6 +109,7 @@ exports.default = {
     LIST_WEBHOOK_REMOVE: `${prefix} list webhook remove`,
     LIST_WEBHOOK_SET: `${prefix} list webhook set`,
     LISTITEM_ADD: `${prefix} listitem add`,
+    LISTITEM_ATTACHMENT_LIST: `${prefix} listitem attachment list`,
     LISTITEM_GET: `${prefix} listitem get`,
     LISTITEM_ISRECORD: `${prefix} listitem isrecord`,
     LISTITEM_LIST: `${prefix} listitem list`,
@@ -181,6 +184,7 @@ exports.default = {
     SITE_GROUPIFY: `${prefix} site groupify`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
+    SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
     SITE_REMOVE: `${prefix} site remove`,
     SITE_RENAME: `${prefix} site rename`,
     SITE_SET: `${prefix} site set`,
@@ -244,6 +248,7 @@ exports.default = {
     WEB_ADD: `${prefix} web add`,
     WEB_CLIENTSIDEWEBPART_LIST: `${prefix} web clientsidewebpart list`,
     WEB_GET: `${prefix} web get`,
+    WEB_INSTALLEDLANGUAGE_LIST: `${prefix} web installedlanguage list`,
     WEB_LIST: `${prefix} web list`,
     WEB_REINDEX: `${prefix} web reindex`,
     WEB_REMOVE: `${prefix} web remove`,

package/dist/m365/teams/commands/app/app-install.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
+const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppInstallCommand extends GraphCommand_1.default {
@@ -9,33 +11,70 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         return commands_1.default.APP_INSTALL;
     }
     get description() {
-        return 'Installs an app from the catalog to a Microsoft Teams team';
+        return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
     commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const requestOptions = {
-            url: `${endpoint}/teams/${args.options.teamId}/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+        this
+            .validateUser(args, logger)
+            .then(_ => {
+            var _a;
+            let url = `${this.resource}/v1.0`;
+            if (args.options.teamId) {
+                url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
             }
-        };
-        request_1.default
-            .post(requestOptions)
+            else {
+                url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+            }
+            const requestOptions = {
+                url: url,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
+    // we need this method, because passing an invalid user ID to the API
+    // won't cause an error
+    validateUser(args, logger) {
+        if (!args.options.userId) {
+            return Promise.resolve(true);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Checking if user ${args.options.userId} exists...`);
+        }
+        const options = {
+            id: args.options.userId,
+            output: 'json',
+            debug: args.options.debug,
+            verbose: args.options.verbose
+        };
+        return cli_1.Cli
+            .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
+            .then((res) => {
+            if (this.verbose) {
+                logger.logToStderr(res.stderr);
+            }
+            return true;
+        }, (err) => {
+            if (this.verbose) {
+                logger.logToStderr(err.stderr);
+            }
+            return Promise.reject(`User with ID ${args.options.userId} not found. Original error: ${err.error.message}`);
+        });
+    }
     options() {
         const options = [
-            {
-                option: '--appId <appId>'
-            },
-            {
-                option: '--teamId <teamId>'
-            }
+            { option: '--appId <appId>' },
+            { option: '--teamId [teamId' },
+            { option: '--userId [userId]' },
+            { option: '--userName [userName]' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
@@ -44,9 +83,24 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         if (!Utils_1.default.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (!Utils_1.default.isValidGuid(args.options.teamId)) {
+        if (!args.options.teamId &&
+            !args.options.userId &&
+            !args.options.userName) {
+            return `Specify either teamId, userId or userName`;
+        }
+        if ((args.options.teamId && args.options.userId) ||
+            (args.options.teamId && args.options.userName) ||
+            (args.options.userId && args.options.userName)) {
+            return `Specify either teamId, userId or userName but not multiple`;
+        }
+        if (args.options.teamId &&
+            !Utils_1.default.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.userId &&
+            !Utils_1.default.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
         return true;
     }
 }

package/dist/m365/teams/commands/app/app-list.js

@@ -25,24 +25,27 @@ class TeamsAppListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const teamRequestOptions = {
-            url: `${this.resource}/v1.0/me/joinedTeams?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
         return request_1.default
-            .get(teamRequestOptions)
+            .get(requestOptions)
             .then(response => {
-            const teamItem = response.value[0];
-            if (!teamItem) {
+            const groupItem = response.value[0];
+            if (!groupItem) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
             if (response.value.length > 1) {
                 return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
             }
-            return Promise.resolve(teamItem.id);
+            return Promise.resolve(groupItem.id);
         });
     }
     getEndpointUrl(args) {

package/dist/m365/teams/commands/app/app-update.js

@@ -13,27 +13,64 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates Teams app in the organization\'s app catalog';
     }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        return telemetryProps;
+    }
     commandAction(logger, args, cb) {
-        const { id: appId, filePath } = args.options;
-        const fullPath = path.resolve(filePath);
-        if (this.verbose) {
-            logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
+        const { filePath } = args.options;
+        this
+            .getAppId(args)
+            .then((appId) => {
+            const fullPath = path.resolve(filePath);
+            if (this.verbose) {
+                logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+                headers: {
+                    "content-type": "application/zip"
+                },
+                data: fs.readFileSync(fullPath)
+            };
+            return request_1.default
+                .put(requestOptions);
+        })
+            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+    }
+    getAppId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
-                "content-type": "application/zip"
+                accept: 'application/json;odata.metadata=none'
             },
-            data: fs.readFileSync(fullPath)
+            responseType: 'json'
         };
-        request_1.default
-            .put(requestOptions)
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const app = response.value[0];
+            if (!app) {
+                return Promise.reject(`The specified Teams app does not exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple Teams apps with name ${args.options.name} found. Please choose one of these ids: ${response.value.map(x => x.id).join(', ')}`);
+            }
+            return Promise.resolve(app.id);
+        });
     }
     options() {
         const options = [
             {
-                option: '-i, --id <id>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
             },
             {
                 option: '-p, --filePath <filePath>'
@@ -43,7 +80,13 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!args.options.id && !args.options.name) {
+            return 'Specify either id or name';
+        }
+        if (args.options.id && args.options.name) {
+            return 'Specify either id or name, but not both';
+        }
+        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         const fullPath = path.resolve(args.options.filePath);

package/dist/m365/teams/commands/channel/channel-get.js

@@ -21,6 +21,7 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
         telemetryProps.channelId = typeof args.options.channelId !== 'undefined';
         telemetryProps.channelName = typeof args.options.channelName !== 'undefined';
+        telemetryProps.primary = (!(!args.options.primary)).toString();
         return telemetryProps;
     }
     getTeamId(args) {
@@ -54,6 +55,9 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         if (args.options.channelId) {
             return Promise.resolve(args.options.channelId);
         }
+        if (args.options.primary) {
+            return Promise.resolve('');
+        }
         const channelRequestOptions = {
             url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
             headers: {
@@ -79,15 +83,21 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             return this.getChannelId(args);
         })
             .then((channelId) => {
+            let url = '';
+            if (args.options.primary) {
+                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+            }
+            else {
+                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+            }
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`,
+                url: url,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
                 responseType: 'json'
             };
-            return request_1.default
-                .get(requestOptions);
+            return request_1.default.get(requestOptions);
         })
             .then((res) => {
             logger.log(res);
@@ -107,6 +117,9 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             },
             {
                 option: '--channelName [channelName]'
+            },
+            {
+                option: '--primary'
             }
         ];
         const parentOptions = super.options();
@@ -122,11 +135,20 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         if (args.options.teamId && !Utils_1.default.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both.';
+        if (args.options.channelId && args.options.channelName && args.options.primary) {
+            return 'Specify channelId, channelName or primary';
+        }
+        if (!args.options.channelId && args.options.channelName && args.options.primary) {
+            return 'Specify channelId, channelName or primary.';
+        }
+        if (args.options.channelId && !args.options.channelName && args.options.primary) {
+            return 'Specify channelId, channelName or primary.';
+        }
+        if (args.options.channelId && args.options.channelName && !args.options.primary) {
+            return 'Specify channelId, channelName or primary.';
         }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
+        if (!args.options.channelId && !args.options.channelName && !args.options.primary) {
+            return 'Specify channelId, channelName or primary, one is required';
         }
         if (args.options.channelId && !Utils_1.default.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;

package/dist/m365/teams/commands/chat/chat-list.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TeamsChatListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.CHAT_LIST;
+    }
+    get description() {
+        return 'Lists all chat conversations';
+    }
+    defaultProperties() {
+        return ['id', 'topic', 'chatType'];
+    }
+    commandAction(logger, args, cb) {
+        const filter = args.options.type !== undefined ? `?$filter=chatType eq '${args.options.type}'` : '';
+        const endpoint = `${this.resource}/v1.0/chats${filter}`;
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-t, --type [chatType]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const supportedTypes = ['oneOnOne', 'group', 'meeting'];
+        if (args.options.type !== undefined && supportedTypes.indexOf(args.options.type) === -1) {
+            return `${args.options.type} is not a valid chatType. Accepted values are ${supportedTypes.join(', ')}`;
+        }
+        return true;
+    }
+}
+module.exports = new TeamsChatListCommand();
+//# sourceMappingURL=chat-list.js.map