@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

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

@@ -3,11 +3,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions;
+var _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions, _TeamsTeamListCommand_initValidators, _TeamsTeamListCommand_initOptionSets, _TeamsTeamListCommand_initTypes;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 class TeamsTeamListCommand extends GraphCommand {
     get name() {
         return commands.TEAM_LIST;
@@ -23,64 +25,126 @@ class TeamsTeamListCommand extends GraphCommand {
         _TeamsTeamListCommand_instances.add(this);
         __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamListCommand_instances, "m", _TeamsTeamListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        let endpoint = `${this.resource}/v1.0/groups?$select=id,displayName,description,resourceProvisioningOptions`;
-        if (args.options.joined) {
-            endpoint = `${this.resource}/v1.0/me/joinedTeams`;
+        if (this.verbose) {
+            if (!args.options.joined && !args.options.associated) {
+                await logger.logToStderr(`Retrieving Microsoft Teams in the tenant...`);
+            }
+            else {
+                const user = args.options.userId || args.options.userName || 'me';
+                await logger.logToStderr(`Retrieving Microsoft Teams ${args.options.joined ? 'joined by' : 'associated with'} ${user}...`);
+            }
         }
         try {
-            const items = await odata.getAllItems(endpoint);
-            if (args.options.joined) {
-                await logger.log(items);
+            let endpoint = `${this.resource}/v1.0`;
+            if (args.options.joined || args.options.associated) {
+                endpoint += args.options.userId || args.options.userName ? `/users/${args.options.userId || formatting.encodeQueryParameter(args.options.userName)}` : '/me';
+                endpoint += args.options.joined ? '/joinedTeams' : '/teamwork/associatedTeams';
+                endpoint += '?$select=id';
             }
             else {
-                const teamItems = await Promise.all(items.filter((e) => {
-                    return e.resourceProvisioningOptions.indexOf('Team') > -1;
-                }).map(g => this.getTeamFromGroup(g)));
-                await logger.log(teamItems);
+                // Get all team groups within the tenant
+                endpoint += `/groups?$select=id&$filter=resourceProvisioningOptions/Any(x:x eq 'Team')`;
             }
+            const groupResponse = await odata.getAllItems(endpoint);
+            const groupIds = groupResponse.map(g => g.id);
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieved ${groupIds.length} Microsoft Teams, getting additional information...`);
+            }
+            let teams = await this.getAllTeams(groupIds);
+            // Sort teams by display name
+            teams = teams.sort((x, y) => x.displayName.localeCompare(y.displayName));
+            await logger.log(teams);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getTeamFromGroup(group) {
+    async getAllTeams(groupIds) {
+        const groupBatches = [];
+        for (let i = 0; groupIds.length > i; i += 20) {
+            groupBatches.push(groupIds.slice(i, i + 20));
+        }
+        const promises = groupBatches.map(g => this.getTeamsBatch(g));
+        const teams = await Promise.all(promises);
+        const result = teams.reduce((prev, val) => prev.concat(val), []);
+        return result;
+    }
+    async getTeamsBatch(groupIds) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${group.id}`,
+            url: `${this.resource}/v1.0/$batch`,
             headers: {
-                accept: 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json'
             },
-            responseType: 'json'
-        };
-        try {
-            return await request.get(requestOptions);
-        }
-        catch (err) {
-            if (err.statusCode === 403) {
-                return {
-                    id: group.id,
-                    displayName: group.displayName,
-                    description: group.description,
-                    isArchived: undefined
-                };
+            responseType: 'json',
+            data: {
+                requests: groupIds.map((id, index) => ({
+                    id: index.toString(),
+                    method: 'GET',
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    url: `/teams/${id}`
+                }))
             }
-            else {
-                throw err;
+        };
+        const response = await request.post(requestOptions);
+        // Throw error if any of the requests failed
+        for (const item of response.responses) {
+            if (item.status !== 200) {
+                throw item.body;
             }
         }
+        return response.responses.map(r => r.body);
     }
 }
 _TeamsTeamListCommand_instances = new WeakSet(), _TeamsTeamListCommand_initTelemetry = function _TeamsTeamListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            joined: args.options.joined
+            joined: !!args.options.joined,
+            associated: !!args.options.associated,
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsTeamListCommand_initOptions = function _TeamsTeamListCommand_initOptions() {
     this.options.unshift({
         option: '-j, --joined'
+    }, {
+        option: '-a, --associated'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsTeamListCommand_initValidators = function _TeamsTeamListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userId} is not a valid UPN for userName.`;
+        }
+        if ((args.options.userId || args.options.userName) && !args.options.joined && !args.options.associated) {
+            return 'You must specify either joined or associated when specifying userId or userName.';
+        }
+        return true;
+    });
+}, _TeamsTeamListCommand_initOptionSets = function _TeamsTeamListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['joined', 'associated'],
+        runsWhen: (args) => !!args.options.joined || !!args.options.associated
+    }, {
+        options: ['userId', 'userName'],
+        runsWhen: (args) => typeof args.options.userId !== 'undefined' || typeof args.options.userName !== 'undefined'
     });
+}, _TeamsTeamListCommand_initTypes = function _TeamsTeamListCommand_initTypes() {
+    this.types.string.push('userId', 'userName');
 };
 export default new TeamsTeamListCommand();
 //# sourceMappingURL=team-list.js.map

package/dist/m365/teams/commands/team/team-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
+var _TeamsTeamSetCommand_instances, _a, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -60,9 +60,9 @@ class TeamsTeamSetCommand extends GraphCommand {
         }
     }
 }
-_TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
+_a = TeamsTeamSetCommand, _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        TeamsTeamSetCommand.props.forEach((p) => {
+        _a.props.forEach((p) => {
             this.telemetryProperties[p] = typeof args.options[p] !== 'undefined';
         });
     });

package/dist/m365/tenant/commands/info/info-get.js

@@ -0,0 +1,83 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TenantInfoGetCommand_instances, _TenantInfoGetCommand_initTelemetry, _TenantInfoGetCommand_initOptions, _TenantInfoGetCommand_initValidators;
+import auth from '../../../../Auth.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
+import commands from '../../commands.js';
+class TenantInfoGetCommand extends GraphCommand {
+    get name() {
+        return commands.INFO_GET;
+    }
+    get description() {
+        return 'Gets information about any tenant';
+    }
+    constructor() {
+        super();
+        _TenantInfoGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TenantInfoGetCommand_instances, "m", _TenantInfoGetCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        let domainName = args.options.domainName;
+        const tenantId = args.options.tenantId;
+        if (!domainName && !tenantId) {
+            const userName = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken);
+            domainName = userName.split('@')[1];
+        }
+        let requestUrl = `${this.resource}/v1.0/tenantRelationships/`;
+        if (tenantId) {
+            requestUrl += `findTenantInformationByTenantId(tenantId='${formatting.encodeQueryParameter(tenantId)}')`;
+        }
+        else {
+            requestUrl += `findTenantInformationByDomainName(domainName='${formatting.encodeQueryParameter(domainName)}')`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        try {
+            const res = await request.get(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_TenantInfoGetCommand_instances = new WeakSet(), _TenantInfoGetCommand_initTelemetry = function _TenantInfoGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            domainName: typeof args.options.domainName !== 'undefined',
+            tenantId: typeof args.options.tenantId !== 'undefined'
+        });
+    });
+}, _TenantInfoGetCommand_initOptions = function _TenantInfoGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-d, --domainName [domainName]'
+    }, {
+        option: '-i, --tenantId [tenantId]'
+    });
+}, _TenantInfoGetCommand_initValidators = function _TenantInfoGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.tenantId && !validation.isValidGuid(args.options.tenantId)) {
+            return `${args.options.tenantId} is not a valid GUID`;
+        }
+        if (args.options.tenantId && args.options.domainName) {
+            return `Specify either domainName or tenantId but not both`;
+        }
+        return true;
+    });
+};
+export default new TenantInfoGetCommand();
+//# sourceMappingURL=info-get.js.map

package/dist/m365/tenant/commands.js

@@ -1,6 +1,7 @@
 const prefix = 'tenant';
 export default {
     ID_GET: `${prefix} id get`,
+    INFO_GET: `${prefix} info get`,
     REPORT_ACTIVEUSERCOUNTS: `${prefix} report activeusercounts`,
     REPORT_ACTIVEUSERDETAIL: `${prefix} report activeuserdetail`,
     REPORT_OFFICE365ACTIVATIONCOUNTS: `${prefix} report office365activationcounts`,

package/dist/m365/todo/commands/task/task-add.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TodoTaskAddCommand_instances, _TodoTaskAddCommand_initTelemetry, _TodoTaskAddCommand_initOptions, _TodoTaskAddCommand_initValidators, _TodoTaskAddCommand_initOptionSets;
+var _TodoTaskAddCommand_instances, _a, _TodoTaskAddCommand_initTelemetry, _TodoTaskAddCommand_initOptions, _TodoTaskAddCommand_initValidators, _TodoTaskAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -27,7 +27,7 @@ class TodoTaskAddCommand extends GraphCommand {
         const endpoint = `${this.resource}/v1.0`;
         try {
             const listId = await this.getTodoListId(args);
-            const status = args.options.status && TodoTaskAddCommand.allowedStatuses.filter(x => x.toLowerCase() === args.options.status.toLowerCase())[0];
+            const status = args.options.status && _a.allowedStatuses.filter(x => x.toLowerCase() === args.options.status.toLowerCase())[0];
             const requestOptions = {
                 url: `${endpoint}/me/todo/lists/${listId}/tasks`,
                 headers: {
@@ -85,7 +85,7 @@ class TodoTaskAddCommand extends GraphCommand {
         return taskList.id;
     }
 }
-_TodoTaskAddCommand_instances = new WeakSet(), _TodoTaskAddCommand_initTelemetry = function _TodoTaskAddCommand_initTelemetry() {
+_a = TodoTaskAddCommand, _TodoTaskAddCommand_instances = new WeakSet(), _TodoTaskAddCommand_initTelemetry = function _TodoTaskAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
@@ -128,7 +128,7 @@ _TodoTaskAddCommand_instances = new WeakSet(), _TodoTaskAddCommand_initTelemetry
         option: '--startDateTime [startDateTime]'
     }, {
         option: '--status [status]',
-        autocomplete: TodoTaskAddCommand.allowedStatuses
+        autocomplete: _a.allowedStatuses
     });
 }, _TodoTaskAddCommand_initValidators = function _TodoTaskAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -150,8 +150,8 @@ _TodoTaskAddCommand_instances = new WeakSet(), _TodoTaskAddCommand_initTelemetry
         if (args.options.startDateTime && !validation.isValidISODateTime(args.options.startDateTime)) {
             return `'${args.options.startDateTime}' is not a valid datetime.`;
         }
-        if (args.options.status && TodoTaskAddCommand.allowedStatuses.map(x => x.toLowerCase()).indexOf(args.options.status.toLowerCase()) === -1) {
-            return `${args.options.status} is not a valid value for status. Valid values are ${TodoTaskAddCommand.allowedStatuses.join(', ')}`;
+        if (args.options.status && _a.allowedStatuses.map(x => x.toLowerCase()).indexOf(args.options.status.toLowerCase()) === -1) {
+            return `${args.options.status} is not a valid value for status. Valid values are ${_a.allowedStatuses.join(', ')}`;
         }
         if (args.options.completedDateTime && args.options.status?.toLowerCase() !== 'completed') {
             return `The completedDateTime option can only be used when the status option is set to completed`;

package/dist/m365/yammer/commands/message/message-like-set.js

@@ -24,34 +24,9 @@ class YammerMessageLikeSetCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageLikeSetCommand_instances, "m", _YammerMessageLikeSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const executeLikeAction = async () => {
-            const endpoint = `${this.resource}/v1/messages/liked_by/current.json`;
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    message_id: args.options.messageId
-                }
-            };
-            try {
-                if (args.options.enable !== false) {
-                    await request.post(requestOptions);
-                }
-                else {
-                    await request.delete(requestOptions);
-                }
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.enable === false) {
             if (args.options.force) {
-                await executeLikeAction();
+                await this.executeLikeAction(args.options);
             }
             else {
                 const messagePrompt = `Are you sure you want to unlike message ${args.options.messageId}?`;
@@ -62,12 +37,36 @@ class YammerMessageLikeSetCommand extends YammerCommand {
                     message: messagePrompt
                 });
                 if (result.continue) {
-                    await executeLikeAction();
+                    await this.executeLikeAction(args.options);
                 }
             }
         }
         else {
-            await executeLikeAction();
+            await this.executeLikeAction(args.options);
+        }
+    }
+    async executeLikeAction(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1/messages/liked_by/current.json`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                message_id: options.messageId
+            }
+        };
+        try {
+            if (options.enable !== false) {
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/yammer/commands/message/message-list.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _YammerMessageListCommand_instances, _YammerMessageListCommand_initTelemetry, _YammerMessageListCommand_initOptions, _YammerMessageListCommand_initValidators;
+var _YammerMessageListCommand_instances, _a, _YammerMessageListCommand_initTelemetry, _YammerMessageListCommand_initOptions, _YammerMessageListCommand_initValidators;
 import request from '../../../../request.js';
 import YammerCommand from '../../../base/YammerCommand.js';
 import commands from '../../commands.js';
@@ -25,91 +25,72 @@ class YammerMessageListCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initValidators).call(this);
     }
-    getAllItems(logger, args, messageId) {
-        return new Promise((resolve, reject) => {
-            let endpoint = `${this.resource}/v1`;
-            if (args.options.threadId) {
-                endpoint += `/messages/in_thread/${args.options.threadId}.json`;
-            }
-            else if (args.options.groupId) {
-                endpoint += `/messages/in_group/${args.options.groupId}.json`;
-            }
-            else {
-                if (!args.options.feedType) {
-                    args.options.feedType = "All";
-                }
-                switch (args.options.feedType) {
-                    case 'Top':
-                        endpoint += `/messages/algo.json`;
-                        break;
-                    case 'My':
-                        endpoint += `/messages/my_feed.json`;
-                        break;
-                    case 'Following':
-                        endpoint += `/messages/following.json`;
-                        break;
-                    case 'Sent':
-                        endpoint += `/messages/sent.json`;
-                        break;
-                    case 'Private':
-                        endpoint += `/messages/private.json`;
-                        break;
-                    case 'Received':
-                        endpoint += `/messages/received.json`;
-                        break;
-                    default:
-                        endpoint += `/messages.json`;
-                }
+    async getAllItems(logger, args, messageId) {
+        let endpoint = `${this.resource}/v1`;
+        if (args.options.threadId) {
+            endpoint += `/messages/in_thread/${args.options.threadId}.json`;
+        }
+        else if (args.options.groupId) {
+            endpoint += `/messages/in_group/${args.options.groupId}.json`;
+        }
+        else {
+            if (!args.options.feedType) {
+                args.options.feedType = "All";
             }
-            if (messageId !== -1) {
-                endpoint += `?older_than=${messageId}`;
+            switch (args.options.feedType) {
+                case 'Top':
+                    endpoint += `/messages/algo.json`;
+                    break;
+                case 'My':
+                    endpoint += `/messages/my_feed.json`;
+                    break;
+                case 'Following':
+                    endpoint += `/messages/following.json`;
+                    break;
+                case 'Sent':
+                    endpoint += `/messages/sent.json`;
+                    break;
+                case 'Private':
+                    endpoint += `/messages/private.json`;
+                    break;
+                case 'Received':
+                    endpoint += `/messages/received.json`;
+                    break;
+                default:
+                    endpoint += `/messages.json`;
             }
-            else if (args.options.olderThanId) {
-                endpoint += `?older_than=${args.options.olderThanId}`;
+        }
+        if (messageId !== -1) {
+            endpoint += `?older_than=${messageId}`;
+        }
+        else if (args.options.olderThanId) {
+            endpoint += `?older_than=${args.options.olderThanId}`;
+        }
+        if (args.options.threaded) {
+            if (endpoint.indexOf("?") > -1) {
+                endpoint += "&";
             }
-            if (args.options.threaded) {
-                if (endpoint.indexOf("?") > -1) {
-                    endpoint += "&";
-                }
-                else {
-                    endpoint += "?";
-                }
-                endpoint += `threaded=true`;
+            else {
+                endpoint += "?";
             }
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                this.items = this.items.concat(res.messages);
-                if (args.options.limit && this.items.length > args.options.limit) {
-                    this.items = this.items.slice(0, args.options.limit);
-                    resolve();
-                }
-                else {
-                    if (res.meta.older_available === true) {
-                        this
-                            .getAllItems(logger, args, this.items[this.items.length - 1].id)
-                            .then(() => {
-                            resolve();
-                        }, (err) => {
-                            reject(err);
-                        });
-                    }
-                    else {
-                        resolve();
-                    }
-                }
-            }, (err) => {
-                reject(err);
-            });
-        });
+            endpoint += `threaded=true`;
+        }
+        const requestOptions = {
+            url: endpoint,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        this.items = this.items.concat(res.messages);
+        if (args.options.limit && this.items.length > args.options.limit) {
+            this.items = this.items.slice(0, args.options.limit);
+        }
+        else if ((res.meta.older_available === true)) {
+            await this.getAllItems(logger, args, this.items[this.items.length - 1].id);
+        }
     }
     async commandAction(logger, args) {
         this.items = []; // this will reset the items array in interactive mode
@@ -136,7 +117,7 @@ class YammerMessageListCommand extends YammerCommand {
         }
     }
 }
-_YammerMessageListCommand_instances = new WeakSet(), _YammerMessageListCommand_initTelemetry = function _YammerMessageListCommand_initTelemetry() {
+_a = YammerMessageListCommand, _YammerMessageListCommand_instances = new WeakSet(), _YammerMessageListCommand_initTelemetry = function _YammerMessageListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             olderThanId: args.options.olderThanId !== undefined,
@@ -152,7 +133,7 @@ _YammerMessageListCommand_instances = new WeakSet(), _YammerMessageListCommand_i
         option: '--olderThanId [olderThanId]'
     }, {
         option: '--feedType [feedType]',
-        autocomplete: YammerMessageListCommand.feedTypes
+        autocomplete: _a.feedTypes
     }, {
         option: '--groupId [groupId]'
     }, {
@@ -170,8 +151,8 @@ _YammerMessageListCommand_instances = new WeakSet(), _YammerMessageListCommand_i
         if (args.options.feedType && (args.options.groupId || args.options.threadId)) {
             return `You cannot specify the feedType with groupId or threadId at the same time`;
         }
-        if (args.options.feedType && YammerMessageListCommand.feedTypes.indexOf(args.options.feedType) < 0) {
-            return `${args.options.feedType} is not a valid value for the feedType option. Allowed values are ${YammerMessageListCommand.feedTypes.join('|')}`;
+        if (args.options.feedType && _a.feedTypes.indexOf(args.options.feedType) < 0) {
+            return `${args.options.feedType} is not a valid value for the feedType option. Allowed values are ${_a.feedTypes.join('|')}`;
         }
         if (args.options.olderThanId && typeof args.options.olderThanId !== 'number') {
             return `${args.options.olderThanId} is not a number`;

package/dist/m365/yammer/commands/message/message-remove.js

@@ -23,24 +23,8 @@ class YammerMessageRemoveCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageRemoveCommand_instances, "m", _YammerMessageRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeMessage = async () => {
-            try {
-                const requestOptions = {
-                    url: `${this.resource}/v1/messages/${args.options.id}.json`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'content-type': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                await request.delete(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeMessage();
+            await this.removeMessage(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -50,10 +34,26 @@ class YammerMessageRemoveCommand extends YammerCommand {
                 message: `Are you sure you want to remove the Yammer message ${args.options.id}?`
             });
             if (result.continue) {
-                await removeMessage();
+                await this.removeMessage(args.options);
             }
         }
     }
+    async removeMessage(options) {
+        try {
+            const requestOptions = {
+                url: `${this.resource}/v1/messages/${options.id}.json`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _YammerMessageRemoveCommand_instances = new WeakSet(), _YammerMessageRemoveCommand_initTelemetry = function _YammerMessageRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {