@pnp/cli-microsoft365 10.9.0-beta.bc13e90 → 10.10.0-beta.1bb5ba0

package/dist/cli/cli.js

@@ -34,7 +34,7 @@ let currentCommandName;
 let optionsFromArgs;
 const defaultHelpMode = 'options';
 const defaultHelpTarget = 'console';
-const helpModes = ['options', 'examples', 'remarks', 'response', 'full'];
+const helpModes = ['options', 'examples', 'remarks', 'permissions', 'response', 'full'];
 const helpTargets = ['console', 'web'];
 const yargsConfiguration = {
     'parse-numbers': true,
@@ -791,7 +791,7 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
     }
     let errorMessage = error instanceof CommandError ? error.message : error;
     if (error instanceof ZodError) {
-        errorMessage = error.errors.map(e => `${e.path.join('.')}: ${e.message}`).join(os.EOL);
+        errorMessage = error.errors.map(e => (e.path.length > 0 ? `${e.path.join('.')}: ${e.message}` : e.message)).join(os.EOL);
     }
     if ((!args.options.output || args.options.output === 'json') &&
         !cli.getSettingWithDefaultValue(settingsNames.printErrorsAsPlainText, true)) {

package/dist/m365/app/commands/permission/permission-add.js

@@ -4,6 +4,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
 const options = appCommandOptions
     .extend({
     applicationPermissions: z.string().optional(),
@@ -58,7 +59,13 @@ class AppPermissionAddCommand extends AppCommand {
             };
             await request.patch(addPermissionsRequestOptions);
             if (args.options.grantAdminConsent) {
-                const appServicePrincipal = servicePrincipals.find(sp => sp.appId === this.appId);
+                let appServicePrincipal = servicePrincipals.find(sp => sp.appId === this.appId);
+                if (!appServicePrincipal) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Creating service principal for app ${this.appId}...`);
+                    }
+                    appServicePrincipal = await entraServicePrincipal.createServicePrincipal(this.appId);
+                }
                 await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
             }
         }

package/dist/m365/base/SpoCommand.js

@@ -28,6 +28,7 @@ export default class SpoCommand extends Command {
             'parentWebUrl',
             'previewImageUrl',
             'siteLogoUrl',
+            'siteThumbnailUrl',
             'siteUrl',
             'StartASiteFormUrl',
             'targetUrl',

package/dist/m365/entra/commands/app/app-permission-add.js

@@ -11,6 +11,7 @@ import request from "../../../../request.js";
 import { validation } from "../../../../utils/validation.js";
 import { formatting } from "../../../../utils/formatting.js";
 import { cli } from "../../../../cli/cli.js";
+import { entraServicePrincipal } from "../../../../utils/entraServicePrincipal.js";
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -58,7 +59,10 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             if (args.options.grantAdminConsent) {
                 let appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
                 if (!appServicePrincipal) {
-                    appServicePrincipal = await this.createServicePrincipal(appObject.appId, logger);
+                    if (this.verbose) {
+                        await logger.logToStderr(`Creating service principal for app ${appObject.appId}...`);
+                    }
+                    appServicePrincipal = await entraServicePrincipal.createServicePrincipal(appObject.appId);
                 }
                 await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
             }
@@ -67,23 +71,6 @@ class EntraAppPermissionAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async createServicePrincipal(appId, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Creating service principal for app ${appId}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json;odata=nometadata'
-            },
-            data: {
-                appId
-            },
-            responseType: 'json'
-        };
-        return await request.post(requestOptions);
-    }
     async getAppObject(options) {
         let appNotFoundMessage = '';
         let apps = [];

package/dist/m365/entra/commands/m365group/m365group-get.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 _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators, _EntraM365GroupGetCommand_initOptionSets, _EntraM365GroupGetCommand_initTypes;
+var _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initTelemetry, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators, _EntraM365GroupGetCommand_initOptionSets, _EntraM365GroupGetCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -19,12 +19,16 @@ class EntraM365GroupGetCommand extends GraphCommand {
     constructor() {
         super();
         _EntraM365GroupGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includeSiteUrl) {
+            await this.warn(logger, `Parameter 'includeSiteUrl' is deprecated. Please use 'withSiteUrl' instead`);
+        }
         let group;
         try {
             if (args.options.id) {
@@ -46,7 +50,7 @@ class EntraM365GroupGetCommand extends GraphCommand {
             };
             const groupExtended = await request.get(requestExtendedOptions);
             group = { ...group, ...groupExtended };
-            if (args.options.includeSiteUrl) {
+            if (args.options.includeSiteUrl || args.options.withSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
                     headers: {
@@ -64,13 +68,22 @@ class EntraM365GroupGetCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_initOptions = function _EntraM365GroupGetCommand_initOptions() {
+_EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_initTelemetry = function _EntraM365GroupGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeSiteUrl: !!args.options.includeSiteUrl,
+            withSiteUrl: !!args.options.withSiteUrl
+        });
+    });
+}, _EntraM365GroupGetCommand_initOptions = function _EntraM365GroupGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
     }, {
         option: '--includeSiteUrl'
+    }, {
+        option: '--withSiteUrl'
     });
 }, _EntraM365GroupGetCommand_initValidators = function _EntraM365GroupGetCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/m365group/m365group-list.js

@@ -26,6 +26,9 @@ class EntraM365GroupListCommand extends GraphCommand {
         return ['id', 'displayName', 'mailNickname', 'siteUrl'];
     }
     async commandAction(logger, args) {
+        if (args.options.includeSiteUrl) {
+            await this.warn(logger, `Parameter 'includeSiteUrl' is deprecated. Please use 'withSiteUrl' instead`);
+        }
         const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.displayName)}')` : '';
         const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.mailNickname)}')` : '';
@@ -43,7 +46,7 @@ class EntraM365GroupListCommand extends GraphCommand {
                 });
                 groups = orphanedGroups;
             }
-            if (args.options.includeSiteUrl) {
+            if (args.options.includeSiteUrl || args.options.withSiteUrl) {
                 const res = await Promise.all(groups.map(g => this.getGroupSiteUrl(g.id)));
                 res.forEach(r => {
                     for (let i = 0; i < groups.length; i++) {
@@ -82,6 +85,7 @@ _EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand
             displayName: typeof args.options.displayName !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined',
             includeSiteUrl: args.options.includeSiteUrl,
+            withSiteUrl: !!args.options.withSiteUrl,
             orphaned: !!args.options.orphaned
         });
     });
@@ -92,6 +96,8 @@ _EntraM365GroupListCommand_instances = new WeakSet(), _EntraM365GroupListCommand
         option: '-m, --mailNickname [displayName]'
     }, {
         option: '--includeSiteUrl'
+    }, {
+        option: '--withSiteUrl'
     }, {
         option: '--orphaned'
     });

package/dist/m365/entra/commands/organization/organization-set.js

@@ -0,0 +1,104 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { odata } from '../../../../utils/odata.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional()),
+    displayName: zod.alias('d', z.string().optional()),
+    marketingNotificationEmails: z.string().refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, invalidEmails => ({
+        message: `The following marketing notification emails are invalid: ${invalidEmails}.`
+    })).transform((value) => value.split(',')).optional(),
+    securityComplianceNotificationMails: z.string().refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, invalidEmails => ({
+        message: `The following security compliance notification emails are invalid: ${invalidEmails}.`
+    })).transform((value) => value.split(',')).optional(),
+    securityComplianceNotificationPhones: z.string().transform((value) => value.split(',')).optional(),
+    technicalNotificationMails: z.string().refine(emails => validation.isValidUserPrincipalNameArray(emails) === true, invalidEmails => ({
+        message: `The following technical notification emails are invalid: ${invalidEmails}.`
+    })).transform((value) => value.split(',')).optional(),
+    contactEmail: z.string().refine(id => validation.isValidUserPrincipalName(id), id => ({
+        message: `'${id}' is not a valid email.`
+    })).optional(),
+    statementUrl: z.string().optional()
+})
+    .strict();
+class EntraOrganizationSetCommand extends GraphCommand {
+    get name() {
+        return commands.ORGANIZATION_SET;
+    }
+    get description() {
+        return 'Updates info about the organization';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.id && options.displayName), {
+            message: 'Specify either id or displayName, but not both'
+        })
+            .refine(options => options.id || options.displayName, {
+            message: 'Specify either id or displayName'
+        })
+            .refine(options => [options.contactEmail, options.marketingNotificationEmails, options.securityComplianceNotificationMails, options.securityComplianceNotificationPhones,
+            options.statementUrl, options.technicalNotificationMails].filter(o => o !== undefined).length > 0, {
+            message: 'Specify at least one of the following options: contactEmail, marketingNotificationEmails, securityComplianceNotificationMails, securityComplianceNotificationPhones, statementUrl, or technicalNotificationMails'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            let organizationId = args.options.id;
+            if (args.options.displayName) {
+                organizationId = await this.getOrganizationIdByDisplayName(args.options.displayName);
+            }
+            if (args.options.verbose) {
+                await logger.logToStderr(`Updating organization with ID ${organizationId}...`);
+            }
+            const data = {
+                marketingNotificationEmails: args.options.marketingNotificationEmails,
+                securityComplianceNotificationMails: args.options.securityComplianceNotificationMails,
+                securityComplianceNotificationPhones: args.options.securityComplianceNotificationPhones,
+                technicalNotificationMails: args.options.technicalNotificationMails
+            };
+            if (args.options.contactEmail || args.options.statementUrl) {
+                data.privacyProfile = {};
+            }
+            if (args.options.contactEmail) {
+                data.privacyProfile.contactEmail = args.options.contactEmail;
+            }
+            if (args.options.statementUrl) {
+                data.privacyProfile.statementUrl = args.options.statementUrl;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/organization/${organizationId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getOrganizationIdByDisplayName(displayName) {
+        const url = `${this.resource}/v1.0/organization?$select=id,displayName`;
+        // the endpoint always returns one item
+        const organizations = await odata.getAllItems(url);
+        if (organizations[0].displayName !== displayName) {
+            throw `The specified organization '${displayName}' does not exist.`;
+        }
+        return organizations[0].id;
+    }
+}
+export default new EntraOrganizationSetCommand();
+//# sourceMappingURL=organization-set.js.map

package/dist/m365/entra/commands/pim/pim-role-assignment-eligibility-list.js

@@ -29,6 +29,9 @@ class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraPimRoleAssignmentEligibilityListCommand_instances, "m", _EntraPimRoleAssignmentEligibilityListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includePrincipalDetails) {
+            await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of eligible roles for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
         }
@@ -40,7 +43,7 @@ class EntraPimRoleAssignmentEligibilityListCommand extends GraphCommand {
                 queryParameters.push(`$filter=principalId eq '${principalId}'`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -86,7 +89,8 @@ _EntraPimRoleAssignmentEligibilityListCommand_instances = new WeakSet(), _EntraP
             userName: typeof args.options.userName !== 'undefined',
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails
+            includePrincipalDetails: !!args.options.includePrincipalDetails,
+            withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
 }, _EntraPimRoleAssignmentEligibilityListCommand_initOptions = function _EntraPimRoleAssignmentEligibilityListCommand_initOptions() {
@@ -99,7 +103,9 @@ _EntraPimRoleAssignmentEligibilityListCommand_instances = new WeakSet(), _EntraP
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--includePrincipalDetails [includePrincipalDetails]'
+        option: '--includePrincipalDetails'
+    }, {
+        option: '--withPrincipalDetails'
     });
 }, _EntraPimRoleAssignmentEligibilityListCommand_initValidators = function _EntraPimRoleAssignmentEligibilityListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/pim/pim-role-assignment-list.js

@@ -30,6 +30,9 @@ class EntraPimRoleAssignmentListCommand extends GraphCommand {
         const filters = [];
         const expands = [];
         try {
+            if (args.options.includePrincipalDetails) {
+                await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
+            }
             const principalId = await this.getPrincipalId(logger, args.options);
             if (principalId) {
                 filters.push(`principalId eq '${principalId}'`);
@@ -41,7 +44,7 @@ class EntraPimRoleAssignmentListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -82,7 +85,8 @@ _EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssig
             groupId: typeof args.options.groupId !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             startDateTime: typeof args.options.startDateTime !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails
+            includePrincipalDetails: !!args.options.includePrincipalDetails,
+            withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
 }, _EntraPimRoleAssignmentListCommand_initOptions = function _EntraPimRoleAssignmentListCommand_initOptions() {
@@ -97,7 +101,9 @@ _EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssig
     }, {
         option: "-s, --startDateTime [startDateTime]"
     }, {
-        option: "--includePrincipalDetails [includePrincipalDetails]"
+        option: "--includePrincipalDetails"
+    }, {
+        option: "--withPrincipalDetails"
     });
 }, _EntraPimRoleAssignmentListCommand_initValidators = function _EntraPimRoleAssignmentListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/pim/pim-role-request-list.js

@@ -30,6 +30,9 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraPimRoleRequestListCommand_instances, "m", _EntraPimRoleRequestListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includePrincipalDetails) {
+            await this.warn(logger, `Parameter 'includePrincipalDetails' is deprecated. Please use 'withPrincipalDetails' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of PIM roles requests for ${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || 'all users'}...`);
         }
@@ -51,7 +54,7 @@ class EntraPimRoleRequestListCommand extends GraphCommand {
                 queryParameters.push(`$filter=${filters.join(' and ')}`);
             }
             expands.push('roleDefinition($select=displayName)');
-            if (args.options.includePrincipalDetails) {
+            if (args.options.includePrincipalDetails || args.options.withPrincipalDetails) {
                 expands.push('principal');
             }
             queryParameters.push(`$expand=${expands.join(',')}`);
@@ -100,7 +103,8 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
             groupName: typeof args.options.groupName !== 'undefined',
             createdDateTime: typeof args.options.createdDateTime !== 'undefined',
             status: typeof args.options.status !== 'undefined',
-            includePrincipalDetails: !!args.options.includePrincipalDetails
+            includePrincipalDetails: !!args.options.includePrincipalDetails,
+            withPrincipalDetails: !!args.options.withPrincipalDetails
         });
     });
 }, _EntraPimRoleRequestListCommand_initOptions = function _EntraPimRoleRequestListCommand_initOptions() {
@@ -118,7 +122,9 @@ _EntraPimRoleRequestListCommand_instances = new WeakSet(), _EntraPimRoleRequestL
         option: '-s, --status [status]',
         autocomplete: this.allowedStatuses
     }, {
-        option: '--includePrincipalDetails [includePrincipalDetails]'
+        option: '--includePrincipalDetails'
+    }, {
+        option: '--withPrincipalDetails'
     });
 }, _EntraPimRoleRequestListCommand_initValidators = function _EntraPimRoleRequestListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands.js

@@ -84,6 +84,7 @@ export default {
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,
     OAUTH2GRANT_SET: `${prefix} oauth2grant set`,
     ORGANIZATION_LIST: `${prefix} organization list`,
+    ORGANIZATION_SET: `${prefix} organization set`,
     PIM_ROLE_ASSIGNMENT_ADD: `${prefix} pim role assignment add`,
     PIM_ROLE_ASSIGNMENT_LIST: `${prefix} pim role assignment list`,
     PIM_ROLE_ASSIGNMENT_REMOVE: `${prefix} pim role assignment remove`,

package/dist/m365/file/commands/file-copy.js

@@ -63,7 +63,7 @@ class FileCopyCommand extends GraphCommand {
     async getCopyUrl(options, sourcePath, logger) {
         const { webUrl, sourceUrl, verbose, nameConflictBehavior } = options;
         const folderUrl = new URL(sourcePath);
-        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const siteId = await spo.getSiteIdByMSGraph(webUrl, logger, verbose);
         const drive = await this.getDocumentLibrary(siteId, folderUrl, sourceUrl, logger);
         const itemId = await this.getStartingFolderId(drive, folderUrl, logger);
         const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
@@ -74,7 +74,7 @@ class FileCopyCommand extends GraphCommand {
     }
     async getTargetDriveAndItemId(webUrl, targetUrl, logger, verbose) {
         const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
-        const targetSiteId = await spo.getSiteId(targetSiteUrl, logger, verbose);
+        const targetSiteId = await spo.getSiteIdByMSGraph(targetSiteUrl, logger, verbose);
         const targetFolderUrl = new URL(this.getAbsoluteUrl(targetSiteUrl, targetUrl));
         const targetDrive = await this.getDocumentLibrary(targetSiteId, targetFolderUrl, targetUrl, logger);
         const targetDriveId = targetDrive.id;

package/dist/m365/file/commands/file-move.js

@@ -59,7 +59,7 @@ class FileMoveCommand extends GraphCommand {
         return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
     }
     async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
-        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const siteId = await spo.getSiteIdByMSGraph(webUrl, logger, verbose);
         const driveDetails = await drive.getDriveByUrl(siteId, new URL(folderUrl), logger, verbose);
         const itemId = await drive.getDriveItemId(driveDetails, new URL(folderUrl), logger, verbose);
         return { driveId: driveDetails.id, itemId };

package/dist/m365/flow/commands/flow-list.js

@@ -28,29 +28,33 @@ class FlowListCommand extends PowerAutomateCommand {
         __classPrivateFieldGet(this, _FlowListCommand_instances, "m", _FlowListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includeSolutions) {
+            await this.warn(logger, `Parameter 'includeSolutions' is deprecated. Please use 'withSolutions' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Getting Power Automate flows${args.options.asAdmin ? ' as admin' : ''} in environment '${args.options.environmentName}'...`);
         }
         try {
-            const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
+            const { environmentName, asAdmin, sharingStatus, includeSolutions, withSolutions } = args.options;
             let items = [];
+            const shouldIncludeSolutions = withSolutions || includeSolutions;
             if (sharingStatus === 'personal') {
-                const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
-                const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
                 items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
-                let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
+                let url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'personal');
                 items = await odata.getAllItems(url);
-                url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
+                url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions, 'team');
                 const teamFlows = await odata.getAllItems(url);
                 items = items.concat(teamFlows);
             }
             else {
-                const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
+                const url = this.getApiUrl(environmentName, asAdmin, shouldIncludeSolutions);
                 items = await odata.getAllItems(url);
             }
             // Remove duplicates
@@ -81,6 +85,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
         Object.assign(this.telemetryProperties, {
             sharingStatus: typeof args.options.sharingStatus !== 'undefined',
             includeSolutions: !!args.options.includeSolutions,
+            withSolutions: !!args.options.withSolutions,
             asAdmin: !!args.options.asAdmin
         });
     });
@@ -92,6 +97,8 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
         autocomplete: this.allowedSharingStatuses
     }, {
         option: '--includeSolutions'
+    }, {
+        option: '--withSolutions'
     }, {
         option: '--asAdmin'
     });
@@ -107,7 +114,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initTypes = function _FlowListCommand_initTypes() {
     this.types.string.push('environmentName', 'sharingStatus');
-    this.types.boolean.push('includeSolutions', 'asAdmin');
+    this.types.boolean.push('includeSolutions', 'withSolutions', 'asAdmin');
 };
 export default new FlowListCommand();
 //# sourceMappingURL=flow-list.js.map

package/dist/m365/flow/commands/run/run-get.js

@@ -28,7 +28,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         if (args.options.includeTriggerInformation) {
-            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger instead`);
+            await this.warn(logger, `Parameter 'includeTriggerInformation' is deprecated. Please use 'withTrigger' instead`);
         }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -49,7 +49,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             notificationUrl: args.options.notificationUrl,
             expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args),
             clientState: args.options.clientState,
-            includeResourceData: args.options.includeResourceData,
+            includeResourceData: args.options.withResourceData || args.options.includeResourceData,
             encryptionCertificate: args.options.encryptionCertificate,
             encryptionCertificateId: args.options.encryptionCertificateId,
             lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
@@ -66,6 +66,9 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             responseType: 'json'
         };
         try {
+            if (args.options.includeResourceData) {
+                await this.warn(logger, `Parameter 'includeResourceData' is deprecated. Please use 'withResourceData' instead`);
+            }
             const res = await request.post(requestOptions);
             await logger.log(res);
         }
@@ -133,6 +136,7 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
             notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
             latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
             includeResourceData: !!args.options.includeResourceData,
+            withResourceData: !!args.options.withResourceData,
             encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
             encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
         });
@@ -158,6 +162,8 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         autocomplete: this.allowedTlsVersions
     }, {
         option: '--includeResourceData [includeResourceData]'
+    }, {
+        option: '--withResourceData [withResourceData]'
     }, {
         option: '--encryptionCertificate [encryptionCertificate]'
     }, {
@@ -187,10 +193,11 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
             return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
         }
-        if (args.options.includeResourceData && !args.options.encryptionCertificate) {
+        const shouldIncludeResourceData = args.options.includeResourceData || args.options.withResourceData;
+        if (shouldIncludeResourceData && !args.options.encryptionCertificate) {
             return `The 'encryptionCertificate' options is required to include the changed resource data`;
         }
-        if (args.options.includeResourceData && !args.options.encryptionCertificateId) {
+        if (shouldIncludeResourceData && !args.options.encryptionCertificateId) {
             return `The 'encryptionCertificateId' options is required to include the changed resource data`;
         }
         if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {

package/dist/m365/planner/commands/tenant/tenant-settings-list.js

@@ -8,9 +8,6 @@ class PlannerTenantSettingsListCommand extends PlannerCommand {
     get description() {
         return 'Lists the Microsoft Planner configuration of the tenant';
     }
-    defaultProperties() {
-        return ['isPlannerAllowed', 'allowCalendarSharing', 'allowTenantMoveWithDataLoss', 'allowTenantMoveWithDataMigration', 'allowRosterCreation', 'allowPlannerMobilePushNotifications'];
-    }
     async commandAction(logger) {
         const requestOptions = {
             url: `${this.resource}/taskAPI/tenantAdminSettings/Settings`,

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -25,13 +25,17 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PpSolutionPublisherListCommand_instances, "m", _PpSolutionPublisherListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.includeMicrosoftPublishers) {
+            await this.warn(logger, `Parameter 'includeMicrosoftPublishers' is deprecated. Please use 'withMicrosoftPublishers' instead`);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of publishers...`);
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
+            const shouldIncludeMicrosoftPublishers = args.options.withMicrosoftPublishers || args.options.includeMicrosoftPublishers;
             const requestOptions = {
-                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.includeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
+                url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!shouldIncludeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -49,6 +53,7 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             includeMicrosoftPublishers: typeof args.options.includeMicrosoftPublishers !== 'undefined',
+            withMicrosoftPublishers: typeof args.options.withMicrosoftPublishers !== 'undefined',
             asAdmin: !!args.options.asAdmin
         });
     });
@@ -57,6 +62,8 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
         option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeMicrosoftPublishers'
+    }, {
+        option: '--withMicrosoftPublishers'
     }, {
         option: '--asAdmin'
     });