@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.2ab70db

package/dist/m365/spo/commands/site/site-apppermission-list.js

@@ -1,4 +1,19 @@
 "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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteAppPermissionListCommand_instances, _SpoSiteAppPermissionListCommand_initTelemetry, _SpoSiteAppPermissionListCommand_initOptions, _SpoSiteAppPermissionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -6,8 +21,12 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpoSiteAppPermissionListCommand_instances.add(this);
         this.siteId = '';
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_LIST;
@@ -15,12 +34,6 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists application permissions for a site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appDisplayName = typeof args.options.appDisplayName !== 'undefined';
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        return telemetryProps;
-    }
     getSpoSiteId(args) {
         const url = new URL(args.options.siteUrl);
         const requestOptions = {
@@ -79,46 +92,46 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getSpoSiteId(args)
-            .then((siteId) => {
-            this.siteId = siteId;
-            return this.getPermissions();
-        })
-            .then((res) => {
-            let permissions = res.value;
-            if (args.options.appId || args.options.appDisplayName) {
-                permissions = this.getFilteredPermissions(args, res.value);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.siteId = yield this.getSpoSiteId(args);
+                const permRes = yield this.getPermissions();
+                let permissions = permRes.value;
+                if (args.options.appId || args.options.appDisplayName) {
+                    permissions = this.getFilteredPermissions(args, permRes.value);
+                }
+                const res = yield Promise.all(permissions.map(g => this.getApplicationPermission(g.id)));
+                logger.log(this.getTransposed(res));
             }
-            return Promise.all(permissions.map(g => this.getApplicationPermission(g.id)));
-        })
-            .then((res) => {
-            logger.log(this.getTransposed(res));
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            },
-            {
-                option: '-i, --appId [appId]'
-            },
-            {
-                option: '-n, --appDisplayName [appDisplayName]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_SpoSiteAppPermissionListCommand_instances = new WeakSet(), _SpoSiteAppPermissionListCommand_initTelemetry = function _SpoSiteAppPermissionListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            appId: typeof args.options.appId !== 'undefined'
+        });
+    });
+}, _SpoSiteAppPermissionListCommand_initOptions = function _SpoSiteAppPermissionListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --appId [appId]'
+    }, {
+        option: '-n, --appDisplayName [appDisplayName]'
+    });
+}, _SpoSiteAppPermissionListCommand_initValidators = function _SpoSiteAppPermissionListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && args.options.appDisplayName) {
             return `Provide either appId or appDisplayName, not both`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-}
+    }));
+};
 module.exports = new SpoSiteAppPermissionListCommand();
 //# sourceMappingURL=site-apppermission-list.js.map

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -1,4 +1,19 @@
 "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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCommand_initTelemetry, _SpoSiteAppPermissionRemoveCommand_initOptions, _SpoSiteAppPermissionRemoveCommand_initValidators, _SpoSiteAppPermissionRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -7,8 +22,13 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpoSiteAppPermissionRemoveCommand_instances.add(this);
         this.siteId = '';
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_REMOVE;
@@ -16,14 +36,6 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes an application permission from the site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appDisplayName = typeof args.options.appDisplayName !== 'undefined';
-        telemetryProps.permissionId = typeof args.options.permissionId !== 'undefined';
-        telemetryProps.confirm = (!!args.options.confirm).toString();
-        return telemetryProps;
-    }
     getSpoSiteId(args) {
         const url = new URL(args.options.siteUrl);
         const requestOptions = {
@@ -59,8 +71,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         });
     }
     getPermissionIds(args) {
-        if (args.options.permissionId) {
-            return Promise.resolve([args.options.permissionId]);
+        if (args.options.id) {
+            return Promise.resolve([args.options.id]);
         }
         return this
             .getPermissions()
@@ -82,80 +94,70 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         };
         return request_1.default.delete(spRequestOptions);
     }
-    commandAction(logger, args, cb) {
-        const removeSiteAppPermission = () => {
-            this
-                .getSpoSiteId(args)
-                .then((siteId) => {
-                this.siteId = siteId;
-                return this.getPermissionIds(args);
-            })
-                .then((permissionIdsToRemove) => {
-                const tasks = [];
-                for (const permissionId of permissionIdsToRemove) {
-                    tasks.push(this.removePermissions(permissionId));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.siteId = yield this.getSpoSiteId(args);
+                    const permissionIdsToRemove = yield this.getPermissionIds(args);
+                    const tasks = [];
+                    for (const permissionId of permissionIdsToRemove) {
+                        tasks.push(this.removePermissions(permissionId));
+                    }
+                    const res = yield Promise.all(tasks);
+                    logger.log(res);
                 }
-                return Promise.all(tasks);
-            })
-                .then((res) => {
-                logger.log(res);
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeSiteAppPermission();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeSiteAppPermission();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            },
-            {
-                option: '-i, --permissionId [permissionId]'
-            },
-            {
-                option: '--appId [appId]'
-            },
-            {
-                option: '-n, --appDisplayName [appDisplayName]'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeSiteAppPermission();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
+                });
+                if (result.continue) {
+                    yield removeSiteAppPermission();
+                }
+            }
+        });
     }
-    validate(args) {
-        if (!args.options.appId && !args.options.appDisplayName && !args.options.permissionId) {
-            return `Specify appId, appDisplayName, or permissionId. One is required`;
-        }
-        if ((args.options.appId && args.options.appDisplayName) ||
-            (args.options.appId && args.options.permissionId) ||
-            (args.options.permissionId && args.options.appDisplayName)) {
-            return 'Use either appId, appDisplayName, or permissionId, but not multiple';
-        }
+}
+_SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermissionRemoveCommand_initTelemetry = function _SpoSiteAppPermissionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            confirm: (!!args.options.confirm).toString()
+        });
+    });
+}, _SpoSiteAppPermissionRemoveCommand_initOptions = function _SpoSiteAppPermissionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '--appId [appId]'
+    }, {
+        option: '-n, --appDisplayName [appDisplayName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteAppPermissionRemoveCommand_initValidators = function _SpoSiteAppPermissionRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-}
+    }));
+}, _SpoSiteAppPermissionRemoveCommand_initOptionSets = function _SpoSiteAppPermissionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName', 'id']);
+};
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map

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

@@ -1,4 +1,19 @@
 "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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators, _SpoSiteAppPermissionSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -6,8 +21,14 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpoSiteAppPermissionSetCommand_instances.add(this);
         this.siteId = '';
+        this.roles = ['read', 'write', 'manage', 'fullcontrol'];
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_SET;
@@ -15,13 +36,6 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates a specific application permission for a site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.permissionId = typeof args.options.permissionId !== 'undefined';
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appDisplayName = typeof args.options.appDisplayName !== 'undefined';
-        return telemetryProps;
-    }
     getSpoSiteId(args) {
         const url = new URL(args.options.siteUrl);
         const siteRequestOptions = {
@@ -45,8 +59,8 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         return permissions.filter((p) => p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue));
     }
     getPermission(args) {
-        if (args.options.permissionId) {
-            return Promise.resolve(args.options.permissionId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const permissionRequestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -68,68 +82,65 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
             return Promise.resolve(sitePermissionItems[0].id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getSpoSiteId(args)
-            .then((siteId) => {
-            this.siteId = siteId;
-            return this.getPermission(args);
-        })
-            .then((sitePermissionId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    roles: args.options.permission.split(',')
-                },
-                responseType: 'json'
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --siteUrl <siteUrl>'
-            },
-            {
-                option: '-i, --permissionId [permissionId]'
-            },
-            {
-                option: '--appId [appId]'
-            },
-            {
-                option: '-n, --appDisplayName [appDisplayName]'
-            },
-            {
-                option: '-p, --permission <permission>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.siteId = yield this.getSpoSiteId(args);
+                const sitePermissionId = yield this.getPermission(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        roles: [args.options.permission]
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.patch(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!args.options.permissionId && !args.options.appId && !args.options.appDisplayName) {
-            return `Specify permissionId, appId or appDisplayName, one is required`;
-        }
+}
+_SpoSiteAppPermissionSetCommand_instances = new WeakSet(), _SpoSiteAppPermissionSetCommand_initTelemetry = function _SpoSiteAppPermissionSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            appId: typeof args.options.appId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            permissions: args.options.permissions
+        });
+    });
+}, _SpoSiteAppPermissionSetCommand_initOptions = function _SpoSiteAppPermissionSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '--appId [appId]'
+    }, {
+        option: '-n, --appDisplayName [appDisplayName]'
+    }, {
+        option: '-p, --permission <permission>',
+        autocomplete: this.roles
+    });
+}, _SpoSiteAppPermissionSetCommand_initValidators = function _SpoSiteAppPermissionSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        const permissions = args.options.permission.split(',');
-        for (let i = 0; i < permissions.length; i++) {
-            if (['read', 'write'].indexOf(permissions[i]) === -1) {
-                return `${permissions[i]} is not a valid permission value. Allowed values are read|write|read,write`;
-            }
+        if (this.roles.indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are ${this.roles.join('|')}`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-}
+    }));
+}, _SpoSiteAppPermissionSetCommand_initOptionSets = function _SpoSiteAppPermissionSetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'appId', 'appDisplayName']);
+};
 module.exports = new SpoSiteAppPermissionSetCommand();
 //# sourceMappingURL=site-apppermission-set.js.map