@pnp/cli-microsoft365 6.0.0-beta.2979870 → 6.0.0-beta.3261c97

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

@@ -24,7 +24,6 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoWebReindexCommand_instances.add(this);
-        this.reindexedLists = false;
         __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initValidators).call(this);
     }
@@ -34,58 +33,48 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
     get description() {
         return 'Requests reindexing the specified subsite';
     }
-    commandAction(logger, args, cb) {
-        let requestDigest = '';
-        let webIdentityResp;
-        utils_1.spo
-            .getRequestDigest(args.options.url)
-            .then((res) => {
-            requestDigest = res.FormDigestValue;
-            if (this.debug) {
-                logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
-            }
-            return utils_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
-        })
-            .then((identityResp) => {
-            webIdentityResp = identityResp;
-            if (this.debug) {
-                logger.logToStderr(`Retrieved web identity.`);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Checking if the site is a no-script site...`);
-            }
-            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
-        })
-            .then((isNoScriptSite) => {
-            if (isNoScriptSite) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestDigest = '';
+            let webIdentityResp;
+            try {
+                const res = yield utils_1.spo.getRequestDigest(args.options.url);
+                requestDigest = res.FormDigestValue;
+                if (this.debug) {
+                    logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
+                }
+                const identityResp = yield utils_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
+                webIdentityResp = identityResp;
+                if (this.debug) {
+                    logger.logToStderr(`Retrieved web identity.`);
+                }
                 if (this.verbose) {
-                    logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
+                    logger.logToStderr(`Checking if the site is a no-script site...`);
                 }
-                return this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
-            }
-            const requestOptions = {
-                url: `${args.options.url}/_api/web/allproperties`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((webProperties) => {
-            let searchVersion = webProperties.vti_x005f_searchversion || 0;
-            searchVersion++;
-            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
-        })
-            .then(_ => cb(), (err) => {
-            if (this.reindexedLists) {
-                cb();
+                const isNoScriptSite = yield propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
+                if (isNoScriptSite) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
+                    }
+                    yield this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
+                }
+                const requestOptions = {
+                    url: `${args.options.url}/_api/web/allproperties`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const webProperties = yield request_1.default.get(requestOptions);
+                let searchVersion = webProperties.vti_x005f_searchversion || 0;
+                searchVersion++;
+                yield propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
             }
-            else {
-                this.handleRejectedPromise(err, logger, cb);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
         });
     }
@@ -109,8 +98,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 return Promise.all(promises);
             })
                 .then(() => {
-                this.reindexedLists = true;
-                reject(undefined);
+                resolve();
             }, (err) => reject(err));
         });
     }

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

@@ -34,41 +34,42 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Delete specified subsite';
     }
-    commandAction(logger, args, cb) {
-        const removeWeb = () => {
-            const requestOptions = {
-                url: `${encodeURI(args.options.url)}/_api/web`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'X-HTTP-Method': 'DELETE'
-                },
-                responseType: 'json'
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
-            }
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeWeb();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the subsite ${args.options.url}`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeWeb = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${encodeURI(args.options.url)}/_api/web`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'X-HTTP-Method': 'DELETE'
+                    },
+                    responseType: 'json'
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
+                }
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeWeb();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeWeb();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the subsite ${args.options.url}`
+                });
+                if (result.continue) {
+                    yield removeWeb();
+                }
+            }
+        });
     }
 }
 _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemetry = function _SpoWebRemoveCommand_initTelemetry() {

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

@@ -37,33 +37,31 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds a role assignment to web';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
-        }
-        this.GetRoleDefinitionId(args.options)
-            .then((roleDefinitionId) => {
-            args.options.roleDefinitionId = roleDefinitionId;
-            if (args.options.upn) {
-                this.GetUserPrincipalId(args.options)
-                    .then((userPrincipalId) => {
-                    args.options.principalId = userPrincipalId;
-                    this.AddRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
             }
-            else if (args.options.groupName) {
-                this.GetGroupPrincipalId(args.options)
-                    .then((groupPrincipalId) => {
-                    args.options.principalId = groupPrincipalId;
-                    this.AddRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            try {
+                args.options.roleDefinitionId = yield this.GetRoleDefinitionId(args.options);
+                if (args.options.upn) {
+                    args.options.principalId = yield this.GetUserPrincipalId(args.options);
+                    yield this.AddRoleAssignment(logger, args.options);
+                }
+                else if (args.options.groupName) {
+                    args.options.principalId = yield this.GetGroupPrincipalId(args.options);
+                    yield this.AddRoleAssignment(logger, args.options);
+                }
+                else {
+                    yield this.AddRoleAssignment(logger, args.options);
+                }
             }
-            else {
-                this.AddRoleAssignment(logger, args.options, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
-    AddRoleAssignment(logger, options, cb) {
+    AddRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -73,9 +71,10 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        request_1.default
+        return request_1.default
             .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            .then(_ => Promise.resolve())
+            .catch((err) => Promise.reject(err));
     }
     GetRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {

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

@@ -36,49 +36,46 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes a role assignment from web permissions';
     }
-    commandAction(logger, args, cb) {
-        const removeRoleAssignment = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
-            }
-            if (args.options.upn) {
-                this.GetUserPrincipalId(args.options)
-                    .then((userPrincipalId) => {
-                    args.options.principalId = userPrincipalId;
-                    this.RemoveRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            else if (args.options.groupName) {
-                this.GetGroupPrincipalId(args.options)
-                    .then((groupPrincipalId) => {
-                    args.options.principalId = groupPrincipalId;
-                    this.RemoveRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            else {
-                this.RemoveRoleAssignment(logger, args.options, cb);
-            }
-        };
-        if (args.options.confirm) {
-            removeRoleAssignment();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
                 }
-                else {
-                    removeRoleAssignment();
+                try {
+                    if (args.options.upn) {
+                        args.options.principalId = yield this.GetUserPrincipalId(args.options);
+                        yield this.RemoveRoleAssignment(logger, args.options);
+                    }
+                    else if (args.options.groupName) {
+                        args.options.principalId = yield this.GetGroupPrincipalId(args.options);
+                        yield this.RemoveRoleAssignment(logger, args.options);
+                    }
+                    else {
+                        yield this.RemoveRoleAssignment(logger, args.options);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeRoleAssignment();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeRoleAssignment();
+                }
+            }
+        });
     }
-    RemoveRoleAssignment(logger, options, cb) {
+    RemoveRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -88,9 +85,10 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        request_1.default
+        return request_1.default
             .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            .then(_ => Promise.resolve())
+            .catch((err) => Promise.reject(err));
     }
     GetGroupPrincipalId(options) {
         const groupGetCommandOptions = {

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

@@ -34,42 +34,43 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores role inheritance of subsite';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
-        }
-        const resetWebRoleInheritance = () => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
-                method: 'POST',
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            resetWebRoleInheritance();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
+            }
+            const resetWebRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    resetWebRoleInheritance();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield resetWebRoleInheritance();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield resetWebRoleInheritance();
+                }
+            }
+        });
     }
 }
 _SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {

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

@@ -33,52 +33,57 @@ class SpoWebSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates subsite properties';
     }
-    commandAction(logger, args, cb) {
-        const payload = {};
-        this.addUnknownOptionsToPayload(payload, args.options);
-        if (args.options.title) {
-            payload.Title = args.options.title;
-        }
-        if (args.options.description) {
-            payload.Description = args.options.description;
-        }
-        if (typeof args.options.siteLogoUrl !== 'undefined') {
-            payload.SiteLogoUrl = args.options.siteLogoUrl;
-        }
-        if (typeof args.options.quickLaunchEnabled !== 'undefined') {
-            payload.QuickLaunchEnabled = args.options.quickLaunchEnabled === 'true';
-        }
-        if (typeof args.options.headerEmphasis !== 'undefined') {
-            payload.HeaderEmphasis = args.options.headerEmphasis;
-        }
-        if (typeof args.options.headerLayout !== 'undefined') {
-            payload.HeaderLayout = args.options.headerLayout === 'standard' ? 1 : 2;
-        }
-        if (typeof args.options.megaMenuEnabled !== 'undefined') {
-            payload.MegaMenuEnabled = args.options.megaMenuEnabled === 'true';
-        }
-        if (typeof args.options.footerEnabled !== 'undefined') {
-            payload.FooterEnabled = args.options.footerEnabled === 'true';
-        }
-        if (typeof args.options.searchScope !== 'undefined') {
-            const searchScope = args.options.searchScope.toLowerCase();
-            payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
-        }
-        const requestOptions = {
-            url: `${args.options.url}/_api/web`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: payload
-        };
-        if (this.verbose) {
-            logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
-        }
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = {};
+            this.addUnknownOptionsToPayload(payload, args.options);
+            if (args.options.title) {
+                payload.Title = args.options.title;
+            }
+            if (args.options.description) {
+                payload.Description = args.options.description;
+            }
+            if (typeof args.options.siteLogoUrl !== 'undefined') {
+                payload.SiteLogoUrl = args.options.siteLogoUrl;
+            }
+            if (typeof args.options.quickLaunchEnabled !== 'undefined') {
+                payload.QuickLaunchEnabled = args.options.quickLaunchEnabled === 'true';
+            }
+            if (typeof args.options.headerEmphasis !== 'undefined') {
+                payload.HeaderEmphasis = args.options.headerEmphasis;
+            }
+            if (typeof args.options.headerLayout !== 'undefined') {
+                payload.HeaderLayout = args.options.headerLayout === 'standard' ? 1 : 2;
+            }
+            if (typeof args.options.megaMenuEnabled !== 'undefined') {
+                payload.MegaMenuEnabled = args.options.megaMenuEnabled === 'true';
+            }
+            if (typeof args.options.footerEnabled !== 'undefined') {
+                payload.FooterEnabled = args.options.footerEnabled === 'true';
+            }
+            if (typeof args.options.searchScope !== 'undefined') {
+                const searchScope = args.options.searchScope.toLowerCase();
+                payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
+            }
+            const requestOptions = {
+                url: `${args.options.url}/_api/web`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: payload
+            };
+            if (this.verbose) {
+                logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
+            }
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     allowUnknownOptions() {
         return true;

package/dist/m365/spo/commands.js

@@ -173,6 +173,7 @@ exports.default = {
     REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
+    ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,

package/dist/m365/teams/commands/app/app-install.js

@@ -36,32 +36,35 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
     get description() {
         return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
-    commandAction(logger, args, cb) {
-        this
-            .validateUser(args, logger)
-            .then(_ => {
-            var _a;
-            let url = `${this.resource}/v1.0`;
-            if (args.options.teamId) {
-                url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.validateUser(args, logger);
+                let url = `${this.resource}/v1.0`;
+                if (args.options.teamId) {
+                    url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+                }
+                else {
+                    url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+                }
+                const requestOptions = {
+                    url: url,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
+                    }
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else {
-                url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: url,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        });
     }
     // we need this method, because passing an invalid user ID to the API
     // won't cause an error