@pnp/cli-microsoft365 11.1.0-beta.5b5ee32 → 11.1.0-beta.734344f

package/dist/m365/spo/commands/file/file-rename.js

@@ -81,11 +81,10 @@ class SpoFileRenameCommand extends SpoCommand {
             await cli.executeCommand(removeCommand, { options: { ...removeOptions, _: [] } });
         }
         catch (err) {
-            if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
-            }
-            else {
-                throw err;
+            if (err?.error?.message?.includes('does not exist')) {
+                return;
             }
+            throw err;
         }
     }
 }

package/dist/m365/spo/commands/hubsite/hubsite-list.js

@@ -86,7 +86,7 @@ class SpoHubSiteListCommand extends SpoCommand {
             await logger.logToStderr(res);
             await logger.logToStderr(`Retrieved ${res.Row.length} sites in batch ${batchNumber}`);
         }
-        if (!!res.NextHref) {
+        if (res.NextHref) {
             reqOptions.url = nonPagedUrl + res.NextHref;
             if (this.debug) {
                 await logger.logToStderr(`Url for next batch of sites: ${reqOptions.url}`);

package/dist/m365/spo/commands/listitem/listitem-attachment-add.js

@@ -57,7 +57,7 @@ class SpoListItemAttachmentAddCommand extends SpoCommand {
     }
     getFileName(filePath, fileName) {
         if (!fileName) {
-            return filePath.replace(/^.*[\\\/]/, '');
+            return filePath.replace(/^.*[\\/]/, '');
         }
         const extension = filePath.split('.').pop();
         if (!fileName.endsWith(`.${extension}`)) {

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

@@ -37,7 +37,7 @@ class SpoListItemBatchSetCommand extends SpoCommand {
             const jsonContent = formatting.parseCsvToJson(csvContent);
             const amountOfRows = jsonContent.length;
             const idColumn = args.options.idColumn || 'ID';
-            if (!jsonContent[0].hasOwnProperty(idColumn)) {
+            if (!Object.prototype.hasOwnProperty.call(jsonContent[0], idColumn)) {
                 throw `The specified value for idColumn does not exist in the array. Specified idColumn is '${args.options.idColumn || 'ID'}'. Please specify the correct value.`;
             }
             const listId = args.options.listId ?
@@ -97,26 +97,30 @@ class SpoListItemBatchSetCommand extends SpoCommand {
             }
             else {
                 switch (field.TypeAsString) {
-                    case 'User':
+                    case 'User': {
                         const userDetail = users.find(us => us.email === row[field.InternalName]);
                         actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${userDetail.id}</Parameter></Parameters></Method>`;
                         break;
-                    case 'UserMulti':
+                    }
+                    case 'UserMulti': {
                         const userMultiString = row[field.InternalName].toString().split(';').map((element) => {
                             const userDetail = users.find(us => us.email === element);
                             return `<Object TypeId="{c956ab54-16bd-4c18-89d2-996f57282a6f}"><Property Name="Email" Type="Null" /><Property Name="LookupId" Type="Int32">${userDetail.id}</Property><Property Name="LookupValue" Type="Null" /></Object>`;
                         });
                         actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="Array">${userMultiString.join('')}</Parameter></Parameters></Method>`;
                         break;
-                    case 'Lookup':
+                    }
+                    case 'Lookup': {
                         actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter TypeId="{f1d34cc0-9b50-4a78-be78-d5facfcccfb7}"><Property Name="LookupId" Type="Int32">${row[field.InternalName]}</Property><Property Name="LookupValue" Type="Null"/></Parameter></Parameters></Method>`;
                         break;
-                    case 'LookupMulti':
+                    }
+                    case 'LookupMulti': {
                         const lookupMultiString = row[field.InternalName].toString().split(';').map((element) => {
                             return `<Object TypeId="{f1d34cc0-9b50-4a78-be78-d5facfcccfb7}"><Property Name="LookupId" Type="Int32">${element}</Property><Property Name="LookupValue" Type="Null" /></Object>`;
                         });
                         actionString += `<Method Name="SetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="Array">${lookupMultiString.join('')}</Parameter></Parameters></Method>`;
                         break;
+                    }
                     default:
                         actionString += `<Method Name="ParseAndSetFieldValue" Id="${index += 1}" ObjectPathId="${objectPathId}"><Parameters><Parameter Type="String">${field.InternalName}</Parameter><Parameter Type="String">${formatting.escapeXml(row[field.InternalName].toString())}</Parameter></Parameters></Method>`;
                         break;

package/dist/m365/spo/commands/page/clientsidepages.js

@@ -238,11 +238,11 @@ export class ClientSidePage {
             .replace(/:/g, ":")
             .replace(/{/g, "{")
             .replace(/}/g, "}")
-            .replace(/\[/g, "\[")
-            .replace(/\]/g, "\]")
-            .replace(/\*/g, "\*")
-            .replace(/\$/g, "\$")
-            .replace(/\./g, "\.");
+            .replace(/\[/g, "[")
+            .replace(/\]/g, "]")
+            .replace(/\*/g, "*")
+            .replace(/\$/g, "$")
+            .replace(/\./g, ".");
     }
     /**
      * Converts an escaped string from a client-side control attribute to a json object
@@ -258,7 +258,7 @@ export class ClientSidePage {
                 [/\\/g, "\\\\"], [/"/g, "\""], [/:/g, ":"], [/{/g, "{"], [/}/g, "}"],
                 [/\\\\/g, "\\"], [/\\\?/g, "?"], [/\\\./g, "."], [/\\\[/g, "["], [/\\\]/g, "]"],
                 [/\\\(/g, "("], [/\\\)/g, ")"], [/\\\|/g, "|"], [/\\\+/g, "+"], [/\\\*/g, "*"],
-                [/\\\$/g, "$"],
+                [/\\\$/g, "$"]
             ];
             return mapDict.reduce((r, m) => r.replace(m[0], m[1]), escaped);
         };
@@ -298,7 +298,7 @@ export class ClientSidePage {
             // get the control type
             const ct = /controlType":(\d*?)(,|&)/i.exec(markup);
             // if no control type is present this is a column which we give type 0 to let us process it
-            const controlType = ct == null || ct.length < 0 ? -1 : parseInt(ct[1], 10);
+            const controlType = ct === null || ct.length < 0 ? -1 : parseInt(ct[1], 10);
             let control = null;
             switch (controlType) {
                 case -1:
@@ -562,7 +562,7 @@ export class CanvasColumn extends CanvasControl {
                 sectionIndex: this.order,
                 zoneIndex: this.section?.order || 0,
                 zoneId: this.section?.zoneId,
-                layoutIndex: this.section?.layoutIndex,
+                layoutIndex: this.section?.layoutIndex
             },
             zoneGroupMetadata: this.section?.zoneGroupMetadata,
             emphasis: this.section?.emphasis
@@ -620,7 +620,7 @@ export class BackgroundSettings extends ClientSidePart {
             dataVersion: this.dataVersion,
             instanceId: this.id,
             properties: this.propertieJson,
-            serverProcessedContent: this.serverProcessedContent,
+            serverProcessedContent: this.serverProcessedContent
         };
         const html = [];
         html.push(`<div data-sp-canvascontrol="" data-sp-canvasdataversion="${this.dataVersion}" data-sp-controldata="${this.jsonData}">`);
@@ -687,7 +687,7 @@ export class ClientSideText extends ClientSidePart {
                 layoutIndex: this.column?.section?.layoutIndex
             },
             zoneGroupMetadata: this.column?.section?.zoneGroupMetadata,
-            emphasis: this.column?.section?.emphasis,
+            emphasis: this.column?.section?.emphasis
         };
         if (this.column?.section?.isLayoutReflowOnTop !== undefined) {
             controlData.position.isLayoutReflowOnTop = this.column.section.isLayoutReflowOnTop;
@@ -806,11 +806,11 @@ export class ClientSideWebpart extends ClientSidePart {
                 sectionIndex: this.column ? this.column.order : 0,
                 zoneIndex: this.column && this.column.section ? this.column.section.order : 0,
                 zoneId: this.column?.section?.zoneId,
-                layoutIndex: this.column?.section?.layoutIndex,
+                layoutIndex: this.column?.section?.layoutIndex
             },
             webPartId: this.webPartId,
             zoneGroupMetadata: this.column?.section?.zoneGroupMetadata,
-            emphasis: this.column?.section?.emphasis,
+            emphasis: this.column?.section?.emphasis
         };
         if (this.column?.section?.isLayoutReflowOnTop !== undefined) {
             controlData.position.isLayoutReflowOnTop = this.column.section.isLayoutReflowOnTop;

package/dist/m365/spo/commands/page/page-add.js

@@ -89,7 +89,7 @@ class SpoPageAddCommand extends SpoCommand {
                         };
                         await request.post(requestOptions);
                         break;
-                    case 'NewsPage':
+                    case 'NewsPage': {
                         const listItemSetOptions = {
                             FirstPublishedDate: new Date().toISOString()
                         };
@@ -97,7 +97,8 @@ class SpoPageAddCommand extends SpoCommand {
                         const requestUrl = `${args.options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listUrl)}')`;
                         await spo.systemUpdateListItem(requestUrl, listItemId, logger, this.verbose, listItemSetOptions);
                         break;
-                    case 'Template':
+                    }
+                    case 'Template': {
                         requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${listItemId})/SavePageAsTemplate`;
                         requestOptions.headers = {
                             'X-RequestDigest': requestDigest,
@@ -119,6 +120,7 @@ class SpoPageAddCommand extends SpoCommand {
                         };
                         await request.post(requestOptions);
                         break;
+                    }
                 }
             }
             requestOptions = {

package/dist/m365/spo/commands/page/page-clientsidewebpart-add.js

@@ -233,6 +233,7 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand {
                 webPart.webPartData.properties = this.extend(webPart.webPartData.properties, properties);
             }
             catch {
+                // Do nothing
             }
         }
         if (args.options.webPartData) {

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

@@ -94,7 +94,7 @@ class SpoPageSetCommand extends SpoCommand {
                         };
                         await request.post(requestOptions);
                         break;
-                    case 'NewsPage':
+                    case 'NewsPage': {
                         const newsPageItem = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
                         const newsPageItemId = newsPageItem.Id;
                         const listItemSetOptions = {
@@ -103,7 +103,8 @@ class SpoPageSetCommand extends SpoCommand {
                         };
                         await spo.systemUpdateListItem(requestUrl, newsPageItemId, logger, this.verbose, listItemSetOptions);
                         break;
-                    case 'Template':
+                    }
+                    case 'Template': {
                         const templateItem = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
                         const templateItemId = templateItem.Id;
                         requestOptions.headers = {
@@ -132,6 +133,7 @@ class SpoPageSetCommand extends SpoCommand {
                         }
                         pageId = res.Id;
                         break;
+                    }
                 }
             }
             if (args.options.promoteAs !== 'Template') {

package/dist/m365/spo/commands/page/page-text-add.js

@@ -49,6 +49,7 @@ class SpoPageTextAddCommand extends SpoCommand {
             // Add a new section when page does not contain any sections
             if (page.sections.length < 1) {
                 const newSection = new CanvasSection(page, 1);
+                // eslint-disable-next-line @typescript-eslint/no-unused-expressions
                 newSection.defaultColumn;
                 page.sections.push(newSection);
             }

package/dist/m365/spo/commands/propertybag/propertybag-base.js

@@ -25,28 +25,23 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><Query Id="12" ObjectPathId="9"><Query SelectAllProperties="false"><Properties><Property Name="Properties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="9" ParentId="5" Name="GetFolderByServerRelativeUrl"><Parameters><Parameter Type="String">${serverRelativeUrl}</Parameter></Parameters></Method><Identity Id="5" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        try {
-            const res = await request.post(requestOptions);
-            if (this.debug) {
-                await logger.logToStderr('Attempt to get Properties key values');
-            }
-            const json = JSON.parse(res);
-            const contents = json.find(x => { return x['ErrorInfo']; });
-            if (contents && contents.ErrorInfo) {
-                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
-            }
-            const propertiesObj = json.find(x => { return x['Properties']; });
-            if (propertiesObj) {
-                return propertiesObj['Properties'];
-            }
-            throw 'Cannot proceed. Properties not found'; // this is not suppose to happen
+        const res = await request.post(requestOptions);
+        if (this.verbose) {
+            await logger.logToStderr('Attempt to get Properties key values');
+        }
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x['ErrorInfo']; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
         }
-        catch (err) {
-            throw err;
+        const propertiesObj = json.find(x => { return x['Properties']; });
+        if (propertiesObj) {
+            return propertiesObj['Properties'];
         }
+        throw 'Cannot proceed. Properties not found'; // this is not suppose to happen
     }
     /**
-     * Gets property bag for site or sitecollection where return type is "_ObjectType_\":\"SP.Web\".
+     * Gets property bag for site or site collection where return type is "_ObjectType_\":\"SP.Web\".
      * This method is executed when no folder specified. PnP PowerShell behaves the same way.
      */
     async getWebPropertyBag(identityResp, webUrl, logger) {
@@ -57,25 +52,20 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="97" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /><Property Name="AllProperties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        try {
-            const res = await request.post(requestOptions);
-            if (this.debug) {
-                await logger.logToStderr('Attempt to get AllProperties key values');
-            }
-            const json = JSON.parse(res);
-            const contents = json.find(x => { return x['ErrorInfo']; });
-            if (contents && contents.ErrorInfo) {
-                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
-            }
-            const allPropertiesObj = json.find(x => { return x['AllProperties']; });
-            if (allPropertiesObj) {
-                return allPropertiesObj['AllProperties'];
-            }
-            throw 'Cannot proceed. AllProperties not found'; // this is not supposed to happen
+        const res = await request.post(requestOptions);
+        if (this.verbose) {
+            await logger.logToStderr('Attempt to get AllProperties key values');
         }
-        catch (err) {
-            throw err;
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x['ErrorInfo']; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
         }
+        const allPropertiesObj = json.find(x => { return x['AllProperties']; });
+        if (allPropertiesObj) {
+            return allPropertiesObj['AllProperties'];
+        }
+        throw 'Cannot proceed. AllProperties not found'; // this is not supposed to happen
     }
     /**
      * The property bag item data returned from the client.svc/ProcessQuery response
@@ -122,19 +112,14 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting.escapeXml(name)}</Parameter><Parameter Type="String">${formatting.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        try {
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const contents = json.find(x => { return x['ErrorInfo']; });
-            if (contents && contents.ErrorInfo) {
-                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
-            }
-            else {
-                return res;
-            }
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x['ErrorInfo']; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
         }
-        catch (err) {
-            throw err;
+        else {
+            return res;
         }
     }
     /**
@@ -146,13 +131,8 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
      * @param cmd command instance
      */
     static async isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
-        try {
-            const basePermissionsResp = await spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug);
-            return basePermissionsResp.has(PermissionKind.AddAndCustomizePages) === false;
-        }
-        catch (err) {
-            throw err;
-        }
+        const basePermissionsResp = await spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug);
+        return basePermissionsResp.has(PermissionKind.AddAndCustomizePages) === false;
     }
 }
 //# sourceMappingURL=propertybag-base.js.map

package/dist/m365/spo/commands/theme/theme-apply.js

@@ -125,7 +125,7 @@ class SpoThemeApplyCommand extends SpoCommand {
         }
         return `{
       'name': '${themeName}' ,
-      'themeJson': '{\"palette\": {${palette}}}'
+      'themeJson': '{"palette": {${palette}}}'
     }`;
     }
 }

package/dist/m365/spo/commands/web/web-reindex.js

@@ -67,24 +67,19 @@ class SpoWebReindexCommand extends SpoCommand {
         }
     }
     async reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
-        try {
-            if (this.debug) {
-                await logger.logToStderr(`Retrieving information about lists...`);
-            }
-            const requestOptions = {
-                url: `${webUrl}/_api/web/lists?$select=NoCrawl,Title,RootFolder/Properties,RootFolder/ServerRelativeUrl&$expand=RootFolder/Properties`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const lists = await request.get(requestOptions);
-            const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
-            await Promise.all(promises);
-        }
-        catch (err) {
-            throw err;
+        if (this.debug) {
+            await logger.logToStderr(`Retrieving information about lists...`);
         }
+        const requestOptions = {
+            url: `${webUrl}/_api/web/lists?$select=NoCrawl,Title,RootFolder/Properties,RootFolder/ServerRelativeUrl&$expand=RootFolder/Properties`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const lists = await request.get(requestOptions);
+        const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
+        await Promise.all(promises);
     }
     async reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
         if (list.NoCrawl) {
@@ -93,16 +88,11 @@ class SpoWebReindexCommand extends SpoCommand {
             }
             return;
         }
-        try {
-            const folderIdentityResp = await spo.getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest);
-            let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
-            searchversion++;
-            await SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
-            return;
-        }
-        catch (err) {
-            throw (err);
-        }
+        const folderIdentityResp = await spo.getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest);
+        let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
+        searchversion++;
+        await SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
+        return;
     }
 }
 _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {

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

@@ -70,9 +70,15 @@ class TeamsTabAddCommand extends GraphCommand {
         if (options.contentUrl) {
             requestBody.configuration.contentUrl = options.contentUrl;
         }
-        options.entityId ? requestBody.configuration.entityId = options.entityId : null;
-        options.removeUrl ? requestBody.configuration.removeUrl = options.removeUrl : null;
-        options.websiteUrl ? requestBody.configuration.websiteUrl = options.websiteUrl : null;
+        if (options.entityId) {
+            requestBody.configuration.entityId = options.entityId;
+        }
+        if (options.removeUrl) {
+            requestBody.configuration.removeUrl = options.removeUrl;
+        }
+        if (options.websiteUrl) {
+            requestBody.configuration.websiteUrl = options.websiteUrl;
+        }
         Object.keys(options).forEach(key => {
             if (excludeOptions.indexOf(key) === -1) {
                 requestBody.configuration[key] = `${options[key]}`;

package/dist/m365/viva/commands/connections/connections-app-create.js

@@ -44,7 +44,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand {
             const appPortalUrl = `${args.options.portalUrl}${args.options.portalUrl.indexOf('?') > -1 ? '&' : '?'}app=portals`;
             let searchUrlPath = portalUrl.hostname;
             if (portalUrl.pathname.indexOf('/teams') > -1 || portalUrl.pathname.indexOf('/sites') > -1) {
-                const firstTwoUrlSegments = portalUrl.pathname.match(/^\/[^\/]+\/[^\/]+/);
+                const firstTwoUrlSegments = portalUrl.pathname.match(/^\/[^/]+\/[^/]+/);
                 if (firstTwoUrlSegments) {
                     searchUrlPath += firstTwoUrlSegments[0];
                 }

package/dist/m365/viva/commands/engage/engage-community-user-add.js

@@ -48,7 +48,7 @@ class VivaEngageCommunityUserAddCommand extends GraphCommand {
             .refine(options => options.ids || options.userNames, {
             message: 'Specify either of ids or userNames.'
         })
-            .refine(options => typeof options.userNames !== undefined && typeof options.ids !== undefined, {
+            .refine(options => options.userNames !== undefined || options.ids !== undefined, {
             message: 'Specify either ids or userNames, but not both.'
         });
     }

package/dist/m365/viva/commands/engage/engage-community-user-remove.js

@@ -48,7 +48,7 @@ class VivaEngageCommunityUserRemoveCommand extends GraphCommand {
             .refine(options => options.id || options.userName, {
             message: 'Specify either of id or userName.'
         })
-            .refine(options => typeof options.userName !== undefined && typeof options.id !== undefined, {
+            .refine(options => options.userName !== undefined || options.id !== undefined, {
             message: 'Specify either id or userName, but not both.'
         });
     }

package/dist/telemetry.js

@@ -21,7 +21,9 @@ async function trackTelemetry(object) {
         }
         await appInsights.flush();
     }
-    catch { }
+    catch {
+        // Do nothing
+    }
 }
 export const telemetry = {
     trackEvent: async (commandName, properties, exception) => {

package/dist/utils/accessToken.js

@@ -16,6 +16,7 @@ export const accessToken = {
             isAppOnlyAccessToken = token.idtyp === 'app';
         }
         catch {
+            // Do nothing
         }
         return isAppOnlyAccessToken;
     },
@@ -34,6 +35,7 @@ export const accessToken = {
             tenantId = token.tid;
         }
         catch {
+            // Do nothing
         }
         return tenantId;
     },
@@ -54,6 +56,7 @@ export const accessToken = {
             userName = token.upn || token.app_displayname;
         }
         catch {
+            // Do nothing
         }
         return userName;
     },
@@ -72,6 +75,7 @@ export const accessToken = {
             userId = token.oid;
         }
         catch {
+            // Do nothing
         }
         return userId;
     },

package/dist/utils/cache.js

@@ -28,7 +28,9 @@ export const cache = {
             // eslint-disable-next-line @typescript-eslint/no-empty-function
             fs.writeFile(cacheFilePath, value, () => { });
         }
-        catch { }
+        catch {
+            // Do nothing
+        }
     },
     clearExpired(cb) {
         // we don't need to wait for this to complete
@@ -58,7 +60,6 @@ export const cache = {
                     // remove files that haven't been accessed in the last 24 hours
                     if (stats.atime.getTime() < Date.now() - 24 * 60 * 60 * 1000) {
                         // we don't need to wait for the file to be deleted
-                        // eslint-disable-next-line @typescript-eslint/no-empty-function
                         fs.unlink(path.join(cacheFolderPath, file), () => {
                             if (cb && index === numFiles - 1) {
                                 cb();

package/dist/utils/customAppScope.js

@@ -16,7 +16,7 @@ export const customAppScope = {
         }
         const customAppScopes = await odata.getAllItems(url);
         if (customAppScopes.length === 0) {
-            throw `The specified custom application scope '${displayName}' does not exist.`;
+            throw new Error(`The specified custom application scope '${displayName}' does not exist.`);
         }
         if (customAppScopes.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', customAppScopes);

package/dist/utils/directoryExtension.js

@@ -16,7 +16,7 @@ export const directoryExtension = {
         }
         const extensionProperties = await odata.getAllItems(url);
         if (extensionProperties.length === 0) {
-            throw `The specified directory extension '${name}' does not exist.`;
+            throw new Error(`The specified directory extension '${name}' does not exist.`);
         }
         // there can be only one directory extension with a given name
         return extensionProperties[0];

package/dist/utils/entraAdministrativeUnit.js

@@ -24,7 +24,7 @@ export const entraAdministrativeUnit = {
         const graphResource = 'https://graph.microsoft.com';
         const administrativeUnits = await odata.getAllItems(`${graphResource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'${queryString}`);
         if (administrativeUnits.length === 0) {
-            throw `The specified administrative unit '${displayName}' does not exist.`;
+            throw new Error(`The specified administrative unit '${displayName}' does not exist.`);
         }
         if (administrativeUnits.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', administrativeUnits);

package/dist/utils/entraApp.js

@@ -305,7 +305,7 @@ export const entraApp = {
         }
         const apps = await odata.getAllItems(url);
         if (apps.length === 0) {
-            throw `App with appId '${appId}' not found in Microsoft Entra ID`;
+            throw new Error(`App with appId '${appId}' not found in Microsoft Entra ID.`);
         }
         return apps[0];
     },
@@ -316,7 +316,7 @@ export const entraApp = {
         }
         const apps = await odata.getAllItems(url);
         if (apps.length === 0) {
-            throw `App with name '${appName}' not found in Microsoft Entra ID`;
+            throw new Error(`App with name '${appName}' not found in Microsoft Entra ID.`);
         }
         if (apps.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', apps);

package/dist/utils/entraDevice.js

@@ -12,7 +12,7 @@ export const entraDevice = {
     async getDeviceByDisplayName(displayName) {
         const devices = await odata.getAllItems(`${graphResource}/v1.0/devices?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
         if (devices.length === 0) {
-            throw `The specified device '${displayName}' does not exist.`;
+            throw new Error(`The specified device '${displayName}' does not exist.`);
         }
         if (devices.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', devices);

package/dist/utils/entraServicePrincipal.js

@@ -17,7 +17,7 @@ export const entraServicePrincipal = {
         }
         const apps = await odata.getAllItems(url);
         if (apps.length === 0) {
-            throw `Service principal with appId '${appId}' not found in Microsoft Entra ID`;
+            throw new Error(`Service principal with appId '${appId}' not found in Microsoft Entra ID.`);
         }
         return apps[0];
     },
@@ -35,7 +35,7 @@ export const entraServicePrincipal = {
         }
         const apps = await odata.getAllItems(url);
         if (apps.length === 0) {
-            throw `Service principal with name '${appName}' not found in Microsoft Entra ID`;
+            throw new Error(`Service principal with name '${appName}' not found in Microsoft Entra ID.`);
         }
         if (apps.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', apps);

package/dist/utils/formatting.js

@@ -99,7 +99,7 @@ export const formatting = {
     },
     openTypesEncoder(value) {
         return value
-            .replace(/\%/g, '%25')
+            .replace(/%/g, '%25')
             .replace(/\./g, '%2E')
             .replace(/:/g, '%3A')
             .replace(/@/g, '%40')