@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

package/dist/m365/aad/commands/o365group/o365group-renew.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupRenewCommand_instances, _AadO365GroupRenewCommand_initOptions, _AadO365GroupRenewCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRenewCommand extends GraphCommand_1.default {
@@ -32,19 +32,24 @@ class AadO365GroupRenewCommand extends GraphCommand_1.default {
     get description() {
         return `Renews Microsoft 365 group's expiration`;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_initOptions = function _AadO365GroupRenewCommand_initOptions() {
@@ -53,7 +58,7 @@ _AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_i
     });
 }, _AadO365GroupRenewCommand_initValidators = function _AadO365GroupRenewCommand_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/aad/commands/o365group/o365group-set.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupSetCommand extends GraphCommand_1.default {
@@ -35,129 +35,111 @@ class AadO365GroupSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates Microsoft 365 Group properties';
     }
-    commandAction(logger, args, cb) {
-        (() => {
-            if (!args.options.displayName &&
-                !args.options.description &&
-                typeof args.options.isPrivate === 'undefined') {
-                return Promise.resolve();
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
-            }
-            const update = {};
-            if (args.options.displayName) {
-                update.displayName = args.options.displayName;
-            }
-            if (args.options.description) {
-                update.description = args.options.description;
-            }
-            if (typeof args.options.isPrivate !== 'undefined') {
-                update.visibility = args.options.isPrivate === 'true' ? 'Private' : 'Public';
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: update
-            };
-            return request_1.default.patch(requestOptions);
-        })()
-            .then(() => {
-            if (!args.options.logoPath) {
-                if (this.debug) {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.displayName || args.options.description || typeof args.options.isPrivate !== 'undefined') {
+                    if (this.verbose) {
+                        logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+                    }
+                    const update = {};
+                    if (args.options.displayName) {
+                        update.displayName = args.options.displayName;
+                    }
+                    if (args.options.description) {
+                        update.description = args.options.description;
+                    }
+                    if (typeof args.options.isPrivate !== 'undefined') {
+                        update.visibility = args.options.isPrivate === 'true' ? 'Private' : 'Public';
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                        headers: {
+                            'accept': 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json',
+                        data: update
+                    };
+                    yield request_1.default.patch(requestOptions);
+                }
+                if (args.options.logoPath) {
+                    const fullPath = path.resolve(args.options.logoPath);
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting group logo ${fullPath}...`);
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
+                        headers: {
+                            'content-type': this.getImageContentType(fullPath)
+                        },
+                        data: fs.readFileSync(fullPath)
+                    };
+                    yield new Promise((resolve, reject) => {
+                        this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, resolve, reject, logger);
+                    });
+                }
+                else if (this.debug) {
                     logger.logToStderr('logoPath not set. Skipping');
                 }
-                return Promise.resolve();
-            }
-            const fullPath = path.resolve(args.options.logoPath);
-            if (this.verbose) {
-                logger.logToStderr(`Setting group logo ${fullPath}...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
-                headers: {
-                    'content-type': this.getImageContentType(fullPath)
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return new Promise((resolve, reject) => {
-                this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, resolve, reject, logger);
-            });
-        })
-            .then(() => {
-            if (!args.options.owners) {
-                if (this.debug) {
+                if (args.options.owners) {
+                    const owners = args.options.owners.split(',').map(o => o.trim());
+                    if (this.verbose) {
+                        logger.logToStderr('Retrieving user information to set group owners...');
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    yield Promise.all(res.value.map(u => request_1.default.post({
+                        url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                        }
+                    })));
+                }
+                else if (this.debug) {
                     logger.logToStderr('Owners not set. Skipping');
                 }
-                return Promise.resolve(undefined);
-            }
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group owners...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
-            }
-            return Promise.all(res.value.map(u => request_1.default.post({
-                url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                if (args.options.members) {
+                    const members = args.options.members.split(',').map(o => o.trim());
+                    if (this.verbose) {
+                        logger.logToStderr('Retrieving user information to set group members...');
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    yield Promise.all(res.value.map(u => request_1.default.post({
+                        url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                        }
+                    })));
                 }
-            })));
-        })
-            .then(() => {
-            if (!args.options.members) {
-                if (this.debug) {
+                else if (this.debug) {
                     logger.logToStderr('Members not set. Skipping');
                 }
-                return Promise.resolve(undefined);
-            }
-            const members = args.options.members.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group members...');
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
-                url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
-                }
-            })));
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
         request_1.default
@@ -229,7 +211,7 @@ _AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initT
             !args.options.logoPath) {
             return 'Specify at least one property to update';
         }
-        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.owners) {

package/dist/m365/aad/commands/o365group/o365group-teamify.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators, _AadO365GroupTeamifyCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
@@ -58,35 +58,38 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
             return Promise.resolve(groupItem.id);
         });
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            "memberSettings": {
-                "allowCreatePrivateChannels": true,
-                "allowCreateUpdateChannels": true
-            },
-            "messagingSettings": {
-                "allowUserEditMessages": true,
-                "allowUserDeleteMessages": true
-            },
-            "funSettings": {
-                "allowGiphy": true,
-                "giphyContentRating": "strict"
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = {
+                    "memberSettings": {
+                        "allowCreatePrivateChannels": true,
+                        "allowCreateUpdateChannels": true
+                    },
+                    "messagingSettings": {
+                        "allowUserEditMessages": true,
+                        "allowUserDeleteMessages": true
+                    },
+                    "funSettings": {
+                        "allowGiphy": true,
+                        "giphyContentRating": "strict"
+                    }
+                };
+                const groupId = yield this.getGroupId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                yield request_1.default.put(requestOptions);
             }
-        };
-        this
-            .getGroupId(args)
-            .then((groupId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.put(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
@@ -104,7 +107,7 @@ _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyComma
     });
 }, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-user-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupUserAddCommand_instances, _AadO365GroupUserAddCommand_initTelemetry, _AadO365GroupUserAddCommand_initOptions, _AadO365GroupUserAddCommand_initValidators, _AadO365GroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -38,30 +38,33 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_ADD];
     }
-    commandAction(logger, args, cb) {
-        const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.userName)}/id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const endpoint = `${this.resource}/v1.0/groups/${providedGroupId}/${((typeof args.options.role !== 'undefined') ? args.options.role : '').toLowerCase() === 'owner' ? 'owners' : 'members'}/$ref`;
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + res.value }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+                let requestOptions = {
+                    url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.userName)}/id`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const endpoint = `${this.resource}/v1.0/groups/${providedGroupId}/${((typeof args.options.role !== 'undefined') ? args.options.role : '').toLowerCase() === 'owner' ? 'owners' : 'members'}/$ref`;
+                requestOptions = {
+                    url: endpoint,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + res.value }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddCommand_initTelemetry = function _AadO365GroupUserAddCommand_initTelemetry() {
@@ -85,10 +88,10 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
     });
 }, _AadO365GroupUserAddCommand_initValidators = function _AadO365GroupUserAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {

package/dist/m365/aad/commands/o365group/o365group-user-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupUserListCommand_instances, _AadO365GroupUserListCommand_initTelemetry, _AadO365GroupUserListCommand_initOptions, _AadO365GroupUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupUserListCommand extends GraphCommand_1.default {
@@ -32,29 +33,27 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     get description() {
         return "Lists users for the specified Microsoft 365 group";
     }
-    commandAction(logger, args, cb) {
-        let users = [];
-        this
-            .getOwners(logger, args.options.groupId)
-            .then((owners) => {
-            users = owners;
-            if (args.options.role === 'Owner') {
-                return Promise.resolve([]);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let users = yield this.getOwners(logger, args.options.groupId);
+                if (args.options.role !== 'Owner') {
+                    const membersAndGuests = yield this.getMembersAndGuests(logger, args.options.groupId);
+                    users = users.concat(membersAndGuests);
+                }
+                if (args.options.role) {
+                    users = users.filter(i => i.userType === args.options.role);
+                }
+                logger.log(users);
             }
-            return this.getMembersAndGuests(logger, args.options.groupId);
-        })
-            .then((membersAndGuests) => {
-            users = users.concat(membersAndGuests);
-            if (args.options.role) {
-                users = users.filter(i => i.userType === args.options.role);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(users);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(endpoint)
             .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
@@ -67,7 +66,7 @@ class AadO365GroupUserListCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint);
+        return odata_1.odata.getAllItems(endpoint);
     }
 }
 _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCommand_initTelemetry = function _AadO365GroupUserListCommand_initTelemetry() {
@@ -85,7 +84,7 @@ _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCom
     });
 }, _AadO365GroupUserListCommand_initValidators = function _AadO365GroupUserListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (!validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {