@pnp/cli-microsoft365 6.0.0-beta.0b0fb88 → 6.0.0-beta.1cd4e45

package/dist/m365/aad/commands/siteclassification/siteclassification-enable.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");
@@ -23,88 +32,91 @@ class AadSiteClassificationEnableCommand extends GraphCommand_1.default {
     get description() {
         return 'Enables site classification configuration';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groupSettingTemplates`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const unifiedGroupSetting = res.value.filter((directorySetting) => {
-                return directorySetting.displayName === 'Group.Unified';
-            });
-            if (!unifiedGroupSetting ||
-                unifiedGroupSetting.length === 0) {
-                return Promise.reject("Missing DirectorySettingTemplate for \"Group.Unified\"");
-            }
-            const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
-            updatedDirSettings.templateId = unifiedGroupSetting[0].id;
-            unifiedGroupSetting[0].values.forEach((directorySetting) => {
-                switch (directorySetting.name) {
-                    case "ClassificationList":
-                        updatedDirSettings.values.push({
-                            "name": directorySetting.name,
-                            "value": args.options.classifications
-                        });
-                        break;
-                    case "DefaultClassification":
-                        updatedDirSettings.values.push({
-                            "name": directorySetting.name,
-                            "value": args.options.defaultClassification
-                        });
-                        break;
-                    case "UsageGuidelinesUrl":
-                        if (args.options.usageGuidelinesUrl) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.usageGuidelinesUrl
-                            });
-                        }
-                        else {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettingTemplates`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const unifiedGroupSetting = res.value.filter((directorySetting) => {
+                    return directorySetting.displayName === 'Group.Unified';
+                });
+                if (!unifiedGroupSetting ||
+                    unifiedGroupSetting.length === 0) {
+                    throw "Missing DirectorySettingTemplate for \"Group.Unified\"";
+                }
+                const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
+                updatedDirSettings.templateId = unifiedGroupSetting[0].id;
+                unifiedGroupSetting[0].values.forEach((directorySetting) => {
+                    switch (directorySetting.name) {
+                        case "ClassificationList":
                             updatedDirSettings.values.push({
                                 "name": directorySetting.name,
-                                "value": directorySetting.defaultValue
+                                "value": args.options.classifications
                             });
-                        }
-                        break;
-                    case "GuestUsageGuidelinesUrl":
-                        if (args.options.guestUsageGuidelinesUrl) {
+                            break;
+                        case "DefaultClassification":
                             updatedDirSettings.values.push({
                                 "name": directorySetting.name,
-                                "value": args.options.guestUsageGuidelinesUrl
+                                "value": args.options.defaultClassification
                             });
-                        }
-                        else {
+                            break;
+                        case "UsageGuidelinesUrl":
+                            if (args.options.usageGuidelinesUrl) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.usageGuidelinesUrl
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.defaultValue
+                                });
+                            }
+                            break;
+                        case "GuestUsageGuidelinesUrl":
+                            if (args.options.guestUsageGuidelinesUrl) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.guestUsageGuidelinesUrl
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.defaultValue
+                                });
+                            }
+                            break;
+                        default:
                             updatedDirSettings.values.push({
                                 "name": directorySetting.name,
                                 "value": directorySetting.defaultValue
                             });
-                        }
-                        break;
-                    default:
-                        updatedDirSettings.values.push({
-                            "name": directorySetting.name,
-                            "value": directorySetting.defaultValue
-                        });
-                        break;
-                }
-            });
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groupSettings`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: updatedDirSettings
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                            break;
+                    }
+                });
+                requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json',
+                    data: updatedDirSettings
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadSiteClassificationEnableCommand_instances = new WeakSet(), _AadSiteClassificationEnableCommand_initTelemetry = function _AadSiteClassificationEnableCommand_initTelemetry() {

package/dist/m365/aad/commands/siteclassification/siteclassification-get.js

@@ -1,6 +1,14 @@
 "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 Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -12,64 +20,65 @@ class AadSiteClassificationGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets site classification configuration';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groupSettings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length === 0) {
-                cb(new Command_1.CommandError('Site classification is not enabled.'));
-                return;
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length === 0) {
+                    throw 'Site classification is not enabled.';
+                }
+                const unifiedGroupSetting = res.value.filter((directorySetting) => {
+                    return directorySetting.displayName === 'Group.Unified';
+                });
+                if (unifiedGroupSetting === null || unifiedGroupSetting.length === 0) {
+                    throw "Missing DirectorySettingTemplate for \"Group.Unified\"";
+                }
+                const siteClassificationsSettings = new SiteClassificationSettings_1.SiteClassificationSettings();
+                // Get the classification list
+                const classificationList = unifiedGroupSetting[0].values.filter((directorySetting) => {
+                    return directorySetting.name === 'ClassificationList';
+                });
+                siteClassificationsSettings.Classifications = [];
+                if (classificationList !== null && classificationList.length > 0) {
+                    siteClassificationsSettings.Classifications = classificationList[0].value.split(',');
+                }
+                // Get the UsageGuidelinesUrl
+                const guidanceUrl = unifiedGroupSetting[0].values.filter((directorySetting) => {
+                    return directorySetting.name === 'UsageGuidelinesUrl';
+                });
+                siteClassificationsSettings.UsageGuidelinesUrl = "";
+                if (guidanceUrl !== null && guidanceUrl.length > 0) {
+                    siteClassificationsSettings.UsageGuidelinesUrl = guidanceUrl[0].value;
+                }
+                // Get the GuestUsageGuidelinesUrl
+                const guestGuidanceUrl = unifiedGroupSetting[0].values.filter((directorySetting) => {
+                    return directorySetting.name === 'GuestUsageGuidelinesUrl';
+                });
+                siteClassificationsSettings.GuestUsageGuidelinesUrl = "";
+                if (guestGuidanceUrl !== null && guestGuidanceUrl.length > 0) {
+                    siteClassificationsSettings.GuestUsageGuidelinesUrl = guestGuidanceUrl[0].value;
+                }
+                // Get the DefaultClassification
+                const defaultClassification = unifiedGroupSetting[0].values.filter((directorySetting) => {
+                    return directorySetting.name === 'DefaultClassification';
+                });
+                siteClassificationsSettings.DefaultClassification = "";
+                if (defaultClassification !== null && defaultClassification.length > 0) {
+                    siteClassificationsSettings.DefaultClassification = defaultClassification[0].value;
+                }
+                logger.log(JSON.parse(JSON.stringify(siteClassificationsSettings)));
             }
-            const unifiedGroupSetting = res.value.filter((directorySetting) => {
-                return directorySetting.displayName === 'Group.Unified';
-            });
-            if (unifiedGroupSetting === null || unifiedGroupSetting.length === 0) {
-                cb(new Command_1.CommandError("Missing DirectorySettingTemplate for \"Group.Unified\""));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const siteClassificationsSettings = new SiteClassificationSettings_1.SiteClassificationSettings();
-            // Get the classification list
-            const classificationList = unifiedGroupSetting[0].values.filter((directorySetting) => {
-                return directorySetting.name === 'ClassificationList';
-            });
-            siteClassificationsSettings.Classifications = [];
-            if (classificationList !== null && classificationList.length > 0) {
-                siteClassificationsSettings.Classifications = classificationList[0].value.split(',');
-            }
-            // Get the UsageGuidelinesUrl
-            const guidanceUrl = unifiedGroupSetting[0].values.filter((directorySetting) => {
-                return directorySetting.name === 'UsageGuidelinesUrl';
-            });
-            siteClassificationsSettings.UsageGuidelinesUrl = "";
-            if (guidanceUrl !== null && guidanceUrl.length > 0) {
-                siteClassificationsSettings.UsageGuidelinesUrl = guidanceUrl[0].value;
-            }
-            // Get the GuestUsageGuidelinesUrl
-            const guestGuidanceUrl = unifiedGroupSetting[0].values.filter((directorySetting) => {
-                return directorySetting.name === 'GuestUsageGuidelinesUrl';
-            });
-            siteClassificationsSettings.GuestUsageGuidelinesUrl = "";
-            if (guestGuidanceUrl !== null && guestGuidanceUrl.length > 0) {
-                siteClassificationsSettings.GuestUsageGuidelinesUrl = guestGuidanceUrl[0].value;
-            }
-            // Get the DefaultClassification
-            const defaultClassification = unifiedGroupSetting[0].values.filter((directorySetting) => {
-                return directorySetting.name === 'DefaultClassification';
-            });
-            siteClassificationsSettings.DefaultClassification = "";
-            if (defaultClassification !== null && defaultClassification.length > 0) {
-                siteClassificationsSettings.DefaultClassification = defaultClassification[0].value;
-            }
-            logger.log(JSON.parse(JSON.stringify(siteClassificationsSettings)));
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 module.exports = new AadSiteClassificationGetCommand();

package/dist/m365/aad/commands/siteclassification/siteclassification-set.js

@@ -33,103 +33,106 @@ class AadSiteClassificationSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates site classification configuration';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groupSettings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const unifiedGroupSetting = res.value.filter((directorySetting) => {
-                return directorySetting.displayName === 'Group.Unified';
-            });
-            if (!unifiedGroupSetting ||
-                unifiedGroupSetting.length === 0) {
-                return Promise.reject("There is no previous defined site classification which can updated.");
-            }
-            const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
-            unifiedGroupSetting[0].values.forEach((directorySetting) => {
-                switch (directorySetting.name) {
-                    case "ClassificationList":
-                        if (args.options.classifications) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.classifications
-                            });
-                        }
-                        else {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
-                            });
-                        }
-                        break;
-                    case "DefaultClassification":
-                        if (args.options.defaultClassification) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.defaultClassification
-                            });
-                        }
-                        else {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
-                            });
-                        }
-                        break;
-                    case "UsageGuidelinesUrl":
-                        if (args.options.usageGuidelinesUrl) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.usageGuidelinesUrl
-                            });
-                        }
-                        else {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": directorySetting.value
-                            });
-                        }
-                        break;
-                    case "GuestUsageGuidelinesUrl":
-                        if (args.options.guestUsageGuidelinesUrl) {
-                            updatedDirSettings.values.push({
-                                "name": directorySetting.name,
-                                "value": args.options.guestUsageGuidelinesUrl
-                            });
-                        }
-                        else {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const unifiedGroupSetting = res.value.filter((directorySetting) => {
+                    return directorySetting.displayName === 'Group.Unified';
+                });
+                if (!unifiedGroupSetting ||
+                    unifiedGroupSetting.length === 0) {
+                    throw "There is no previous defined site classification which can updated.";
+                }
+                const updatedDirSettings = new DirectorySetting_1.UpdateDirectorySetting();
+                unifiedGroupSetting[0].values.forEach((directorySetting) => {
+                    switch (directorySetting.name) {
+                        case "ClassificationList":
+                            if (args.options.classifications) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.classifications
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        case "DefaultClassification":
+                            if (args.options.defaultClassification) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.defaultClassification
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        case "UsageGuidelinesUrl":
+                            if (args.options.usageGuidelinesUrl) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.usageGuidelinesUrl
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        case "GuestUsageGuidelinesUrl":
+                            if (args.options.guestUsageGuidelinesUrl) {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": args.options.guestUsageGuidelinesUrl
+                                });
+                            }
+                            else {
+                                updatedDirSettings.values.push({
+                                    "name": directorySetting.name,
+                                    "value": directorySetting.value
+                                });
+                            }
+                            break;
+                        default:
                             updatedDirSettings.values.push({
                                 "name": directorySetting.name,
                                 "value": directorySetting.value
                             });
-                        }
-                        break;
-                    default:
-                        updatedDirSettings.values.push({
-                            "name": directorySetting.name,
-                            "value": directorySetting.value
-                        });
-                        break;
-                }
-            });
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groupSettings/${unifiedGroupSetting[0].id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: updatedDirSettings
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                            break;
+                    }
+                });
+                requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings/${unifiedGroupSetting[0].id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json',
+                    data: updatedDirSettings
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadSiteClassificationSetCommand_instances = new WeakSet(), _AadSiteClassificationSetCommand_initTelemetry = function _AadSiteClassificationSetCommand_initTelemetry() {

package/dist/m365/aad/commands/sp/sp-add.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators, _AadSpAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadSpAddCommand extends GraphCommand_1.default {
@@ -40,10 +41,10 @@ class AadSpAddCommand extends GraphCommand_1.default {
         }
         let spMatchQuery = '';
         if (args.options.appName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appName)}'`;
+            spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appName)}'`;
         }
         else if (args.options.objectId) {
-            spMatchQuery = `id eq '${encodeURIComponent(args.options.objectId)}'`;
+            spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.objectId)}'`;
         }
         const appIdRequestOptions = {
             url: `${this.resource}/v1.0/applications?$filter=${spMatchQuery}`,
@@ -65,27 +66,28 @@ class AadSpAddCommand extends GraphCommand_1.default {
             return Promise.resolve(spItem.appId);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppId(args)
-            .then((appId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/servicePrincipals`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    appId: appId
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appId = yield this.getAppId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/servicePrincipals`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        appId: appId
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = function _AadSpAddCommand_initTelemetry() {
@@ -106,10 +108,10 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
     });
 }, _AadSpAddCommand_initValidators = function _AadSpAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid objectId GUID`;
         }
         return true;