@pnp/cli-microsoft365 5.0.0-beta.fe151d6 → 5.1.0-beta.6ab68db

package/dist/m365/spo/commands/folder/folder-move.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderMoveCommand extends SpoCommand_1.default {
@@ -23,9 +24,9 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
         const webUrl = args.options.webUrl;
         const parsedUrl = url.parse(webUrl);
         const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const sourceAbsoluteUrl = this.urlCombine(webUrl, args.options.sourceUrl);
+        const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
         const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestUrl = this.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+        const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
         const requestOptions = {
             url: requestUrl,
             headers: {
@@ -33,7 +34,7 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
             },
             data: {
                 exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: this.urlCombine(tenantUrl, args.options.targetUrl),
+                destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                 options: {
                     "AllowSchemaMismatch": allowSchemaMismatch,
                     "IgnoreVersionHistory": true,
@@ -50,7 +51,17 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
                 const copyJobInfo = jobInfo.value[0];
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 setTimeout(() => {
-                    this.waitUntilCopyJobFinished(copyJobInfo, webUrl, progressPollInterval, resolve, reject, logger, this.dots);
+                    utils_1.spo.waitUntilCopyJobFinished({
+                        copyJobInfo,
+                        siteUrl: webUrl,
+                        pollingInterval: progressPollInterval,
+                        resolve,
+                        reject,
+                        logger,
+                        dots: this.dots,
+                        debug: this.debug,
+                        verbose: this.verbose
+                    });
                 }, progressPollInterval);
             });
         })
@@ -75,7 +86,7 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoFolderMoveCommand();

package/dist/m365/spo/commands/folder/folder-remove.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderRemoveCommand extends SpoCommand_1.default {
@@ -23,7 +23,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
             }
-            const serverRelativeUrl = Utils_1.default.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
             let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
             if (args.options.recycle) {
                 requestUrl += `/recycle()`;
@@ -80,7 +80,7 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoFolderRemoveCommand();

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

@@ -2,9 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const ClientSvc_1 = require("../../ClientSvc");
 const commands_1 = require("../../commands");
 class SpoFolderRenameCommand extends SpoCommand_1.default {
     get name() {
@@ -14,22 +13,21 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
         return 'Renames a folder';
     }
     commandAction(logger, args, cb) {
-        const clientSvc = new ClientSvc_1.ClientSvc(logger, this.debug);
         let formDigestValue = '';
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((contextResponse) => {
             formDigestValue = contextResponse.FormDigestValue;
-            return clientSvc.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
         })
             .then((webIdentityResp) => {
-            return clientSvc.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.folderUrl, formDigestValue);
+            return utils_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, args.options.webUrl, args.options.folderUrl, formDigestValue);
         })
             .then((folderObjectIdentity) => {
             if (this.verbose) {
                 logger.logToStderr(`Renaming folder ${args.options.folderUrl} to ${args.options.name}`);
             }
-            const serverRelativeUrl = Utils_1.default.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
             const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
             const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
             const requestOptions = {
@@ -68,7 +66,7 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoFolderRenameCommand();

package/dist/m365/spo/commands/group/group-get.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupGetCommand extends SpoCommand_1.default {
@@ -67,7 +68,7 @@ class SpoGroupGetCommand extends SpoCommand_1.default {
         if (args.options.id && isNaN(args.options.id)) {
             return `Specified id ${args.options.id} is not a number`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoGroupGetCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupListCommand extends SpoCommand_1.default {
@@ -42,7 +43,7 @@ class SpoGroupListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoGroupListCommand();

package/dist/m365/spo/commands/group/group-remove.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupRemoveCommand extends SpoCommand_1.default {
@@ -95,7 +96,7 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/group/group-user-add.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const SpoCommand_1 = require("../../../base/SpoCommand");
+const utils_1 = require("../../../../utils");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupUserAddCommand extends SpoCommand_1.default {
     get name() {
@@ -17,15 +18,21 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
         return ['DisplayName', 'Email'];
     }
     commandAction(logger, args, cb) {
-        this.getOnlyActiveUsers(args, logger)
+        let groupId = 0;
+        this
+            .getGroupId(args)
+            .then((_groupId) => {
+            groupId = _groupId;
+            return this.getValidUsers(args, logger);
+        })
             .then((resolvedUsernameList) => {
             if (this.verbose) {
-                logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId}...`);
+                logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
             }
             const data = {
                 url: args.options.webUrl,
                 peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
-                roleValue: `group:${args.options.groupId}`
+                roleValue: `group:${groupId}`
             };
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
@@ -46,32 +53,66 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    getOnlyActiveUsers(args, logger) {
+    getGroupId(args) {
+        const getGroupMethod = args.options.groupName ?
+            `GetByName('${encodeURIComponent(args.options.groupName)}')` :
+            `GetById('${args.options.groupId}')`;
+        const requestOptions = {
+            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const groupId = response.Id;
+            if (!groupId) {
+                return Promise.reject(`The specified group does not exist in the SharePoint site`);
+            }
+            return groupId;
+        });
+    }
+    getValidUsers(args, logger) {
         if (this.verbose) {
-            logger.logToStderr(`Removing Users which are not active from the original list`);
+            logger.logToStderr(`Checking if the specified users exist`);
         }
-        const activeUsernamelist = [];
-        return Promise.all(args.options.userName.split(",").map(singleUsername => {
+        const validUserNames = [];
+        const invalidUserNames = [];
+        const userInfo = args.options.userName ? args.options.userName : args.options.email;
+        return Promise
+            .all(userInfo.split(',').map(singleUserName => {
             const options = {
-                userName: singleUsername.trim(),
                 output: 'json',
                 debug: args.options.debug,
                 verbose: args.options.verbose
             };
-            return cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
+            if (args.options.userName) {
+                options.userName = singleUserName.trim();
+            }
+            else {
+                options.email = singleUserName.trim();
+            }
+            return cli_1.Cli
+                .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
                 .then((getUserGetOutput) => {
                 if (this.debug) {
                     logger.logToStderr(getUserGetOutput.stderr);
                 }
-                activeUsernamelist.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
+                validUserNames.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
             }, (err) => {
                 if (this.debug) {
                     logger.logToStderr(err.stderr);
                 }
+                invalidUserNames.push(singleUserName);
             });
         }))
             .then(() => {
-            return Promise.resolve(activeUsernamelist);
+            if (invalidUserNames.length > 0) {
+                return Promise.reject(`Users not added to the group because the following users don't exist: ${invalidUserNames.join(', ')}`);
+            }
+            return Promise.resolve(validUserNames);
         });
     }
     getFormattedUserList(activeUserList) {
@@ -86,22 +127,40 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
                 option: '-u, --webUrl <webUrl>'
             },
             {
-                option: '--groupId <groupId>'
+                option: '--groupId [groupId]'
+            },
+            {
+                option: '--groupName [groupName]'
+            },
+            {
+                option: '--userName [userName]'
             },
             {
-                option: '--userName <userName>'
+                option: '--email [email]'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (typeof args.options.groupId !== 'number') {
-            return `Group Id : ${args.options.groupId} is not a number`;
+        if (!args.options.groupId && !args.options.groupName) {
+            return 'Specify either groupId or groupName';
+        }
+        if (args.options.groupId && args.options.groupName) {
+            return 'Specify either groupId or groupName but not both';
+        }
+        if (!args.options.userName && !args.options.email) {
+            return 'Specify either userName or email';
+        }
+        if (args.options.userName && args.options.email) {
+            return 'Specify either userName or email but not both';
+        }
+        if (args.options.groupId && isNaN(args.options.groupId)) {
+            return `Specified groupId ${args.options.groupId} is not a number`;
         }
         return true;
     }

package/dist/m365/spo/commands/group/group-user-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoGroupUserListCommand extends SpoCommand_1.default {
@@ -59,7 +60,7 @@ class SpoGroupUserListCommand extends SpoCommand_1.default {
         if (args.options.groupId && isNaN(args.options.groupId)) {
             return `Specified "groupId" ${args.options.groupId} is not valid`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoGroupUserListCommand();

package/dist/m365/spo/commands/group/group-user-remove.js

@@ -0,0 +1,101 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.GROUP_USER_REMOVE;
+    }
+    get description() {
+        return 'Removes the specified user from a SharePoint group';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.groupId = (!(!args.options.groupId)).toString();
+        telemetryProps.groupName = (!(!args.options.groupName)).toString();
+        telemetryProps.confirm = (!(!args.options.confirm)).toString();
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const removeUserfromSPGroup = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+            }
+            const loginName = `i:0#.f|membership|${args.options.userName}`;
+            const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
+                ? `GetById('${encodeURIComponent(args.options.groupId)}')`
+                : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .post(requestOptions)
+                .then(() => {
+                cb();
+            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            if (this.debug) {
+                logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
+            }
+            removeUserfromSPGroup();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeUserfromSPGroup();
+                }
+            });
+        }
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '--groupId [groupId]'
+            },
+            {
+                option: '--groupName [groupName]'
+            },
+            {
+                option: '--userName <userName>'
+            },
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.groupId && args.options.groupName) {
+            return 'Use either "groupName" or "groupId", but not both';
+        }
+        if (!args.options.groupId && !args.options.groupName) {
+            return 'Either "groupName" or "groupId" is required';
+        }
+        if (args.options.groupId && isNaN(args.options.groupId)) {
+            return `Specified "groupId" ${args.options.groupId} is not valid`;
+        }
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoGroupUserRemoveCommand();
+//# sourceMappingURL=group-user-remove.js.map

package/dist/m365/spo/commands/hidedefaultthemes/hidedefaultthemes-get.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
@@ -11,7 +12,7 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand_1.default {
         return 'Gets the current value of the HideDefaultThemes setting';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             if (this.verbose) {

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
@@ -16,7 +17,7 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             if (this.verbose) {

package/dist/m365/spo/commands/homesite/homesite-get.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteGetCommand extends SpoCommand_1.default {
@@ -11,7 +12,7 @@ class SpoHomeSiteGetCommand extends SpoCommand_1.default {
         return 'Gets information about the Home Site';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const requestOptions = {

package/dist/m365/spo/commands/homesite/homesite-remove.js

@@ -4,6 +4,7 @@ const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
@@ -21,10 +22,10 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeHomeSite = () => {
             let spoAdminUrl = '';
-            this.getSpoAdminUrl(logger, this.debug)
+            utils_1.spo.getSpoAdminUrl(logger, this.debug)
                 .then((_spoAdminUrl) => {
                 spoAdminUrl = _spoAdminUrl;
-                return this.getRequestDigest(spoAdminUrl);
+                return utils_1.spo.getRequestDigest(spoAdminUrl);
             })
                 .then((res) => {
                 const requestOptions = {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHomeSiteSetCommand extends SpoCommand_1.default {
@@ -15,11 +15,11 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -27,7 +27,7 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="57" ObjectPathId="56" /><Method Name="SetSPHSite" Id="58" ObjectPathId="56"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="56" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })
@@ -45,7 +45,7 @@ class SpoHomeSiteSetCommand extends SpoCommand_1.default {
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }
     options() {
         const options = [

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteConnectCommand extends SpoCommand_1.default {
@@ -12,7 +12,7 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
         return 'Connects the specified site collection to the given hub site';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getRequestDigest(args.options.url)
             .then((res) => {
             const requestOptions = {
@@ -40,11 +40,11 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!Utils_1.default.isValidGuid(args.options.hubSiteId)) {
+        if (!utils_1.validation.isValidGuid(args.options.hubSiteId)) {
             return `${args.options.hubSiteId} is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/hubsite/hubsite-data-get.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
@@ -54,7 +55,7 @@ class SpoHubSiteDataGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoHubSiteDataGetCommand();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
@@ -18,7 +19,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const disconnectHubSite = () => {
-            this
+            utils_1.spo
                 .getRequestDigest(args.options.url)
                 .then((res) => {
                 if (this.verbose) {
@@ -68,7 +69,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.url);
+        return utils_1.validation.isValidSharePointUrl(args.options.url);
     }
 }
 module.exports = new SpoHubSiteDisconnectCommand();