@pnp/cli-microsoft365 7.5.0-beta.494c631 → 7.5.0-beta.5db13e8

package/dist/m365/viva/commands/engage/engage-report-groupsactivitydetail.js

@@ -0,0 +1,23 @@
+import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
+import commands from '../../commands.js';
+import yammerCommands from './yammerCommands.js';
+class VivaEngageReportGroupsActivityDetailCommand extends DateAndPeriodBasedReport {
+    get name() {
+        return commands.ENGAGE_REPORT_GROUPSACTIVITYDETAIL;
+    }
+    alias() {
+        return [yammerCommands.REPORT_GROUPSACTIVITYDETAIL];
+    }
+    get usageEndpoint() {
+        return 'getYammerGroupsActivityDetail';
+    }
+    get description() {
+        return 'Gets details about Viva Engage groups activity by group';
+    }
+    async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
+        await super.commandAction(logger, args);
+    }
+}
+export default new VivaEngageReportGroupsActivityDetailCommand();
+//# sourceMappingURL=engage-report-groupsactivitydetail.js.map

package/dist/m365/viva/commands/engage/engage-report-groupsactivitygroupcounts.js

@@ -0,0 +1,23 @@
+import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
+import commands from '../../commands.js';
+import yammerCommands from './yammerCommands.js';
+class VivaEngageReportGroupsActivityGroupCountsCommand extends PeriodBasedReport {
+    get name() {
+        return commands.ENGAGE_REPORT_GROUPSACTIVITYGROUPCOUNTS;
+    }
+    alias() {
+        return [yammerCommands.REPORT_GROUPSACTIVITYGROUPCOUNTS];
+    }
+    get usageEndpoint() {
+        return 'getYammerGroupsActivityGroupCounts';
+    }
+    get description() {
+        return 'Gets the total number of groups that existed and how many included group conversation activity';
+    }
+    async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
+        await super.commandAction(logger, args);
+    }
+}
+export default new VivaEngageReportGroupsActivityGroupCountsCommand();
+//# sourceMappingURL=engage-report-groupsactivitygroupcounts.js.map

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

@@ -3,22 +3,26 @@ 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 _YammerSearchCommand_instances, _a, _YammerSearchCommand_initTelemetry, _YammerSearchCommand_initOptions, _YammerSearchCommand_initValidators;
-import { cli } from '../../../cli/cli.js';
-import request from '../../../request.js';
-import { formatting } from '../../../utils/formatting.js';
-import YammerCommand from '../../base/YammerCommand.js';
-import commands from '../commands.js';
-class YammerSearchCommand extends YammerCommand {
+var _VivaEngageSearchCommand_instances, _a, _VivaEngageSearchCommand_initTelemetry, _VivaEngageSearchCommand_initOptions, _VivaEngageSearchCommand_initValidators;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
+import commands from '../../commands.js';
+import yammerCommands from './yammerCommands.js';
+class VivaEngageSearchCommand extends VivaEngageCommand {
     get name() {
-        return commands.SEARCH;
+        return commands.ENGAGE_SEARCH;
     }
     get description() {
         return 'Returns a list of messages, users, topics and groups that match the specified query.';
     }
+    alias() {
+        return [yammerCommands.SEARCH];
+    }
     constructor() {
         super();
-        _YammerSearchCommand_instances.add(this);
+        _VivaEngageSearchCommand_instances.add(this);
         this.summary = {
             messages: 0,
             groups: 0,
@@ -29,9 +33,9 @@ class YammerSearchCommand extends YammerCommand {
         this.groups = [];
         this.topics = [];
         this.users = [];
-        __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _VivaEngageSearchCommand_instances, "m", _VivaEngageSearchCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _VivaEngageSearchCommand_instances, "m", _VivaEngageSearchCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _VivaEngageSearchCommand_instances, "m", _VivaEngageSearchCommand_initValidators).call(this);
     }
     async getAllItems(logger, args, page) {
         const endpoint = `${this.resource}/v1/search.json?search=${formatting.encodeQueryParameter(args.options.queryText)}&page=${page}`;
@@ -89,6 +93,7 @@ class YammerSearchCommand extends YammerCommand {
         }
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         this.summary = {
             messages: 0,
             groups: 0,
@@ -169,14 +174,14 @@ class YammerSearchCommand extends YammerCommand {
         }
     }
 }
-_a = YammerSearchCommand, _YammerSearchCommand_instances = new WeakSet(), _YammerSearchCommand_initTelemetry = function _YammerSearchCommand_initTelemetry() {
+_a = VivaEngageSearchCommand, _VivaEngageSearchCommand_instances = new WeakSet(), _VivaEngageSearchCommand_initTelemetry = function _VivaEngageSearchCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             show: typeof args.options.show !== 'undefined',
             limit: typeof args.options.limit !== 'undefined'
         });
     });
-}, _YammerSearchCommand_initOptions = function _YammerSearchCommand_initOptions() {
+}, _VivaEngageSearchCommand_initOptions = function _VivaEngageSearchCommand_initOptions() {
     this.options.unshift({
         option: '--queryText <queryText>'
     }, {
@@ -185,7 +190,7 @@ _a = YammerSearchCommand, _YammerSearchCommand_instances = new WeakSet(), _Yamme
     }, {
         option: '--limit [limit]'
     });
-}, _YammerSearchCommand_initValidators = function _YammerSearchCommand_initValidators() {
+}, _VivaEngageSearchCommand_initValidators = function _VivaEngageSearchCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.queryText && typeof args.options.queryText !== 'string') {
             return `${args.options.queryText} is not a string`;
@@ -209,8 +214,8 @@ _a = YammerSearchCommand, _YammerSearchCommand_instances = new WeakSet(), _Yamme
         return true;
     });
 };
-YammerSearchCommand.showOptions = [
+VivaEngageSearchCommand.showOptions = [
     'summary', 'messages', 'users', 'topics', 'groups'
 ];
-export default new YammerSearchCommand();
-//# sourceMappingURL=yammer-search.js.map
+export default new VivaEngageSearchCommand();
+//# sourceMappingURL=engage-search.js.map

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

@@ -3,29 +3,34 @@ 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 _YammerUserGetCommand_instances, _YammerUserGetCommand_initTelemetry, _YammerUserGetCommand_initOptions, _YammerUserGetCommand_initValidators;
+var _VivaEngageUserGetCommand_instances, _VivaEngageUserGetCommand_initTelemetry, _VivaEngageUserGetCommand_initOptions, _VivaEngageUserGetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
-import YammerCommand from '../../../base/YammerCommand.js';
+import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
-class YammerUserGetCommand extends YammerCommand {
+import yammerCommands from './yammerCommands.js';
+class VivaEngageUserGetCommand extends VivaEngageCommand {
     get name() {
-        return commands.USER_GET;
+        return commands.ENGAGE_USER_GET;
     }
     get description() {
         return 'Retrieves the current user or searches for a user by ID or e-mail';
     }
+    alias() {
+        return [yammerCommands.USER_GET];
+    }
     defaultProperties() {
         return ['id', 'full_name', 'email', 'job_title', 'state', 'url'];
     }
     constructor() {
         super();
-        _YammerUserGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _YammerUserGetCommand_instances, "m", _YammerUserGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _YammerUserGetCommand_instances, "m", _YammerUserGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _YammerUserGetCommand_instances, "m", _YammerUserGetCommand_initValidators).call(this);
+        _VivaEngageUserGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _VivaEngageUserGetCommand_instances, "m", _VivaEngageUserGetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
+        await this.showDeprecationWarning(logger, this.alias()[0], this.name);
         let endPoint = `${this.resource}/v1/users/current.json`;
         if (args.options.id) {
             endPoint = `${this.resource}/v1/users/${args.options.id}.json`;
@@ -50,20 +55,20 @@ class YammerUserGetCommand extends YammerCommand {
         }
     }
 }
-_YammerUserGetCommand_instances = new WeakSet(), _YammerUserGetCommand_initTelemetry = function _YammerUserGetCommand_initTelemetry() {
+_VivaEngageUserGetCommand_instances = new WeakSet(), _VivaEngageUserGetCommand_initTelemetry = function _VivaEngageUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: args.options.id !== undefined,
             email: args.options.email !== undefined
         });
     });
-}, _YammerUserGetCommand_initOptions = function _YammerUserGetCommand_initOptions() {
+}, _VivaEngageUserGetCommand_initOptions = function _VivaEngageUserGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '--email [email]'
     });
-}, _YammerUserGetCommand_initValidators = function _YammerUserGetCommand_initValidators() {
+}, _VivaEngageUserGetCommand_initValidators = function _VivaEngageUserGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id !== undefined && args.options.email !== undefined) {
             return `You are only allowed to search by ID or e-mail but not both`;
@@ -71,5 +76,5 @@ _YammerUserGetCommand_instances = new WeakSet(), _YammerUserGetCommand_initTelem
         return true;
     });
 };
-export default new YammerUserGetCommand();
-//# sourceMappingURL=user-get.js.map
+export default new VivaEngageUserGetCommand();
+//# sourceMappingURL=engage-user-get.js.map

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

@@ -3,27 +3,31 @@ 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 _YammerUserListCommand_instances, _YammerUserListCommand_initTelemetry, _YammerUserListCommand_initOptions, _YammerUserListCommand_initValidators;
+var _VivaEngageUserListCommand_instances, _VivaEngageUserListCommand_initTelemetry, _VivaEngageUserListCommand_initOptions, _VivaEngageUserListCommand_initValidators;
 import request from '../../../../request.js';
-import YammerCommand from '../../../base/YammerCommand.js';
+import VivaEngageCommand from '../../../base/VivaEngageCommand.js';
 import commands from '../../commands.js';
-class YammerUserListCommand extends YammerCommand {
+import yammerCommands from './yammerCommands.js';
+class VivaEngageUserListCommand extends VivaEngageCommand {
     get name() {
-        return commands.USER_LIST;
+        return commands.ENGAGE_USER_LIST;
     }
     get description() {
         return 'Returns users from the current network';
     }
+    alias() {
+        return [yammerCommands.USER_LIST];
+    }
     defaultProperties() {
         return ['id', 'full_name', 'email'];
     }
     constructor() {
         super();
-        _YammerUserListCommand_instances.add(this);
+        _VivaEngageUserListCommand_instances.add(this);
         this.items = [];
-        __classPrivateFieldGet(this, _YammerUserListCommand_instances, "m", _YammerUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _YammerUserListCommand_instances, "m", _YammerUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _YammerUserListCommand_instances, "m", _YammerUserListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _VivaEngageUserListCommand_instances, "m", _VivaEngageUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _VivaEngageUserListCommand_instances, "m", _VivaEngageUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _VivaEngageUserListCommand_instances, "m", _VivaEngageUserListCommand_initValidators).call(this);
     }
     getAllItems(logger, args, page) {
         return new Promise((resolve, reject) => {
@@ -88,6 +92,7 @@ class YammerUserListCommand 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);
@@ -98,7 +103,7 @@ class YammerUserListCommand extends YammerCommand {
         }
     }
 }
-_YammerUserListCommand_instances = new WeakSet(), _YammerUserListCommand_initTelemetry = function _YammerUserListCommand_initTelemetry() {
+_VivaEngageUserListCommand_instances = new WeakSet(), _VivaEngageUserListCommand_initTelemetry = function _VivaEngageUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             letter: args.options.letter !== undefined,
@@ -108,7 +113,7 @@ _YammerUserListCommand_instances = new WeakSet(), _YammerUserListCommand_initTel
             groupId: args.options.groupId !== undefined
         });
     });
-}, _YammerUserListCommand_initOptions = function _YammerUserListCommand_initOptions() {
+}, _VivaEngageUserListCommand_initOptions = function _VivaEngageUserListCommand_initOptions() {
     this.options.unshift({
         option: '-g, --groupId [groupId]'
     }, {
@@ -121,7 +126,7 @@ _YammerUserListCommand_instances = new WeakSet(), _YammerUserListCommand_initTel
         option: '--sortBy [sortBy]',
         autocomplete: ['messages', 'followers']
     });
-}, _YammerUserListCommand_initValidators = function _YammerUserListCommand_initValidators() {
+}, _VivaEngageUserListCommand_initValidators = function _VivaEngageUserListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && typeof args.options.groupId !== 'number') {
             return `${args.options.groupId} is not a number`;
@@ -141,5 +146,5 @@ _YammerUserListCommand_instances = new WeakSet(), _YammerUserListCommand_initTel
         return true;
     });
 };
-export default new YammerUserListCommand();
-//# sourceMappingURL=user-list.js.map
+export default new VivaEngageUserListCommand();
+//# sourceMappingURL=engage-user-list.js.map

package/dist/m365/{yammer/commands.js → viva/commands/engage/yammerCommands.js}

@@ -22,4 +22,4 @@ export default {
     USER_GET: `${prefix} user get`,
     USER_LIST: `${prefix} user list`
 };
-//# sourceMappingURL=commands.js.map
+//# sourceMappingURL=yammerCommands.js.map

package/dist/m365/viva/commands.js

@@ -1,5 +1,26 @@
 const prefix = 'viva';
 export default {
-    CONNECTIONS_APP_CREATE: `${prefix} connections app create`
+    CONNECTIONS_APP_CREATE: `${prefix} connections app create`,
+    ENGAGE_GROUP_LIST: `${prefix} engage group list`,
+    ENGAGE_GROUP_USER_ADD: `${prefix} engage group user add`,
+    ENGAGE_GROUP_USER_REMOVE: `${prefix} engage group user remove`,
+    ENGAGE_MESSAGE_ADD: `${prefix} engage message add`,
+    ENGAGE_MESSAGE_GET: `${prefix} engage message get`,
+    ENGAGE_MESSAGE_LIKE_SET: `${prefix} engage message like set`,
+    ENGAGE_MESSAGE_LIST: `${prefix} engage message list`,
+    ENGAGE_MESSAGE_REMOVE: `${prefix} engage message remove`,
+    ENGAGE_NETWORK_LIST: `${prefix} engage network list`,
+    ENGAGE_REPORT_ACTIVITYCOUNTS: `${prefix} engage report activitycounts`,
+    ENGAGE_REPORT_ACTIVITYUSERCOUNTS: `${prefix} engage report activityusercounts`,
+    ENGAGE_REPORT_ACTIVITYUSERDETAIL: `${prefix} engage report activityuserdetail`,
+    ENGAGE_REPORT_DEVICEUSAGEDISTRIBUTIONUSERCOUNTS: `${prefix} engage report deviceusagedistributionusercounts`,
+    ENGAGE_REPORT_DEVICEUSAGEUSERCOUNTS: `${prefix} engage report deviceusageusercounts`,
+    ENGAGE_REPORT_DEVICEUSAGEUSERDETAIL: `${prefix} engage report deviceusageuserdetail`,
+    ENGAGE_REPORT_GROUPSACTIVITYCOUNTS: `${prefix} engage report groupsactivitycounts`,
+    ENGAGE_REPORT_GROUPSACTIVITYDETAIL: `${prefix} engage report groupsactivitydetail`,
+    ENGAGE_REPORT_GROUPSACTIVITYGROUPCOUNTS: `${prefix} engage report groupsactivitygroupcounts`,
+    ENGAGE_SEARCH: `${prefix} engage search`,
+    ENGAGE_USER_GET: `${prefix} engage user get`,
+    ENGAGE_USER_LIST: `${prefix} engage user list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/request.js

@@ -130,7 +130,7 @@ class Request {
         if (!this._logger) {
             return Promise.reject('Logger not set on the request object');
         }
-        this.updateRequestForCloudType(options, auth.service.cloudType);
+        this.updateRequestForCloudType(options, auth.connection.cloudType);
         return new Promise((_resolve, _reject) => {
             (() => {
                 if (options.headers && options.headers['x-anonymous']) {

package/dist/utils/{aadAdministrativeUnit.js → entraAdministrativeUnit.js}

@@ -1,7 +1,7 @@
 import { odata } from './odata.js';
 import { formatting } from './formatting.js';
 import { cli } from '../cli/cli.js';
-export const aadAdministrativeUnit = {
+export const entraAdministrativeUnit = {
     /**
      * Get an administrative unit by its display name.
      * @param displayName Administrative unit display name.
@@ -22,4 +22,4 @@ export const aadAdministrativeUnit = {
         return administrativeUnits[0];
     }
 };
-//# sourceMappingURL=aadAdministrativeUnit.js.map
+//# sourceMappingURL=entraAdministrativeUnit.js.map

package/dist/utils/{aadDevice.js → entraDevice.js}

@@ -2,7 +2,7 @@ import { odata } from "./odata.js";
 import { formatting } from "./formatting.js";
 import { cli } from "../cli/cli.js";
 const graphResource = 'https://graph.microsoft.com';
-export const aadDevice = {
+export const entraDevice = {
     /**
      * Get a device by its display name.
      * @param displayName Device display name.
@@ -22,4 +22,4 @@ export const aadDevice = {
         return devices[0];
     }
 };
-//# sourceMappingURL=aadDevice.js.map
+//# sourceMappingURL=entraDevice.js.map

package/dist/utils/{aadGroup.js → entraGroup.js}

@@ -3,7 +3,7 @@ import { formatting } from "./formatting.js";
 import { odata } from "./odata.js";
 import { cli } from '../cli/cli.js';
 const graphResource = 'https://graph.microsoft.com';
-export const aadGroup = {
+export const entraGroup = {
     /**
      * Retrieve a single group.
      * @param id Group ID.
@@ -95,4 +95,4 @@ export const aadGroup = {
         return group.groupTypes.some(type => type === 'Unified');
     }
 };
-//# sourceMappingURL=aadGroup.js.map
+//# sourceMappingURL=entraGroup.js.map

package/dist/utils/{aadUser.js → entraUser.js}

@@ -1,7 +1,7 @@
 import request from "../request.js";
 import { formatting } from "./formatting.js";
 const graphResource = 'https://graph.microsoft.com';
-export const aadUser = {
+export const entraUser = {
     /**
      * Retrieve the id of a user by its UPN.
      * @param upn User UPN.
@@ -20,6 +20,42 @@ export const aadUser = {
         }
         return res.value[0].id;
     },
+    /**
+     * Retrieve the IDs of users by their UPNs. There is no guarantee that the order of the returned IDs will match the order of the specified UPNs.
+     * @param upns Array of user UPNs.
+     * @returns Array of user IDs.
+     */
+    async getUserIdsByUpns(upns) {
+        const userIds = [];
+        for (let i = 0; i < upns.length; i += 20) {
+            const upnsChunk = upns.slice(i, i + 20);
+            const requestOptions = {
+                url: `${graphResource}/v1.0/$batch`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requests: upnsChunk.map((upn, index) => ({
+                        id: index + 1,
+                        method: 'GET',
+                        url: `/users/${formatting.encodeQueryParameter(upn)}?$select=id`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        }
+                    }))
+                }
+            };
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 200) {
+                    throw Error(`The specified user with user name '${upnsChunk[response.id - 1]}' does not exist.`);
+                }
+                userIds.push(response.body.id);
+            }
+        }
+        return userIds;
+    },
     /**
     * Retrieve the ID of a user by its email.
     * @param mail User email.
@@ -54,4 +90,4 @@ export const aadUser = {
         return res.userPrincipalName;
     }
 };
-//# sourceMappingURL=aadUser.js.map
+//# sourceMappingURL=entraUser.js.map

package/dist/utils/spo.js

@@ -8,7 +8,7 @@ import request from "../request.js";
 import { formatting } from './formatting.js';
 import { odata } from './odata.js';
 import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
-import { aadGroup } from './aadGroup.js';
+import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
 export const spo = {
     getRequestDigest(siteUrl) {
@@ -96,11 +96,11 @@ export const spo = {
         });
     },
     async getSpoUrl(logger, debug) {
-        if (auth.service.spoUrl) {
+        if (auth.connection.spoUrl) {
             if (debug) {
-                await logger.logToStderr(`SPO URL previously retrieved ${auth.service.spoUrl}. Returning...`);
+                await logger.logToStderr(`SPO URL previously retrieved ${auth.connection.spoUrl}. Returning...`);
             }
-            return Promise.resolve(auth.service.spoUrl);
+            return Promise.resolve(auth.connection.spoUrl);
         }
         return new Promise(async (resolve, reject) => {
             if (debug) {
@@ -116,14 +116,14 @@ export const spo = {
             request
                 .get(requestOptions)
                 .then((res) => {
-                auth.service.spoUrl = res.webUrl;
+                auth.connection.spoUrl = res.webUrl;
                 return auth.storeConnectionInfo();
             })
                 .then(() => {
-                resolve(auth.service.spoUrl);
+                resolve(auth.connection.spoUrl);
             }, (err) => {
-                if (auth.service.spoUrl) {
-                    resolve(auth.service.spoUrl);
+                if (auth.connection.spoUrl) {
+                    resolve(auth.connection.spoUrl);
                 }
                 else {
                     reject(err);
@@ -143,11 +143,11 @@ export const spo = {
         });
     },
     async getTenantId(logger, debug) {
-        if (auth.service.tenantId) {
+        if (auth.connection.spoTenantId) {
             if (debug) {
-                await logger.logToStderr(`SPO Tenant ID previously retrieved ${auth.service.tenantId}. Returning...`);
+                await logger.logToStderr(`SPO Tenant ID previously retrieved ${auth.connection.spoTenantId}. Returning...`);
             }
-            return Promise.resolve(auth.service.tenantId);
+            return Promise.resolve(auth.connection.spoTenantId);
         }
         return new Promise(async (resolve, reject) => {
             if (debug) {
@@ -173,14 +173,14 @@ export const spo = {
             })
                 .then((res) => {
                 const json = JSON.parse(res);
-                auth.service.tenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '
');
+                auth.connection.spoTenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '
');
                 return auth.storeConnectionInfo();
             })
                 .then(() => {
-                resolve(auth.service.tenantId);
+                resolve(auth.connection.spoTenantId);
             }, (err) => {
-                if (auth.service.tenantId) {
-                    resolve(auth.service.tenantId);
+                if (auth.connection.spoTenantId) {
+                    resolve(auth.connection.spoTenantId);
                 }
                 else {
                     reject(err);
@@ -996,7 +996,7 @@ export const spo = {
                     promises.push(request.post(requestOptions));
                 }
                 if (typeof isPublic !== 'undefined') {
-                    promises.push(aadGroup.setGroup(groupId, (isPublic === false), logger, verbose));
+                    promises.push(entraGroup.setGroup(groupId, (isPublic === false), logger, verbose));
                 }
                 if (typeof owners !== 'undefined') {
                     promises.push(spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));
@@ -1312,6 +1312,28 @@ export const spo = {
             responseType: 'json'
         };
         await request.post(requestOptions);
+    },
+    /**
+     * Retrieves the site ID for a given web URL.
+     * @param webUrl The web URL for which to retrieve the site ID.
+     * @param logger The logger object.
+     * @param verbose Set for verbose logging
+     * @returns A promise that resolves to the site ID.
+     */
+    async getSiteId(webUrl, logger, verbose) {
+        if (verbose && logger) {
+            logger.logToStderr(`Getting site id for URL: ${webUrl}...`);
+        }
+        const url = new URL(webUrl);
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/sites/${formatting.encodeQueryParameter(url.host)}:${url.pathname}?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const site = await request.get(requestOptions);
+        return site.id;
     }
 };
 //# sourceMappingURL=spo.js.map

package/dist/utils/urlUtil.js

@@ -166,6 +166,37 @@ export const urlUtil = {
             relativeUrl = relativeUrl.substring(0, relativeUrl.length - 1);
         }
         return `${baseUrl}/${relativeUrl}`;
+    },
+    /**
+     * Get the absolute URL from the target SharePoint URL.
+     * @param {string} webUrl - The base web URL.
+     * @param {string} url - The target SharePoint URL.
+     * @returns {string} - The target site absolute URL.
+     *
+     * Example Scenarios:
+     * - webUrl = "https://contoso.sharepoint.com" and targetUrl = "/teams/sales/Shared Documents/temp/123/234",
+     *    returns "https://contoso.sharepoint.com/teams/sales".
+     * - webUrl = "https://contoso.sharepoint.com" and targetUrl = "https://contoso-my.sharepoint.com/personal/john_contoso_onmicrosoft_com/Documents/123",
+     *    returns "https://contoso-my.sharepoint.com/personal/john_contoso_onmicrosoft_com".
+     * - webUrl = "https://contoso.sharepoint.com/teams/sales" and targetUrl = "/Shared Documents/temp",
+     *    returns "https://contoso.sharepoint.com".
+     * - webUrl = "https://contoso.sharepoint.com" and targetUrl = "/teams/sales/Shared Documents/temp",
+     *    returns "https://contoso.sharepoint.com/teams/sales".
+    */
+    getTargetSiteAbsoluteUrl(webUrl, url) {
+        const fullUrl = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        // Pattern to match SharePoint URLs
+        const urlPattern = /https:\/\/[\w\-]+\.sharepoint\.com\/(teams|sites|personal)\/([\w\-]+)/;
+        const match = fullUrl.match(urlPattern);
+        if (match) {
+            // If a match is found, return the matched URL
+            return match[0];
+        }
+        else {
+            // Extract the root URL
+            const rootUrl = new URL(fullUrl);
+            return rootUrl.origin;
+        }
     }
 };
 //# sourceMappingURL=urlUtil.js.map

package/dist/utils/validation.js

@@ -21,6 +21,10 @@ export const validation = {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+(@thread\.v2|@unq\.gbl\.spaces)$/i);
         return guidRegEx.test(guid);
     },
+    isValidUserPrincipalNameArray(upns) {
+        const invalidGuid = upns.find(upn => !this.isValidUserPrincipalName(upn));
+        return invalidGuid || true;
+    },
     isValidUserPrincipalName(upn) {
         const upnRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/i);
         // verify if the upn is a valid upn. @meusername will be replaced in a later stage with the actual username of the logged in user
@@ -317,6 +321,10 @@ export const validation = {
             return true;
         }
         return false;
+    },
+    isValidMailNickname(mailNickname) {
+        const mailNicknameRegEx = new RegExp(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]*$/i);
+        return mailNicknameRegEx.test(mailNickname);
     }
 };
 //# sourceMappingURL=validation.js.map