@pnp/cli-microsoft365 7.5.0-beta.d4d820f → 7.6.0-beta.443bfd8

package/dist/m365/spo/commands/spo-search.js

@@ -38,16 +38,15 @@ class SpoSearchCommand extends SpoCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
             }
-            const startRow = args.options.startRow ? args.options.startRow : 0;
-            const results = await this.executeSearchQuery(logger, args, webUrl, [], startRow);
+            const results = await this.executeSearchQuery(logger, args, webUrl, []);
             this.printResults(logger, args, results);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async executeSearchQuery(logger, args, webUrl, resultSet, startRow) {
-        const requestUrl = await this.getRequestUrl(webUrl, logger, args, startRow);
+    async executeSearchQuery(logger, args, webUrl, resultSet, lastDocId = '0') {
+        const requestUrl = await this.getRequestUrl(webUrl, logger, args, lastDocId);
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -57,26 +56,36 @@ class SpoSearchCommand extends SpoCommand {
         };
         const searchResult = await request.get(requestOptions);
         resultSet.push(searchResult);
-        if (args.options.allResults && startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount < searchResult.PrimaryQueryResult.RelevantResults.TotalRows) {
-            const nextStartRow = startRow + searchResult.PrimaryQueryResult.RelevantResults.RowCount;
-            return this.executeSearchQuery(logger, args, webUrl, resultSet, nextStartRow);
+        const rowLimit = args.options.rowLimit ? args.options.rowLimit : 500;
+        if (args.options.allResults && searchResult.PrimaryQueryResult.RelevantResults.RowCount === rowLimit) {
+            if (this.verbose) {
+                await logger.logToStderr(`Processing search query, retrieved ${resultSet.length * searchResult.PrimaryQueryResult.RelevantResults.RowCount} of ${resultSet[0].PrimaryQueryResult.RelevantResults.TotalRows} items...`);
+            }
+            // When running in allResults mode, paging is done using the DocId property
+            // This is a more stable way than using the StartRow property.
+            // Explanation: https://learn.microsoft.com/sharepoint/dev/general-development/pagination-for-large-result-sets
+            const lastRow = searchResult.PrimaryQueryResult.RelevantResults.Table.Rows[searchResult.PrimaryQueryResult.RelevantResults.RowCount - 1];
+            const newLastDocId = lastRow.Cells.filter(cell => cell.Key === 'DocId')[0].Value;
+            return this.executeSearchQuery(logger, args, webUrl, resultSet, newLastDocId);
         }
         return resultSet;
     }
-    async getRequestUrl(webUrl, logger, args, startRow) {
+    async getRequestUrl(webUrl, logger, args, lastDocId) {
         // get the list of selected properties
         const selectPropertiesArray = this.getSelectPropertiesArray(args);
+        // get the sort list
+        const sortList = this.getSortList(args);
         // transform arg data to query string parameters
-        const propertySelectRequestString = `&selectproperties='${formatting.encodeQueryParameter(selectPropertiesArray.join(","))}'`;
-        const startRowRequestString = `&startrow=${startRow ? startRow : 0}`;
-        const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : ``;
+        const propertySelectRequestString = `&selectproperties='${formatting.encodeQueryParameter(selectPropertiesArray.join(','))}'`;
+        const startRowRequestString = `&startrow=${args.options.startRow ? args.options.startRow : 0}`;
+        const rowLimitRequestString = args.options.rowLimit ? `&rowlimit=${args.options.rowLimit}` : (args.options.allResults ? `&rowlimit=500` : '');
         const sourceIdRequestString = args.options.sourceId ? `&sourceid='${args.options.sourceId}'` : ``;
-        const trimDuplicatesRequestString = `&trimduplicates=${args.options.trimDuplicates ? args.options.trimDuplicates : "false"}`;
-        const enableStemmingRequestString = `&enablestemming=${typeof (args.options.enableStemming) === 'undefined' ? "true" : args.options.enableStemming}`;
+        const trimDuplicatesRequestString = `&trimduplicates=${args.options.trimDuplicates ? args.options.trimDuplicates : 'false'}`;
+        const enableStemmingRequestString = `&enablestemming=${typeof (args.options.enableStemming) === 'undefined' ? 'true' : args.options.enableStemming}`;
         const cultureRequestString = args.options.culture ? `&culture=${args.options.culture}` : ``;
         const refinementFiltersRequestString = args.options.refinementFilters ? `&refinementfilters='${args.options.refinementFilters}'` : ``;
         const queryTemplateRequestString = args.options.queryTemplate ? `&querytemplate='${args.options.queryTemplate}'` : ``;
-        const sortListRequestString = args.options.sortList ? `&sortList='${formatting.encodeQueryParameter(args.options.sortList)}'` : ``;
+        const sortListRequestString = sortList ? `&sortList='${sortList}'` : ``;
         const rankingModelIdRequestString = args.options.rankingModelId ? `&rankingmodelid='${args.options.rankingModelId}'` : ``;
         const propertiesRequestString = this.getPropertiesRequestString(args);
         const refinersRequestString = args.options.refiners ? `&refiners='${args.options.refiners}'` : ``;
@@ -86,8 +95,9 @@ class SpoSearchCommand extends SpoCommand {
         const processBestBetsRequestString = typeof (args.options.processBestBets) === 'undefined' ? `` : `&processbestbets=${args.options.processBestBets}`;
         const enableQueryRulesRequestString = typeof (args.options.enableQueryRules) === 'undefined' ? `` : `&enablequeryrules=${args.options.enableQueryRules}`;
         const processPersonalFavoritesRequestString = typeof (args.options.processPersonalFavorites) === 'undefined' ? `` : `&processpersonalfavorites=${args.options.processPersonalFavorites}`;
+        const indexDocIdQueryText = args.options.allResults ? ` IndexDocId>${lastDocId}` : '';
         // construct single requestUrl
-        const requestUrl = `${webUrl}/_api/search/query?querytext='${args.options.queryText}'`.concat(propertySelectRequestString, startRowRequestString, rowLimitRequestString, sourceIdRequestString, trimDuplicatesRequestString, enableStemmingRequestString, cultureRequestString, refinementFiltersRequestString, queryTemplateRequestString, sortListRequestString, rankingModelIdRequestString, propertiesRequestString, refinersRequestString, hiddenConstraintsRequestString, clientTypeRequestString, enablePhoneticRequestString, processBestBetsRequestString, enableQueryRulesRequestString, processPersonalFavoritesRequestString);
+        const requestUrl = `${webUrl}/_api/search/query?querytext='${args.options.queryText}${indexDocIdQueryText}'`.concat(propertySelectRequestString, startRowRequestString, rowLimitRequestString, sourceIdRequestString, trimDuplicatesRequestString, enableStemmingRequestString, cultureRequestString, refinementFiltersRequestString, queryTemplateRequestString, sortListRequestString, rankingModelIdRequestString, propertiesRequestString, refinersRequestString, hiddenConstraintsRequestString, clientTypeRequestString, enablePhoneticRequestString, processBestBetsRequestString, enableQueryRulesRequestString, processPersonalFavoritesRequestString);
         if (this.debug) {
             await logger.logToStderr(`RequestURL: ${requestUrl}`);
         }
@@ -96,7 +106,7 @@ class SpoSearchCommand extends SpoCommand {
     getPropertiesRequestString(args) {
         let properties = args.options.properties ? args.options.properties : '';
         if (args.options.sourceName) {
-            if (properties && !properties.endsWith(",")) {
+            if (properties && !properties.endsWith(',')) {
                 properties += `,`;
             }
             properties += `SourceName:${args.options.sourceName},SourceLevel:SPSite`;
@@ -104,9 +114,26 @@ class SpoSearchCommand extends SpoCommand {
         return properties ? `&properties='${properties}'` : ``;
     }
     getSelectPropertiesArray(args) {
-        return args.options.selectProperties
-            ? args.options.selectProperties.split(",")
-            : ["Title", "OriginalPath"];
+        const selectProperties = args.options.selectProperties
+            ? args.options.selectProperties.split(',')
+            : ['Title', 'OriginalPath'];
+        if (args.options.allResults) {
+            selectProperties.filter(p => p.toLowerCase() !== 'docid').push('DocId');
+        }
+        return selectProperties;
+    }
+    getSortList(args) {
+        const sortList = [];
+        if (args.options.allResults) {
+            sortList.push(formatting.encodeQueryParameter('[DocId]:ascending'));
+        }
+        if (args.options.sortList) {
+            const sortListArray = args.options.sortList.split(',');
+            sortListArray.forEach(sortItem => {
+                sortList.push(formatting.encodeQueryParameter(sortItem));
+            });
+        }
+        return sortList.join(',');
     }
     async printResults(logger, args, results) {
         if (args.options.rawOutput) {
@@ -116,9 +143,9 @@ class SpoSearchCommand extends SpoCommand {
             await logger.log(this.getParsedOutput(args, results));
         }
         if (!args.options.output || cli.shouldTrimOutput(args.options.output)) {
-            await logger.log("# Rows: " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
-            await logger.log("# Rows (Including duplicates): " + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
-            await logger.log("Elapsed Time: " + this.getElapsedTime(results));
+            await logger.log('# Rows: ' + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRows);
+            await logger.log('# Rows (Including duplicates): ' + results[results.length - 1].PrimaryQueryResult.RelevantResults.TotalRowsIncludingDuplicates);
+            await logger.log('Elapsed Time: ' + this.getElapsedTime(results));
         }
     }
     getElapsedTime(results) {
@@ -245,6 +272,9 @@ _SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = f
         if (args.options.startRow && !isNumber(args.options.startRow)) {
             return `${args.options.startRow} is not a valid number`;
         }
+        if (args.options.startRow && args.options.allResults) {
+            return 'You cannot specify startRow when allResults is set';
+        }
         if (args.options.culture && !isNumber(args.options.culture)) {
             return `${args.options.culture} is not a valid number`;
         }

package/dist/m365/spo/commands/spo-set.js

@@ -22,7 +22,7 @@ class SpoSetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        auth.service.spoUrl = args.options.url;
+        auth.connection.spoUrl = args.options.url;
         try {
             await auth.storeConnectionInfo();
         }

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

@@ -5,11 +5,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
+import { spo } from '../../../../utils/spo.js';
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+;
 class SpoUserRemoveCommand extends SpoCommand {
     get name() {
         return commands.USER_REMOVE;
@@ -40,13 +43,58 @@ class SpoUserRemoveCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Removing user from  subsite ${options.webUrl} ...`);
         }
-        let requestUrl = `${encodeURI(options.webUrl)}/_api/web/siteusers/`;
-        if (options.id) {
-            requestUrl += `removebyid(${options.id})`;
+        try {
+            let requestUrl = `${encodeURI(options.webUrl)}/_api/web/siteusers/`;
+            if (options.id) {
+                requestUrl += `removebyid(${options.id})`;
+            }
+            else if (options.loginName) {
+                requestUrl += `removeByLoginName('${formatting.encodeQueryParameter(options.loginName)}')`;
+            }
+            else if (options.email) {
+                const user = await spo.getUserByEmail(options.webUrl, options.email, logger, this.verbose);
+                requestUrl += `removebyid(${user.Id})`;
+            }
+            else if (options.userName) {
+                const user = await this.getUser(options);
+                if (!user) {
+                    throw new Error(`User not found: ${options.userName}`);
+                }
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing user ${user.Title} ...`);
+                }
+                requestUrl += `removebyid(${user.Id})`;
+            }
+            else if (options.entraGroupId || options.entraGroupName) {
+                const entraGroup = await this.getEntraGroup(options);
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing entra group ${entraGroup?.displayName} ...`);
+                }
+                //for entra groups, M365 groups have an associated email and security groups don't
+                if (entraGroup?.mail) {
+                    //M365 group is prefixed with c:0o.c|federateddirectoryclaimprovider
+                    requestUrl += `removeByLoginName('c:0o.c|federateddirectoryclaimprovider|${entraGroup.id}')`;
+                }
+                else {
+                    //security group is prefixed with c:0t.c|tenant
+                    requestUrl += `removeByLoginName('c:0t.c|tenant|${entraGroup?.id}')`;
+                }
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
         }
-        else if (options.loginName) {
-            requestUrl += `removeByLoginName('${formatting.encodeQueryParameter(options.loginName)}')`;
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
+    }
+    async getUser(options) {
+        const requestUrl = `${options.webUrl}/_api/web/siteusers?$filter=UserPrincipalName eq ('${formatting.encodeQueryParameter(options.userName)}')`;
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -54,20 +102,23 @@ class SpoUserRemoveCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        try {
-            await request.post(requestOptions);
-        }
-        catch (err) {
-            this.handleRejectedODataJsonPromise(err);
-        }
+        const userInstance = await request.get(requestOptions);
+        return userInstance.value[0];
+    }
+    async getEntraGroup(options) {
+        return options.entraGroupId ? await entraGroup.getGroupById(options.entraGroupId) : await entraGroup.getGroupByDisplayName(options.entraGroupName);
     }
 }
 _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            loginName: (!(!args.options.loginName)).toString(),
-            force: (!(!args.options.force)).toString()
+            id: typeof args.options.id !== 'undefined',
+            loginName: typeof args.options.loginName !== 'undefined',
+            email: typeof args.options.email !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
+            force: !!args.options.force
         });
     });
 }, _SpoUserRemoveCommand_initOptions = function _SpoUserRemoveCommand_initOptions() {
@@ -77,15 +128,41 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
         option: '-i, --id [id]'
     }, {
         option: '--loginName [loginName]'
+    }, {
+        option: '--email [email]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        return validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.id && isNaN(parseInt(args.options.id))) {
+            return `Specified id ${args.options.id} is not a number`;
+        }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `${args.options.entraId} is not a valid GUID.`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
+            return `${args.options.email} is not a valid email.`;
+        }
+        return true;
     });
 }, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'loginName'] });
+    this.optionSets.push({
+        options: ['id', 'loginName', 'email', 'userName', 'entraGroupId', 'entraGroupName']
+    });
 };
 export default new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map

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

@@ -58,7 +58,7 @@ class TeamsChatGetCommand extends GraphCommand {
     }
     async getChatIdByParticipants(participantsString) {
         const participants = participantsString.trim().toLowerCase().split(',').filter(e => e && e !== '');
-        const currentUserEmail = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[this.resource].accessToken).toLowerCase();
+        const currentUserEmail = accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[this.resource].accessToken).toLowerCase();
         const existingChats = await chatUtil.findExistingChatsByParticipants([currentUserEmail, ...participants]);
         if (!existingChats || existingChats.length === 0) {
             throw 'No chat conversation was found with these participants.';

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

@@ -29,7 +29,7 @@ class TeamsChatListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsChatListCommand_instances, "m", _TeamsChatListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
             throw `The option 'userId' or 'userName' is required when obtaining chats using app only permissions`;
         }

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -47,7 +47,7 @@ class TeamsChatMessageSendCommand extends GraphCommand {
     }
     async ensureChatIdByUserEmails(userEmailsOption) {
         const userEmails = userEmailsOption.trim().toLowerCase().split(',').filter(e => e && e !== '');
-        const currentUserEmail = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[this.resource].accessToken).toLowerCase();
+        const currentUserEmail = accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[this.resource].accessToken).toLowerCase();
         const existingChats = await chatUtil.findExistingChatsByParticipants([currentUserEmail, ...userEmails]);
         if (!existingChats || existingChats.length === 0) {
             const chat = await this.createConversation([currentUserEmail, ...userEmails]);

package/dist/m365/teams/commands/meeting/meeting-add.js

@@ -27,7 +27,7 @@ class TeamsMeetingAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
             if (isAppOnlyAccessToken && !args.options.organizerEmail) {
                 throw `The option 'organizerEmail' is required when creating a meeting using app only permissions`;
             }

package/dist/m365/teams/commands/meeting/meeting-attendancereport-list.js

@@ -30,7 +30,7 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsMeetingAttendancereportListCommand_instances, "m", _TeamsMeetingAttendancereportListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName && !args.options.email) {
             this.handleError(`The option 'userId', 'userName' or 'email' is required when retrieving meeting attendance report using app only permissions`);
         }

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

@@ -27,7 +27,7 @@ class TeamsMeetingGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
         if (isAppOnlyAccessToken) {
             if (!args.options.userId && !args.options.userName && !args.options.email) {
                 this.handleError(`The option 'userId', 'userName' or 'email' is required when retrieving meetings using app only permissions`);

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

@@ -32,7 +32,7 @@ class TeamsMeetingListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
             if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName && !args.options.email) {
                 throw `The option 'userId', 'userName' or 'email' is required when retrieving meetings using app only permissions`;
             }
@@ -40,7 +40,7 @@ class TeamsMeetingListCommand extends GraphCommand {
                 throw `The options 'userId', 'userName' and 'email' cannot be used when retrieving meetings using delegated permissions`;
             }
             if (this.verbose) {
-                await logger.logToStderr(`Retrieving meetings for user: ${args.options.userId || args.options.userName || args.options.email || accessToken.getUserNameFromAccessToken(auth.service.accessTokens[this.resource].accessToken)}...`);
+                await logger.logToStderr(`Retrieving meetings for user: ${args.options.userId || args.options.userName || args.options.email || accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[this.resource].accessToken)}...`);
             }
             const graphBaseUrl = await this.getGraphBaseUrl(args.options);
             const meetingUrls = await this.getMeetingJoinUrls(graphBaseUrl, args.options);

package/dist/m365/teams/commands/meeting/meeting-transcript-list.js

@@ -31,7 +31,7 @@ class TeamsMeetingTranscriptListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.service.accessTokens[this.resource].accessToken);
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving transcript list for the given meeting...`);
             }

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

@@ -25,7 +25,7 @@ class TenantIdGetCommand extends Command {
     async commandAction(logger, args) {
         let domainName = args.options.domainName;
         if (!domainName) {
-            const userName = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken);
+            const userName = accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
             domainName = userName.split('@')[1];
         }
         const requestOptions = {

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

@@ -29,7 +29,7 @@ class TenantInfoGetCommand extends GraphCommand {
         let domainName = args.options.domainName;
         const tenantId = args.options.tenantId;
         if (!domainName && !tenantId) {
-            const userName = accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken);
+            const userName = accessToken.getUserNameFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
             domainName = userName.split('@')[1];
         }
         let requestUrl = `${this.resource}/v1.0/tenantRelationships/`;

package/dist/m365/util/commands/accesstoken/accesstoken-get.js

@@ -23,15 +23,15 @@ class UtilAccessTokenGetCommand extends Command {
     async commandAction(logger, args) {
         let resource = args.options.resource;
         if (resource.toLowerCase() === 'sharepoint') {
-            if (auth.service.spoUrl) {
-                resource = auth.service.spoUrl;
+            if (auth.connection.spoUrl) {
+                resource = auth.connection.spoUrl;
             }
             else {
                 throw `SharePoint URL undefined. Use the 'm365 spo set --url https://contoso.sharepoint.com' command to set the URL`;
             }
         }
         else if (resource.toLowerCase() === 'graph') {
-            resource = Auth.getEndpointForResource('https://graph.microsoft.com', auth.service.cloudType);
+            resource = Auth.getEndpointForResource('https://graph.microsoft.com', auth.connection.cloudType);
         }
         try {
             const accessToken = await auth.ensureAccessToken(resource, logger, this.debug, args.options.new);

package/dist/m365/{yammer/commands/group/group-list.js → viva/commands/engage/engage-group-list.js}

@@ -3,24 +3,28 @@ 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 _YammerGroupListCommand_instances, _YammerGroupListCommand_initTelemetry, _YammerGroupListCommand_initOptions, _YammerGroupListCommand_initValidators;
+var _VivaEngageGroupListCommand_instances, _VivaEngageGroupListCommand_initTelemetry, _VivaEngageGroupListCommand_initOptions, _VivaEngageGroupListCommand_initValidators;
 import request from '../../../../request.js';
-import YammerCommand from '../../../base/YammerCommand.js';
+import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
-class YammerGroupListCommand extends YammerCommand {
+import yammerCommands from './yammerCommands.js';
+class VivaEngageGroupListCommand extends VivaEngageCommand {
     get name() {
-        return commands.GROUP_LIST;
+        return commands.ENGAGE_GROUP_LIST;
     }
     get description() {
-        return 'Returns the list of groups in a Yammer network or the groups for a specific user';
+        return 'Returns the list of groups in a Viva Engage network or the groups for a specific user';
+    }
+    alias() {
+        return [yammerCommands.GROUP_LIST];
     }
     constructor() {
         super();
-        _YammerGroupListCommand_instances.add(this);
+        _VivaEngageGroupListCommand_instances.add(this);
         this.items = [];
-        __classPrivateFieldGet(this, _YammerGroupListCommand_instances, "m", _YammerGroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _YammerGroupListCommand_instances, "m", _YammerGroupListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _YammerGroupListCommand_instances, "m", _YammerGroupListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _VivaEngageGroupListCommand_instances, "m", _VivaEngageGroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _VivaEngageGroupListCommand_instances, "m", _VivaEngageGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _VivaEngageGroupListCommand_instances, "m", _VivaEngageGroupListCommand_initValidators).call(this);
     }
     defaultProperties() {
         return ['id', 'name', 'email', 'privacy', 'external', 'moderated'];
@@ -55,6 +59,7 @@ class YammerGroupListCommand extends YammerCommand {
         }
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         this.items = []; // this will reset the items array in interactive mode
         try {
             await this.getAllItems(logger, args, 1);
@@ -65,20 +70,20 @@ class YammerGroupListCommand extends YammerCommand {
         }
     }
 }
-_YammerGroupListCommand_instances = new WeakSet(), _YammerGroupListCommand_initTelemetry = function _YammerGroupListCommand_initTelemetry() {
+_VivaEngageGroupListCommand_instances = new WeakSet(), _VivaEngageGroupListCommand_initTelemetry = function _VivaEngageGroupListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: args.options.userId !== undefined,
             limit: args.options.limit !== undefined
         });
     });
-}, _YammerGroupListCommand_initOptions = function _YammerGroupListCommand_initOptions() {
+}, _VivaEngageGroupListCommand_initOptions = function _VivaEngageGroupListCommand_initOptions() {
     this.options.unshift({
         option: '--userId [userId]'
     }, {
         option: '--limit [limit]'
     });
-}, _YammerGroupListCommand_initValidators = function _YammerGroupListCommand_initValidators() {
+}, _VivaEngageGroupListCommand_initValidators = function _VivaEngageGroupListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.userId && typeof args.options.userId !== 'number') {
             return `${args.options.userId} is not a number`;
@@ -89,5 +94,5 @@ _YammerGroupListCommand_instances = new WeakSet(), _YammerGroupListCommand_initT
         return true;
     });
 };
-export default new YammerGroupListCommand();
-//# sourceMappingURL=group-list.js.map
+export default new VivaEngageGroupListCommand();
+//# sourceMappingURL=engage-group-list.js.map

package/dist/m365/{yammer/commands/group/group-user-add.js → viva/commands/engage/engage-group-user-add.js}

@@ -3,25 +3,30 @@ 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 _YammerGroupUserAddCommand_instances, _YammerGroupUserAddCommand_initTelemetry, _YammerGroupUserAddCommand_initOptions, _YammerGroupUserAddCommand_initValidators;
+var _VivaEngageGroupUserAddCommand_instances, _VivaEngageGroupUserAddCommand_initTelemetry, _VivaEngageGroupUserAddCommand_initOptions, _VivaEngageGroupUserAddCommand_initValidators;
 import request from '../../../../request.js';
-import YammerCommand from '../../../base/YammerCommand.js';
+import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
-class YammerGroupUserAddCommand extends YammerCommand {
+import yammerCommands from './yammerCommands.js';
+class VivaEngageGroupUserAddCommand extends VivaEngageCommand {
     get name() {
-        return commands.GROUP_USER_ADD;
+        return commands.ENGAGE_GROUP_USER_ADD;
     }
     get description() {
-        return 'Adds a user to a Yammer Group';
+        return 'Adds a user to a Viva Engage Group';
+    }
+    alias() {
+        return [yammerCommands.GROUP_USER_ADD];
     }
     constructor() {
         super();
-        _YammerGroupUserAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _YammerGroupUserAddCommand_instances, "m", _YammerGroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _YammerGroupUserAddCommand_instances, "m", _YammerGroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _YammerGroupUserAddCommand_instances, "m", _YammerGroupUserAddCommand_initValidators).call(this);
+        _VivaEngageGroupUserAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _VivaEngageGroupUserAddCommand_instances, "m", _VivaEngageGroupUserAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _VivaEngageGroupUserAddCommand_instances, "m", _VivaEngageGroupUserAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _VivaEngageGroupUserAddCommand_instances, "m", _VivaEngageGroupUserAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         const requestOptions = {
             url: `${this.resource}/v1/group_memberships.json`,
             headers: {
@@ -43,14 +48,14 @@ class YammerGroupUserAddCommand extends YammerCommand {
         }
     }
 }
-_YammerGroupUserAddCommand_instances = new WeakSet(), _YammerGroupUserAddCommand_initTelemetry = function _YammerGroupUserAddCommand_initTelemetry() {
+_VivaEngageGroupUserAddCommand_instances = new WeakSet(), _VivaEngageGroupUserAddCommand_initTelemetry = function _VivaEngageGroupUserAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             email: typeof args.options.email !== 'undefined'
         });
     });
-}, _YammerGroupUserAddCommand_initOptions = function _YammerGroupUserAddCommand_initOptions() {
+}, _VivaEngageGroupUserAddCommand_initOptions = function _VivaEngageGroupUserAddCommand_initOptions() {
     this.options.unshift({
         option: '--groupId <groupId>'
     }, {
@@ -58,7 +63,7 @@ _YammerGroupUserAddCommand_instances = new WeakSet(), _YammerGroupUserAddCommand
     }, {
         option: '--email [email]'
     });
-}, _YammerGroupUserAddCommand_initValidators = function _YammerGroupUserAddCommand_initValidators() {
+}, _VivaEngageGroupUserAddCommand_initValidators = function _VivaEngageGroupUserAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (typeof args.options.groupId !== 'number') {
             return `${args.options.groupId} is not a number`;
@@ -69,5 +74,5 @@ _YammerGroupUserAddCommand_instances = new WeakSet(), _YammerGroupUserAddCommand
         return true;
     });
 };
-export default new YammerGroupUserAddCommand();
-//# sourceMappingURL=group-user-add.js.map
+export default new VivaEngageGroupUserAddCommand();
+//# sourceMappingURL=engage-group-user-add.js.map