@pnp/cli-microsoft365 10.1.0-beta.f17d225 → 10.2.0-beta.1819fcc

package/dist/m365/entra/commands/m365group/m365group-remove.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 _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators;
+var _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators, _EntraM365GroupRemoveCommand_initOptionSets, _EntraM365GroupRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
@@ -28,23 +28,29 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
             if (this.verbose) {
-                await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
+                await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id || args.options.displayName}...`);
             }
             try {
-                const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+                let groupId = args.options.id;
+                if (args.options.displayName) {
+                    groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+                }
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
                 if (!isUnifiedGroup) {
-                    throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                    throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }
-                const siteUrl = await this.getM365GroupSiteUrl(logger, args.options.id);
+                const siteUrl = await this.getM365GroupSiteUrl(logger, groupId);
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 // Delete the Microsoft 365 group site. This operation will also delete the group.
                 await this.deleteM365GroupSite(logger, siteUrl, spoAdminUrl);
                 if (args.options.skipRecycleBin) {
-                    await this.deleteM365GroupFromRecycleBin(logger, args.options.id);
+                    await this.deleteM365GroupFromRecycleBin(logger, groupId);
                     await this.deleteSiteFromRecycleBin(logger, siteUrl, spoAdminUrl);
                 }
             }
@@ -56,7 +62,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id || args.options.displayName}?` });
             if (result) {
                 await removeGroup();
             }
@@ -168,7 +174,9 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     });
 }, _EntraM365GroupRemoveCommand_initOptions = function _EntraM365GroupRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     }, {
         option: '-f, --force'
     }, {
@@ -176,11 +184,15 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     });
 }, _EntraM365GroupRemoveCommand_initValidators = function _EntraM365GroupRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
+}, _EntraM365GroupRemoveCommand_initOptionSets = function _EntraM365GroupRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _EntraM365GroupRemoveCommand_initTypes = function _EntraM365GroupRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
 };
 EntraM365GroupRemoveCommand.maxRetries = 10;
 export default new EntraM365GroupRemoveCommand();

package/dist/m365/entra/commands/m365group/m365group-renew.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 _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators;
+var _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators, _EntraM365GroupRenewCommand_initOptionSets, _EntraM365GroupRenewCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -21,18 +21,24 @@ class EntraM365GroupRenewCommand extends GraphCommand {
         _EntraM365GroupRenewCommand_instances.add(this);
         __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
+            await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id || args.options.displayName}...`);
         }
         try {
-            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+            let groupId = args.options.id;
+            if (args.options.displayName) {
+                groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+            }
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
             const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
+                url: `${this.resource}/v1.0/groups/${groupId}/renew/`,
                 headers: {
                     'accept': 'application/json;odata.metadata=none'
                 }
@@ -46,15 +52,21 @@ class EntraM365GroupRenewCommand extends GraphCommand {
 }
 _EntraM365GroupRenewCommand_instances = new WeakSet(), _EntraM365GroupRenewCommand_initOptions = function _EntraM365GroupRenewCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     });
 }, _EntraM365GroupRenewCommand_initValidators = function _EntraM365GroupRenewCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
+}, _EntraM365GroupRenewCommand_initOptionSets = function _EntraM365GroupRenewCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _EntraM365GroupRenewCommand_initTypes = function _EntraM365GroupRenewCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
 };
 export default new EntraM365GroupRenewCommand();
 //# sourceMappingURL=m365group-renew.js.map

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

@@ -128,7 +128,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
         }
     }
     getImageContentType(imagePath) {
-        const extension = imagePath.substr(imagePath.lastIndexOf('.')).toLowerCase();
+        const extension = imagePath.substring(imagePath.lastIndexOf('.')).toLowerCase();
         switch (extension) {
             case '.png':
                 return 'image/png';

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

@@ -3,8 +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 _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets;
-import { cli } from '../../../../cli/cli.js';
+var _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets, _EntraM365GroupTeamifyCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -25,29 +24,16 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initTypes).call(this);
     }
     async getGroupId(options) {
         if (options.id) {
             return options.id;
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting.encodeQueryParameter(options.mailNickname)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        const response = await request.get(requestOptions);
-        const groupItem = response.value[0];
-        if (!groupItem) {
-            throw `The specified Microsoft 365 Group does not exist`;
+        if (options.displayName) {
+            return await entraGroup.getGroupIdByDisplayName(options.displayName);
         }
-        if (response.value.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
-            return result.id;
-        }
-        return groupItem.id;
+        return await entraGroup.getGroupIdByMailNickname(options.mailNickname);
     }
     async commandAction(logger, args) {
         try {
@@ -89,12 +75,15 @@ _EntraM365GroupTeamifyCommand_instances = new WeakSet(), _EntraM365GroupTeamifyC
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined'
+            mailNickname: typeof args.options.mailNickname !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
         });
     });
 }, _EntraM365GroupTeamifyCommand_initOptions = function _EntraM365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
@@ -106,7 +95,9 @@ _EntraM365GroupTeamifyCommand_instances = new WeakSet(), _EntraM365GroupTeamifyC
         return true;
     });
 }, _EntraM365GroupTeamifyCommand_initOptionSets = function _EntraM365GroupTeamifyCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'mailNickname'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
+}, _EntraM365GroupTeamifyCommand_initTypes = function _EntraM365GroupTeamifyCommand_initTypes() {
+    this.types.string.push('id', 'displayName', 'mailNickname');
 };
 export default new EntraM365GroupTeamifyCommand();
 //# sourceMappingURL=m365group-teamify.js.map

package/dist/m365/entra/commands/roledefinition/roledefinition-get.js

@@ -0,0 +1,58 @@
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { validation } from '../../../../utils/validation.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().optional()),
+    displayName: zod.alias('n', z.string().optional()),
+    properties: zod.alias('p', z.string().optional())
+})
+    .strict();
+class EntraRoleDefinitionGetCommand extends GraphCommand {
+    get name() {
+        return commands.ROLEDEFINITION_GET;
+    }
+    get description() {
+        return 'Gets a specific Microsoft Entra ID role definition';
+    }
+    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.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), options => ({
+            message: `The '${options.id}' must be a valid GUID`,
+            path: ['id']
+        }));
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Getting Microsoft Entra ID role definition...');
+        }
+        try {
+            let result;
+            if (args.options.id) {
+                result = await roleDefinition.getRoleDefinitionById(args.options.id, args.options.properties);
+            }
+            else {
+                result = await roleDefinition.getRoleDefinitionByDisplayName(args.options.displayName, args.options.properties);
+            }
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraRoleDefinitionGetCommand();
+//# sourceMappingURL=roledefinition-get.js.map

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

@@ -0,0 +1,50 @@
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+const options = globalOptionsZod
+    .extend({
+    properties: zod.alias('p', z.string().optional()),
+    filter: zod.alias('f', z.string().optional())
+})
+    .strict();
+class EntraRoleDefinitionListCommand extends GraphCommand {
+    get name() {
+        return commands.ROLEDEFINITION_LIST;
+    }
+    get description() {
+        return 'Lists all Microsoft Entra ID role definitions';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'isBuiltIn', 'isEnabled'];
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Getting Microsoft Entra ID role definitions...');
+        }
+        try {
+            const queryParameters = [];
+            if (args.options.properties) {
+                queryParameters.push(`$select=${args.options.properties}`);
+            }
+            if (args.options.filter) {
+                queryParameters.push(`$filter=${args.options.filter}`);
+            }
+            const queryString = queryParameters.length > 0
+                ? `?${queryParameters.join('&')}`
+                : '';
+            const results = await odata.getAllItems(`${this.resource}/v1.0/roleManagement/directory/roleDefinitions${queryString}`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraRoleDefinitionListCommand();
+//# sourceMappingURL=roledefinition-list.js.map

package/dist/m365/entra/commands/roledefinition/roledefinition-remove.js

@@ -0,0 +1,74 @@
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().optional()),
+    displayName: zod.alias('n', z.string().optional()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
+class EntraRoleDefinitionRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ROLEDEFINITION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific Microsoft Entra ID role definition';
+    }
+    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.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), options => ({
+            message: `The '${options.id}' must be a valid GUID`,
+            path: ['id']
+        }));
+    }
+    async commandAction(logger, args) {
+        const removeRoleDefinition = async () => {
+            try {
+                let roleDefinitionId = args.options.id;
+                if (args.options.displayName) {
+                    roleDefinitionId = (await roleDefinition.getRoleDefinitionByDisplayName(args.options.displayName, 'id')).id;
+                }
+                if (args.options.verbose) {
+                    await logger.logToStderr(`Removing role definition with ID ${roleDefinitionId}...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/roleManagement/directory/roleDefinitions/${roleDefinitionId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeRoleDefinition();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove role definition '${args.options.id || args.options.displayName}'?` });
+            if (result) {
+                await removeRoleDefinition();
+            }
+        }
+    }
+}
+export default new EntraRoleDefinitionRemoveCommand();
+//# sourceMappingURL=roledefinition-remove.js.map

package/dist/m365/entra/commands.js

@@ -87,6 +87,9 @@ export default {
     PIM_ROLE_ASSIGNMENT_ELIGIBILITY_LIST: `${prefix} pim role assignment eligibility list`,
     PIM_ROLE_REQUEST_LIST: `${prefix} pim role request list`,
     POLICY_LIST: `${prefix} policy list`,
+    ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
+    ROLEDEFINITION_GET: `${prefix} roledefinition get`,
+    ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
     SITECLASSIFICATION_DISABLE: `${prefix} siteclassification disable`,
     SITECLASSIFICATION_ENABLE: `${prefix} siteclassification enable`,
     SITECLASSIFICATION_GET: `${prefix} siteclassification get`,

package/dist/m365/file/commands/convert/convert-pdf.js

@@ -7,7 +7,6 @@ var _FileConvertPdfCommand_instances, _FileConvertPdfCommand_initOptions, _FileC
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import url from 'url';
 import { v4 } from 'uuid';
 import auth from '../../../../Auth.js';
 import { CommandError } from '../../../../Command.js';
@@ -179,12 +178,12 @@ class FileConvertPdfCommand extends GraphCommand {
             }
             return fileGraphUrl;
         }
-        const _url = url.parse(fileWebUrl);
+        const _url = new URL(fileWebUrl);
         let siteId = '';
         let driveRelativeFileUrl = '';
-        const siteInfo = await this.getGraphSiteInfoFromFullUrl(_url.host, _url.path);
+        const siteInfo = await this.getGraphSiteInfoFromFullUrl(_url.hostname, _url.pathname);
         siteId = siteInfo.id;
-        let siteRelativeFileUrl = _url.path.replace(siteInfo.serverRelativeUrl, '');
+        let siteRelativeFileUrl = _url.pathname.replace(siteInfo.serverRelativeUrl, '');
         // normalize site-relative URLs for root site collections and root sites
         if (!siteRelativeFileUrl.startsWith('/')) {
             siteRelativeFileUrl = '/' + siteRelativeFileUrl;

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

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FileAddCommand_instances, _FileAddCommand_initTelemetry, _FileAddCommand_initOptions, _FileAddCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
-import url from 'url';
 import request from '../../../request.js';
 import { validation } from '../../../utils/validation.js';
 import GraphCommand from '../../base/GraphCommand.js';
@@ -28,7 +27,7 @@ class FileAddCommand extends GraphCommand {
     async commandAction(logger, args) {
         let folderUrlWithoutTrailingSlash = args.options.folderUrl;
         if (folderUrlWithoutTrailingSlash.endsWith('/')) {
-            folderUrlWithoutTrailingSlash = folderUrlWithoutTrailingSlash.substr(0, folderUrlWithoutTrailingSlash.length - 1);
+            folderUrlWithoutTrailingSlash = folderUrlWithoutTrailingSlash.substring(0, folderUrlWithoutTrailingSlash.length - 1);
         }
         try {
             const graphFileUrl = await this.getGraphFileUrl(logger, `${folderUrlWithoutTrailingSlash}/${path.basename(args.options.filePath)}`, args.options.siteUrl);
@@ -97,14 +96,14 @@ class FileAddCommand extends GraphCommand {
         if (this.debug) {
             await logger.logToStderr(`Resolving Graph drive item URL for ${fileWebUrl}`);
         }
-        const _fileWebUrl = url.parse(fileWebUrl);
-        const _siteUrl = url.parse(siteUrl || fileWebUrl);
+        const _fileWebUrl = new URL(fileWebUrl);
+        const _siteUrl = new URL(siteUrl || fileWebUrl);
         const isSiteUrl = typeof siteUrl !== 'undefined';
         let siteId = '';
         let driveRelativeFileUrl = '';
-        const siteInfo = await this.getGraphSiteInfoFromFullUrl(_siteUrl.host, _siteUrl.path, isSiteUrl);
+        const siteInfo = await this.getGraphSiteInfoFromFullUrl(_siteUrl.host, _siteUrl.pathname, isSiteUrl);
         siteId = siteInfo.id;
-        let siteRelativeFileUrl = _fileWebUrl.path.replace(siteInfo.serverRelativeUrl, '');
+        let siteRelativeFileUrl = _fileWebUrl.pathname.replace(siteInfo.serverRelativeUrl, '');
         // normalize site-relative URLs for root site collections and root sites
         if (!siteRelativeFileUrl.startsWith('/')) {
             siteRelativeFileUrl = '/' + siteRelativeFileUrl;

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

@@ -37,6 +37,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
     constructor() {
         super();
         _GraphSubscriptionAddCommand_instances.add(this);
+        this.allowedTlsVersions = ['v1_0', 'v1_1', 'v1_2', 'v1_3'];
         __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initValidators).call(this);
@@ -46,11 +47,15 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             changeType: args.options.changeTypes,
             resource: args.options.resource,
             notificationUrl: args.options.notificationUrl,
-            expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args)
+            expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args),
+            clientState: args.options.clientState,
+            includeResourceData: args.options.includeResourceData,
+            encryptionCertificate: args.options.encryptionCertificate,
+            encryptionCertificateId: args.options.encryptionCertificateId,
+            lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
+            notificationUrlAppId: args.options.notificationUrlAppId,
+            latestSupportedTlsVersion: args.options.latestTLSVersion
         };
-        if (args.options.clientState) {
-            data["clientState"] = args.options.clientState;
-        }
         const requestOptions = {
             url: `${this.resource}/v1.0/subscriptions`,
             headers: {
@@ -123,7 +128,13 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         Object.assign(this.telemetryProperties, {
             changeTypes: args.options.changeTypes,
             expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
-            clientState: typeof args.options.clientState !== 'undefined'
+            clientState: typeof args.options.clientState !== 'undefined',
+            lifecycleNotificationUrl: typeof args.options.lifecycleNotificationUrl !== 'undefined',
+            notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
+            latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
+            includeResourceData: !!args.options.includeResourceData,
+            encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
+            encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
         });
     });
 }, _GraphSubscriptionAddCommand_initOptions = function _GraphSubscriptionAddCommand_initOptions() {
@@ -138,6 +149,19 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         option: '-e, --expirationDateTime [expirationDateTime]'
     }, {
         option: '-s, --clientState [clientState]'
+    }, {
+        option: '--lifecycleNotificationUrl [lifecycleNotificationUrl]'
+    }, {
+        option: '--notificationUrlAppId [notificationUrlAppId]'
+    }, {
+        option: '--latestTLSVersion [latestTLSVersion]',
+        autocomplete: this.allowedTlsVersions
+    }, {
+        option: '--includeResourceData [includeResourceData]'
+    }, {
+        option: '--encryptionCertificate [encryptionCertificate]'
+    }, {
+        option: '--encryptionCertificateId [encryptionCertificateId]'
     });
 }, _GraphSubscriptionAddCommand_initValidators = function _GraphSubscriptionAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -155,6 +179,23 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.clientState && args.options.clientState.length > 128) {
             return 'The clientState value exceeds the maximum length of 128 characters';
         }
+        if (args.options.lifecycleNotificationUrl && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('https://')
+            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventhub:https://')
+            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
+            return `The lifecycle notification URL '${args.options.lifecycleNotificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
+        }
+        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) {
+            return `The 'encryptionCertificate' options is required to include the changed resource data`;
+        }
+        if (args.options.includeResourceData && !args.options.encryptionCertificateId) {
+            return `The 'encryptionCertificateId' options is required to include the changed resource data`;
+        }
+        if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {
+            return `${args.options.notificationUrlAppId} is not a valid GUID for the 'notificationUrlAppId'`;
+        }
         return true;
     });
 };