@pnp/cli-microsoft365 10.0.0-beta.7dfc31a → 10.0.0-beta.a4e89de

package/dist/m365/flow/commands/recyclebinitem/recyclebinitem-restore.js

@@ -0,0 +1,48 @@
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    environmentName: zod.alias('e', z.string()),
+    flowName: zod.alias('n', z.string()
+        .refine(name => validation.isValidGuid(name), name => ({
+        message: `'${name}' is not a valid GUID.`
+    })))
+})
+    .strict();
+class FlowRecycleBinItemRestoreCommand extends PowerAutomateCommand {
+    get name() {
+        return commands.RECYCLEBINITEM_RESTORE;
+    }
+    get description() {
+        return 'Restores a soft-deleted Power Automate flow';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Restoring soft-deleted flow ${args.options.flowName} from environment ${args.options.environmentName}...`);
+            }
+            const requestOptions = {
+                url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${args.options.flowName}/restore?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new FlowRecycleBinItemRestoreCommand();
+//# sourceMappingURL=recyclebinitem-restore.js.map

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

@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends PowerAutomateCommand {
         }
         const cancelFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
+                url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

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

@@ -35,7 +35,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -32,7 +32,7 @@ class FlowRunListCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
         }
-        let url = `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+        let url = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
         const filters = this.getFilters(args.options);
         if (filters.length > 0) {
             url += `&$filter=${filters.join(' and ')}`;

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

@@ -36,7 +36,7 @@ class FlowRunResubmitCommand extends PowerAutomateCommand {
                     await logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                 }
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
+                    url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -60,7 +60,7 @@ class FlowRunResubmitCommand extends PowerAutomateCommand {
     }
     async getTriggerName(environment, flow) {
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands.js

@@ -12,6 +12,8 @@ export default {
     OWNER_ENSURE: `${prefix} owner ensure`,
     OWNER_LIST: `${prefix} owner list`,
     OWNER_REMOVE: `${prefix} owner remove`,
+    RECYCLEBINITEM_LIST: `${prefix} recyclebinitem list`,
+    RECYCLEBINITEM_RESTORE: `${prefix} recyclebinitem restore`,
     REMOVE: `${prefix} remove`,
     RUN_CANCEL: `${prefix} run cancel`,
     RUN_GET: `${prefix} run get`,

package/dist/m365/spo/commands/contenttype/contenttype-field-remove.js

@@ -78,15 +78,15 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
                 const updateChildContentTypes = args.options.listTitle || args.options.listId || args.options.listUrl ? false : args.options.updateChildContentTypes === true;
                 if (this.debug) {
                     const additionalLog = args.options.listTitle ? `; ListTitle='${args.options.listTitle}'` : args.options.listId ? `; ListId='${args.options.listId}'` : args.options.listUrl ? `; ListUrl='${args.options.listUrl}'` : ` ; UpdateChildContentTypes='${updateChildContentTypes}`;
-                    await logger.logToStderr(`Remove FieldLink from ContentType. FieldLinkId='${args.options.fieldLinkId}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
+                    await logger.logToStderr(`Remove FieldLink from ContentType. Id='${args.options.id}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
                     await logger.logToStderr(`Execute ProcessQuery.`);
                 }
                 let requestBody = '';
                 if (listId) {
-                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><Method Name="DeleteObject" Id="21" ObjectPathId="19" /><Method Name="Update" Id="22" ObjectPathId="15"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="17" ParentId="15" Name="FieldLinks" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.fieldLinkId)}}</Parameter></Parameters></Method><Identity Id="15" Name="09eec89e-709b-0000-558c-c222dcaf9162|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
+                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><Method Name="DeleteObject" Id="21" ObjectPathId="19" /><Method Name="Update" Id="22" ObjectPathId="15"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="17" ParentId="15" Name="FieldLinks" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="15" Name="09eec89e-709b-0000-558c-c222dcaf9162|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
                 }
                 else {
-                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.fieldLinkId)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
+                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
                 }
                 requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -110,7 +110,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
             await removeFieldLink();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.fieldLinkId} from content type ${args.options.contentTypeId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.id} from content type ${args.options.contentTypeId}?` });
             if (result) {
                 await removeFieldLink();
             }
@@ -160,9 +160,9 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '-i, --contentTypeId <contentTypeId>'
+        option: '--contentTypeId <contentTypeId>'
     }, {
-        option: '--fieldLinkId <fieldLinkId>'
+        option: '-i, --id <id>'
     }, {
         option: '-c, --updateChildContentTypes'
     }, {
@@ -170,8 +170,8 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
     });
 }, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.fieldLinkId)) {
-            return `${args.options.fieldLinkId} is not a valid GUID`;
+        if (!validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;

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

@@ -262,9 +262,9 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-c, --contentTypeId <contentTypeId>'
+        option: '--contentTypeId <contentTypeId>'
     }, {
-        option: '--id <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-r, --required [required]',
         autocomplete: ['true', 'false']

package/dist/m365/spo/commands/file/file-roleassignment-add.js

@@ -4,17 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFileRoleAssignmentAddCommand_instances, _SpoFileRoleAssignmentAddCommand_initTelemetry, _SpoFileRoleAssignmentAddCommand_initOptions, _SpoFileRoleAssignmentAddCommand_initValidators, _SpoFileRoleAssignmentAddCommand_initOptionSets, _SpoFileRoleAssignmentAddCommand_initTypes;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoRoleDefinitionListCommand from '../roledefinition/roledefinition-list.js';
-import spoUserGetCommand from '../user/user-get.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleAssignmentAddCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEASSIGNMENT_ADD;
@@ -36,14 +32,14 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
             await logger.logToStderr(`Adding role assignment to file in site at ${args.options.webUrl}...`);
         }
         try {
-            const fileUrl = await this.getFileURL(args);
-            const roleDefinitionId = await this.getRoleDefinitionId(args.options);
+            const fileUrl = await this.getFileURL(args, logger);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
             if (args.options.upn) {
-                const upnPrincipalId = await this.getUserPrincipalId(args.options);
+                const upnPrincipalId = await this.getUserPrincipalId(args.options, logger);
                 await this.addRoleAssignment(fileUrl, args.options.webUrl, upnPrincipalId, roleDefinitionId);
             }
             else if (args.options.groupName) {
-                const groupPrincipalId = await this.getGroupPrincipalId(args.options);
+                const groupPrincipalId = await this.getGroupPrincipalId(args.options, logger);
                 await this.addRoleAssignment(fileUrl, args.options.webUrl, groupPrincipalId, roleDefinitionId);
             }
             else {
@@ -66,60 +62,27 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
         };
         return request.post(requestOptions);
     }
-    async getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options, logger) {
         if (!options.roleDefinitionName) {
             return options.roleDefinitionId;
         }
-        const roleDefinitionListCommandOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
-        const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-        const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-        return roleDefinitionId;
+        const roleDefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+        return roleDefinition.Id;
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
 }
 _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignmentAddCommand_initTelemetry = function _SpoFileRoleAssignmentAddCommand_initTelemetry() {

package/dist/m365/spo/commands/file/file-roleassignment-remove.js

@@ -7,13 +7,11 @@ var _SpoFileRoleAssignmentRemoveCommand_instances, _SpoFileRoleAssignmentRemoveC
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoUserGetCommand from '../user/user-get.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEASSIGNMENT_REMOVE;
@@ -36,13 +34,13 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
                 await logger.logToStderr(`Removing role assignment for ${args.options.groupName || args.options.upn} from file ${args.options.fileUrl || args.options.fileId}`);
             }
             try {
-                const fileURL = await this.getFileURL(args);
+                const fileURL = await this.getFileURL(args, logger);
                 let principalId;
                 if (args.options.groupName) {
-                    principalId = await this.getGroupPrincipalId(args.options);
+                    principalId = await this.getGroupPrincipalId(args.options, logger);
                 }
                 else if (args.options.upn) {
-                    principalId = await this.getUserPrincipalId(args.options);
+                    principalId = await this.getUserPrincipalId(args.options, logger);
                 }
                 else {
                     principalId = args.options.principalId;
@@ -71,45 +69,20 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
             }
         }
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
 }
 _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssignmentRemoveCommand_initTelemetry = function _SpoFileRoleAssignmentRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -7,11 +7,11 @@ var _SpoFileRoleInheritanceBreakCommand_instances, _SpoFileRoleInheritanceBreakC
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEINHERITANCE_BREAK;
@@ -34,7 +34,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
                 await logger.logToStderr(`Breaking role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
             }
             try {
-                const fileURL = await this.getFileURL(args);
+                const fileURL = await this.getFileURL(args, logger);
                 const keepExistingPermissions = !args.options.clearExistingPermissions;
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
@@ -59,20 +59,12 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
             }
         }
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
 }
 _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInheritanceBreakCommand_initTelemetry = function _SpoFileRoleInheritanceBreakCommand_initTelemetry() {

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -7,11 +7,11 @@ var _SpoFileRoleInheritanceResetCommand_instances, _SpoFileRoleInheritanceResetC
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleInheritanceResetCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEINHERITANCE_RESET;
@@ -34,7 +34,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
                 await logger.logToStderr(`Resetting role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
             }
             try {
-                const fileURL = await this.getFileURL(args);
+                const fileURL = await this.getFileURL(args, logger);
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
                     headers: {
@@ -58,20 +58,12 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
             }
         }
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
 }
 _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInheritanceResetCommand_initTelemetry = function _SpoFileRoleInheritanceResetCommand_initTelemetry() {

package/dist/m365/spo/commands/folder/folder-sharinglink-add.js

@@ -0,0 +1,143 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFolderSharingLinkAddCommand_instances, _SpoFolderSharingLinkAddCommand_initTelemetry, _SpoFolderSharingLinkAddCommand_initOptions, _SpoFolderSharingLinkAddCommand_initValidators, _SpoFolderSharingLinkAddCommand_initOptionSets, _SpoFolderSharingLinkAddCommand_initTypes;
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { drive } from '../../../../utils/drive.js';
+import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoFolderSharingLinkAddCommand extends SpoCommand {
+    get name() {
+        return commands.FOLDER_SHARINGLINK_ADD;
+    }
+    get description() {
+        return 'Creates a new sharing link to a folder';
+    }
+    constructor() {
+        super();
+        _SpoFolderSharingLinkAddCommand_instances.add(this);
+        this.allowedTypes = ['view', 'edit'];
+        this.allowedScopes = ['anonymous', 'organization', 'users'];
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkAddCommand_instances, "m", _SpoFolderSharingLinkAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkAddCommand_instances, "m", _SpoFolderSharingLinkAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkAddCommand_instances, "m", _SpoFolderSharingLinkAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkAddCommand_instances, "m", _SpoFolderSharingLinkAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkAddCommand_instances, "m", _SpoFolderSharingLinkAddCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Creating a sharing link to a folder ${args.options.folderId || args.options.folderUrl}...`);
+        }
+        try {
+            const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
+            const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
+            const folderUrl = new URL(absoluteFolderUrl);
+            const siteId = await spo.getSiteId(args.options.webUrl);
+            const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
+            const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/createLink`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    type: args.options.type,
+                    expirationDateTime: args.options.expirationDateTime,
+                    scope: args.options.scope,
+                    retainInheritedPermissions: !!args.options.retainInheritiedPermissions
+                }
+            };
+            if (args.options.scope === 'users' && args.options.recipients) {
+                const recipients = formatting.splitAndTrim(args.options.recipients).map(email => ({ email }));
+                requestOptions.data.recipients = recipients;
+            }
+            const sharingLink = await request.post(requestOptions);
+            // remove grantedToIdentities from the sharing link object
+            if (sharingLink.grantedToIdentities) {
+                delete sharingLink.grantedToIdentities;
+            }
+            await logger.log(sharingLink);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_SpoFolderSharingLinkAddCommand_instances = new WeakSet(), _SpoFolderSharingLinkAddCommand_initTelemetry = function _SpoFolderSharingLinkAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderId: typeof args.options.folderId !== 'undefined',
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            type: typeof args.options.type !== 'undefined',
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            retainInheritiedPermissions: !!args.options.retainInheritiedPermissions,
+            recipients: typeof args.options.recipients !== 'undefined'
+        });
+    });
+}, _SpoFolderSharingLinkAddCommand_initOptions = function _SpoFolderSharingLinkAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--folderId [folderId]'
+    }, {
+        option: '--folderUrl [folderUrl]'
+    }, {
+        option: '--type <type>',
+        autocomplete: this.allowedTypes
+    }, {
+        option: '--expirationDateTime [expirationDateTime]'
+    }, {
+        option: '--scope [scope]',
+        autocomplete: this.allowedScopes
+    }, {
+        option: '--retainInheritedPermissions [retainInheritedPermissions]'
+    }, {
+        option: '--recipients [recipients]'
+    });
+}, _SpoFolderSharingLinkAddCommand_initValidators = function _SpoFolderSharingLinkAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId && !validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID`;
+        }
+        if (args.options.type && !this.allowedTypes.some(type => type === args.options.type)) {
+            return `'${args.options.type}' is not a valid type. Allowed values are: ${this.allowedTypes.join(',')}`;
+        }
+        if (args.options.scope) {
+            if (!this.allowedScopes.includes(args.options.scope)) {
+                return `'${args.options.scope}' is not a valid scope. Allowed values are: ${this.allowedScopes.join(', ')}.`;
+            }
+        }
+        if (args.options.expirationDateTime && !validation.isValidISODateTime(args.options.expirationDateTime)) {
+            return `${args.options.expirationDateTime} is not a valid ISO date string.`;
+        }
+        if (args.options.recipients) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.recipients);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'recipients': ${isValidUPNArrayResult}.`;
+            }
+        }
+        return true;
+    });
+}, _SpoFolderSharingLinkAddCommand_initOptionSets = function _SpoFolderSharingLinkAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderId', 'folderUrl'] }, {
+        options: ['recipients'],
+        runsWhen: (args) => args.options.scope !== undefined && args.options.scope === 'users'
+    });
+}, _SpoFolderSharingLinkAddCommand_initTypes = function _SpoFolderSharingLinkAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderId', 'folderUrl', 'type', 'expirationDateTime', 'scope', 'recipients');
+    this.types.boolean.push('retainInheritiedPermissions');
+};
+export default new SpoFolderSharingLinkAddCommand();
+//# sourceMappingURL=folder-sharinglink-add.js.map