@pnp/cli-microsoft365 6.0.0-beta.c377306 → 6.0.0-beta.c5b75e1

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteScriptRemoveCommand_instances, _SpoSiteScriptRemoveCommand_initTelemetry, _SpoSiteScriptRemoveCommand_initOptions, _SpoSiteScriptRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
@@ -34,48 +35,43 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified site script';
     }
-    commandAction(logger, args, cb) {
-        const removeSiteScript = () => {
-            let spoUrl = '';
-            utils_1.spo
-                .getSpoUrl(logger, this.debug)
-                .then((_spoUrl) => {
-                spoUrl = _spoUrl;
-                return utils_1.spo.getRequestDigest(spoUrl);
-            })
-                .then((res) => {
-                const requestOptions = {
-                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteScript`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue,
-                        'content-type': 'application/json;charset=utf-8',
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    data: { id: args.options.id },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeSiteScript();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the site script ${args.options.id}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSiteScript = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                    const requestOptions = {
+                        url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteScript`,
+                        headers: {
+                            'X-RequestDigest': formDigest.FormDigestValue,
+                            'content-type': 'application/json;charset=utf-8',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        data: { id: args.options.id },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeSiteScript();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeSiteScript();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the site script ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeSiteScript();
+                }
+            }
+        });
     }
 }
 _SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveCommand_initTelemetry = function _SpoSiteScriptRemoveCommand_initTelemetry() {
@@ -92,7 +88,7 @@ _SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveComma
     });
 }, _SpoSiteScriptRemoveCommand_initValidators = function _SpoSiteScriptRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteScriptSetCommand_instances, _SpoSiteScriptSetCommand_initTelemetry, _SpoSiteScriptSetCommand_initOptions, _SpoSiteScriptSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteScriptSetCommand extends SpoCommand_1.default {
@@ -33,46 +34,43 @@ class SpoSiteScriptSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates existing site script';
     }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            const updateInfo = {
-                Id: args.options.id
-            };
-            if (args.options.title) {
-                updateInfo.Title = args.options.title;
-            }
-            if (args.options.description) {
-                updateInfo.Description = args.options.description;
-            }
-            if (args.options.version) {
-                updateInfo.Version = parseInt(args.options.version);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const formDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                const updateInfo = {
+                    Id: args.options.id
+                };
+                if (args.options.title) {
+                    updateInfo.Title = args.options.title;
+                }
+                if (args.options.description) {
+                    updateInfo.Description = args.options.description;
+                }
+                if (args.options.version) {
+                    updateInfo.Version = parseInt(args.options.version);
+                }
+                if (args.options.content) {
+                    updateInfo.Content = args.options.content;
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.UpdateSiteScript`,
+                    headers: {
+                        'X-RequestDigest': formDigest.FormDigestValue,
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: { updateInfo: updateInfo },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
-            if (args.options.content) {
-                updateInfo.Content = args.options.content;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.UpdateSiteScript`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: { updateInfo: updateInfo },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteScriptSetCommand_instances = new WeakSet(), _SpoSiteScriptSetCommand_initTelemetry = function _SpoSiteScriptSetCommand_initTelemetry() {
@@ -98,7 +96,7 @@ _SpoSiteScriptSetCommand_instances = new WeakSet(), _SpoSiteScriptSetCommand_ini
     });
 }, _SpoSiteScriptSetCommand_initValidators = function _SpoSiteScriptSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.version) {

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../Auth");
 const SpoCommand_1 = require("../../base/SpoCommand");
@@ -10,12 +19,13 @@ class SpoGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets the context URL for the root SharePoint site collection and SharePoint tenant admin site';
     }
-    commandAction(logger, args, cb) {
-        const spoContext = {
-            SpoUrl: Auth_1.default.service.spoUrl ? Auth_1.default.service.spoUrl : ''
-        };
-        logger.log(spoContext);
-        cb();
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoContext = {
+                SpoUrl: Auth_1.default.service.spoUrl ? Auth_1.default.service.spoUrl : ''
+            };
+            logger.log(spoContext);
+        });
     }
 }
 module.exports = new SpoGetCommand();

package/dist/m365/spo/commands/spo-search.js

@@ -17,7 +17,8 @@ var _SpoSearchCommand_instances, _SpoSearchCommand_initTelemetry, _SpoSearchComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const spo_1 = require("../../../utils/spo");
+const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class SpoSearchCommand extends SpoCommand_1.default {
@@ -34,28 +35,27 @@ class SpoSearchCommand extends SpoCommand_1.default {
     get description() {
         return 'Executes a search query';
     }
-    commandAction(logger, args, cb) {
-        let webUrl = '';
-        (() => {
-            if (args.options.webUrl) {
-                return Promise.resolve(args.options.webUrl);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let webUrl = '';
+            try {
+                if (args.options.webUrl) {
+                    webUrl = args.options.webUrl;
+                }
+                else {
+                    webUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
+                }
+                const startRow = args.options.startRow ? args.options.startRow : 0;
+                const results = yield this.executeSearchQuery(logger, args, webUrl, [], startRow);
+                this.printResults(logger, args, results);
             }
-            else {
-                return utils_1.spo.getSpoUrl(logger, this.debug);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })()
-            .then((_webUrl) => {
-            webUrl = _webUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Executing search query '${args.options.queryText}' on site at ${webUrl}...`);
-            }
-            const startRow = args.options.startRow ? args.options.startRow : 0;
-            return this.executeSearchQuery(logger, args, webUrl, [], startRow);
-        })
-            .then((results) => {
-            this.printResults(logger, args, results);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     executeSearchQuery(logger, args, webUrl, resultSet, startRow) {
         return (() => {
@@ -251,10 +251,10 @@ _SpoSearchCommand_instances = new WeakSet(), _SpoSearchCommand_initTelemetry = f
     });
 }, _SpoSearchCommand_initValidators = function _SpoSearchCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.sourceId && !utils_1.validation.isValidGuid(args.options.sourceId)) {
+        if (args.options.sourceId && !validation_1.validation.isValidGuid(args.options.sourceId)) {
             return `${args.options.sourceId} is not a valid GUID`;
         }
-        if (args.options.rankingModelId && !utils_1.validation.isValidGuid(args.options.rankingModelId)) {
+        if (args.options.rankingModelId && !validation_1.validation.isValidGuid(args.options.rankingModelId)) {
             return `${args.options.rankingModelId} is not a valid GUID`;
         }
         if (args.options.sortList && !/^([a-z0-9_]+:(ascending|descending))(,([a-z0-9_]+:(ascending|descending)))*$/gi.test(args.options.sortList)) {

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

@@ -16,8 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSetCommand_instances, _SpoSetCommand_initOptions, _SpoSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../Auth");
-const Command_1 = require("../../../Command");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class SpoSetCommand extends SpoCommand_1.default {
@@ -33,12 +32,15 @@ class SpoSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets the URL of the root SharePoint site collection for use in SPO commands';
     }
-    commandAction(logger, args, cb) {
-        Auth_1.default.service.spoUrl = args.options.url;
-        Auth_1.default.storeConnectionInfo().then(() => {
-            cb();
-        }, err => {
-            cb(new Command_1.CommandError(err));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            Auth_1.default.service.spoUrl = args.options.url;
+            try {
+                yield Auth_1.default.storeConnectionInfo();
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
         });
     }
 }
@@ -47,7 +49,7 @@ _SpoSetCommand_instances = new WeakSet(), _SpoSetCommand_initOptions = function
         option: '-u, --url <url>'
     });
 }, _SpoSetCommand_initValidators = function _SpoSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoSetCommand();
 //# sourceMappingURL=spo-set.js.map

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -7,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityGetCommand_instances, _SpoStorageEntityGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntityGetCommand extends SpoCommand_1.default {
@@ -22,35 +31,36 @@ class SpoStorageEntityGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Get details for the specified tenant property';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const requestOptions = {
-                url: `${spoUrl}/_api/web/GetStorageEntity('${encodeURIComponent(args.options.key)}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((property) => {
-            if (property["odata.null"] === true) {
-                if (this.verbose) {
-                    logger.logToStderr(`Property with key ${args.options.key} not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/web/GetStorageEntity('${encodeURIComponent(args.options.key)}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const property = yield request_1.default.get(requestOptions);
+                if (property["odata.null"] === true) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Property with key ${args.options.key} not found`);
+                    }
+                }
+                else {
+                    logger.log({
+                        Key: args.options.key,
+                        Value: property.Value,
+                        Description: property.Description,
+                        Comment: property.Comment
+                    });
                 }
             }
-            else {
-                logger.log({
-                    Key: args.options.key,
-                    Value: property.Value,
-                    Description: property.Description,
-                    Comment: property.Comment
-                });
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoStorageEntityGetCommand_instances = new WeakSet(), _SpoStorageEntityGetCommand_initOptions = function _SpoStorageEntityGetCommand_initOptions() {

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoStorageEntityListCommand_instances, _SpoStorageEntityListCommand_initOptions, _SpoStorageEntityListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoStorageEntityListCommand extends SpoCommand_1.default {
@@ -32,53 +32,51 @@ class SpoStorageEntityListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists tenant properties stored on the specified SharePoint Online app catalog';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving details for all tenant properties in ${args.options.appCatalogUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.appCatalogUrl}/_api/web/AllProperties?$select=storageentitiesindex`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((web) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving details for all tenant properties in ${args.options.appCatalogUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.appCatalogUrl}/_api/web/AllProperties?$select=storageentitiesindex`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
             try {
+                const web = yield request_1.default.get(requestOptions);
                 if (!web.storageentitiesindex ||
                     web.storageentitiesindex.trim().length === 0) {
                     if (this.verbose) {
                         logger.logToStderr('No tenant properties found');
                     }
-                    cb();
-                    return;
-                }
-                const properties = JSON.parse(web.storageentitiesindex);
-                const keys = Object.keys(properties);
-                if (keys.length === 0) {
-                    if (this.verbose) {
-                        logger.logToStderr('No tenant properties found');
-                    }
                 }
                 else {
-                    logger.log(keys.map((key) => {
-                        const property = properties[key];
-                        return {
-                            Key: key,
-                            Value: property.Value,
-                            Description: property.Description,
-                            Comment: property.Comment
-                        };
-                    }));
+                    const properties = JSON.parse(web.storageentitiesindex);
+                    const keys = Object.keys(properties);
+                    if (keys.length === 0) {
+                        if (this.verbose) {
+                            logger.logToStderr('No tenant properties found');
+                        }
+                    }
+                    else {
+                        logger.log(keys.map((key) => {
+                            const property = properties[key];
+                            return {
+                                Key: key,
+                                Value: property.Value,
+                                Description: property.Description,
+                                Comment: property.Comment
+                            };
+                        }));
+                    }
                 }
-                cb();
             }
-            catch (e) {
-                this.handleError(e, logger, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoStorageEntityListCommand_instances = new WeakSet(), _SpoStorageEntityListCommand_initOptions = function _SpoStorageEntityListCommand_initOptions() {
@@ -86,7 +84,7 @@ _SpoStorageEntityListCommand_instances = new WeakSet(), _SpoStorageEntityListCom
         option: '-u, --appCatalogUrl <appCatalogUrl>'
     });
 }, _SpoStorageEntityListCommand_initValidators = function _SpoStorageEntityListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));
 };
 module.exports = new SpoStorageEntityListCommand();
 //# sourceMappingURL=storageentity-list.js.map