@pnp/cli-microsoft365 6.0.0-beta.f782445 → 6.0.0-beta.fcd2cc9

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((id) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(id)}/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.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !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-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) {

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_initTelemetry, _AadO365GroupUserRemoveCommand_initOptions, _AadO365GroupUserRemoveCommand_initValidators, _AadO365GroupUserRemoveCommand_initOptionSets;
 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -39,79 +39,76 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_REMOVE];
     }
-    commandAction(logger, args, cb) {
-        const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-        const removeUser = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                // retrieve user
-                const user = yield request_1.default.get({
-                    url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.userName)}/id`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                });
-                // used to verify if the group exists or not
-                yield request_1.default.get({
-                    url: `${this.resource}/v1.0/groups/${groupId}/id`,
-                    headers: {
-                        'accept': 'application/json;odata.metadata=none'
-                    }
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const removeUser = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    // try to delete the user from the owners. Accepted error is 404
-                    yield request_1.default.delete({
-                        url: `${this.resource}/v1.0/groups/${groupId}/owners/${user.value}/$ref`,
+                    // retrieve user
+                    const user = yield request_1.default.get({
+                        url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.userName)}/id`,
                         headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
                     });
-                }
-                catch (err) {
-                    // the 404 error is accepted
-                    if (err.response.status !== 404) {
-                        throw err.response.data;
-                    }
-                }
-                // try to delete the user from the members. Accepted error is 404
-                try {
-                    yield request_1.default.delete({
-                        url: `${this.resource}/v1.0/groups/${groupId}/members/${user.value}/$ref`,
+                    // used to verify if the group exists or not
+                    yield request_1.default.get({
+                        url: `${this.resource}/v1.0/groups/${groupId}/id`,
                         headers: {
                             'accept': 'application/json;odata.metadata=none'
                         }
                     });
+                    try {
+                        // try to delete the user from the owners. Accepted error is 404
+                        yield request_1.default.delete({
+                            url: `${this.resource}/v1.0/groups/${groupId}/owners/${user.value}/$ref`,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            }
+                        });
+                    }
+                    catch (err) {
+                        // the 404 error is accepted
+                        if (err.response.status !== 404) {
+                            throw err.response.data;
+                        }
+                    }
+                    // try to delete the user from the members. Accepted error is 404
+                    try {
+                        yield request_1.default.delete({
+                            url: `${this.resource}/v1.0/groups/${groupId}/members/${user.value}/$ref`,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            }
+                        });
+                    }
+                    catch (err) {
+                        // the 404 error is accepted
+                        if (err.response.status !== 404) {
+                            throw err.response.data;
+                        }
+                    }
                 }
                 catch (err) {
-                    // the 404 error is accepted
-                    if (err.response.status !== 404) {
-                        throw err.response.data;
-                    }
+                    this.handleRejectedODataJsonPromise(err);
                 }
-                cb();
+            });
+            if (args.options.confirm) {
+                yield removeUser();
             }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err, logger, cb);
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?`
+                });
+                if (result.continue) {
+                    yield removeUser();
+                }
             }
         });
-        if (args.options.confirm) {
-            removeUser();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeUser();
-                }
-            });
-        }
     }
 }
 _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemoveCommand_initTelemetry = function _AadO365GroupUserRemoveCommand_initTelemetry() {
@@ -134,10 +131,10 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
     });
 }, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_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`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-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("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -38,76 +39,75 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_SET];
     }
-    commandAction(logger, args, cb) {
-        const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-        let users = [];
-        this
-            .getOwners(logger, groupId)
-            .then((owners) => {
-            users = owners;
-            return this.getMembersAndGuests(logger, groupId);
-        })
-            .then((membersAndGuests) => {
-            users = users.concat(membersAndGuests);
-            // Filter out duplicate added values for owners (as they are returned as members as well)
-            users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
-            if (this.debug) {
-                logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
-                logger.logToStderr(users);
-                logger.logToStderr('');
-            }
-            if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
-                const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
-                    'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
-                throw new Error(userNotInGroup);
-            }
-            if (args.options.role === "Owner") {
-                const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
-                if (foundMember !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json',
-                        data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + foundMember.id }
-                    };
-                    return request_1.default.post(requestOptions);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+                let users = yield this.getOwners(logger, groupId);
+                const membersAndGuests = yield this.getMembersAndGuests(logger, groupId);
+                users = users.concat(membersAndGuests);
+                // Filter out duplicate added values for owners (as they are returned as members as well)
+                users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
+                if (this.debug) {
+                    logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
+                    logger.logToStderr(users);
+                    logger.logToStderr('');
                 }
-                else {
-                    const userAlreadyOwner = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already an owner in the specified Microsoft 365 group, and thus cannot be promoted.' :
-                        'The specified user is already an owner in the specified Microsoft Teams team, and thus cannot be promoted.';
-                    throw new Error(userAlreadyOwner);
+                if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
+                    const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
+                        'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
+                        'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
+                    throw new Error(userNotInGroup);
                 }
-            }
-            else {
-                const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
-                if (foundOwner !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    };
-                    return request_1.default.delete(requestOptions);
+                if (args.options.role === "Owner") {
+                    const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
+                    if (foundMember !== undefined) {
+                        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
+                        const requestOptions = {
+                            url: endpoint,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json',
+                            data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + foundMember.id }
+                        };
+                        yield request_1.default.post(requestOptions);
+                    }
+                    else {
+                        const userAlreadyOwner = (typeof args.options.groupId !== 'undefined') ?
+                            'The specified user is already an owner in the specified Microsoft 365 group, and thus cannot be promoted.' :
+                            'The specified user is already an owner in the specified Microsoft Teams team, and thus cannot be promoted.';
+                        throw new Error(userAlreadyOwner);
+                    }
                 }
                 else {
-                    const userAlreadyMember = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already a member in the specified Microsoft 365 group, and thus cannot be demoted.' :
-                        'The specified user is already a member in the specified Microsoft Teams team, and thus cannot be demoted.';
-                    throw new Error(userAlreadyMember);
+                    const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
+                    if (foundOwner !== undefined) {
+                        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
+                        const requestOptions = {
+                            url: endpoint,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            }
+                        };
+                        yield request_1.default.delete(requestOptions);
+                    }
+                    else {
+                        const userAlreadyMember = (typeof args.options.groupId !== 'undefined') ?
+                            'The specified user is already a member in the specified Microsoft 365 group, and thus cannot be demoted.' :
+                            'The specified user is already a member in the specified Microsoft Teams team, and thus cannot be demoted.';
+                        throw new Error(userAlreadyMember);
+                    }
                 }
             }
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     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
@@ -120,7 +120,7 @@ class AadO365GroupUserSetCommand 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);
     }
 }
 _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {
@@ -144,10 +144,10 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
     });
 }, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_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 (['Owner', 'Member'].indexOf(args.options.role) === -1) {