@pnp/cli-microsoft365 6.2.0-beta.329fd79 → 6.2.0-beta.647e291

package/dist/m365/spo/commands/file/file-sharinglink-remove.js

@@ -0,0 +1,135 @@
+"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 _SpoFileSharingLinkRemoveCommand_instances, _SpoFileSharingLinkRemoveCommand_initTelemetry, _SpoFileSharingLinkRemoveCommand_initOptions, _SpoFileSharingLinkRemoveCommand_initValidators, _SpoFileSharingLinkRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoFileSharingLinkRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_SHARINGLINK_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific sharing link of a file';
+    }
+    constructor() {
+        super();
+        _SpoFileSharingLinkRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSharingLink = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing sharing link of file ${args.options.fileUrl || args.options.fileId} with id ${args.options.id}...`);
+                    }
+                    const fileDetails = yield this.getNeededFileInformation(args);
+                    const requestOptions = {
+                        url: `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions/${args.options.id}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield removeSharingLink();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove sharing link ${args.options.id} of file ${args.options.fileUrl || args.options.fileId}?`
+                });
+                if (result.continue) {
+                    yield removeSharingLink();
+                }
+            }
+        });
+    }
+    getNeededFileInformation(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.fileUrl) {
+                const fileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
+            }
+            else {
+                requestUrl += `GetFileById('${args.options.fileId}')`;
+            }
+            requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return res;
+        });
+    }
+}
+_SpoFileSharingLinkRemoveCommand_instances = new WeakSet(), _SpoFileSharingLinkRemoveCommand_initTelemetry = function _SpoFileSharingLinkRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileSharingLinkRemoveCommand_initOptions = function _SpoFileSharingLinkRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: '--fileId [fileId]'
+    }, {
+        option: '-i, --id <id>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileSharingLinkRemoveCommand_initValidators = function _SpoFileSharingLinkRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileSharingLinkRemoveCommand_initOptionSets = function _SpoFileSharingLinkRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
+};
+module.exports = new SpoFileSharingLinkRemoveCommand();
+//# sourceMappingURL=file-sharinglink-remove.js.map

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.js

@@ -0,0 +1,138 @@
+"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 _SpoFolderRetentionLabelEnsureCommand_instances, _SpoFolderRetentionLabelEnsureCommand_initTelemetry, _SpoFolderRetentionLabelEnsureCommand_initOptions, _SpoFolderRetentionLabelEnsureCommand_initValidators, _SpoFolderRetentionLabelEnsureCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoListItemRetentionLabelEnsureCommand = require("../listitem/listitem-retentionlabel-ensure");
+const SpoListRetentionLabelEnsureCommand = require("../list/list-retentionlabel-ensure");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+class SpoFolderRetentionLabelEnsureCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FOLDER_RETENTIONLABEL_ENSURE;
+    }
+    get description() {
+        return 'Apply a retention label to a folder';
+    }
+    constructor() {
+        super();
+        _SpoFolderRetentionLabelEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelEnsureCommand_instances, "m", _SpoFolderRetentionLabelEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelEnsureCommand_instances, "m", _SpoFolderRetentionLabelEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelEnsureCommand_instances, "m", _SpoFolderRetentionLabelEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelEnsureCommand_instances, "m", _SpoFolderRetentionLabelEnsureCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const folderProperties = yield this.getFolderProperties(logger, args);
+                if (folderProperties.ListItemAllFields) {
+                    const options = {
+                        webUrl: args.options.webUrl,
+                        listId: folderProperties.ListItemAllFields.ParentList.Id,
+                        listItemId: folderProperties.ListItemAllFields.Id,
+                        name: args.options.name,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    const spoListItemRetentionLabelEnsureCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoListItemRetentionLabelEnsureCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    if (this.verbose) {
+                        logger.logToStderr(spoListItemRetentionLabelEnsureCommandOutput.stderr);
+                    }
+                }
+                else {
+                    const options = {
+                        webUrl: args.options.webUrl,
+                        listUrl: folderProperties.ServerRelativeUrl,
+                        name: args.options.name,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    const spoListRetentionLabelEnsureCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoListRetentionLabelEnsureCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    if (this.verbose) {
+                        logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getFolderProperties(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list and item information for folder '${args.options.folderId || args.options.folderUrl}' in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.folderId) {
+                requestUrl += `GetFolderById('${args.options.folderId}')`;
+            }
+            else {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            }
+            const requestOptions = {
+                url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return yield request_1.default.get(requestOptions);
+        });
+    }
+}
+_SpoFolderRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFolderRetentionLabelEnsureCommand_initTelemetry = function _SpoFolderRetentionLabelEnsureCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            folderId: typeof args.options.folderId !== 'undefined'
+        });
+    });
+}, _SpoFolderRetentionLabelEnsureCommand_initOptions = function _SpoFolderRetentionLabelEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--name <name>'
+    }, {
+        option: '--folderUrl [folderUrl]'
+    }, {
+        option: 'i, --folderId [folderId]'
+    });
+}, _SpoFolderRetentionLabelEnsureCommand_initValidators = function _SpoFolderRetentionLabelEnsureCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId &&
+            !validation_1.validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFolderRetentionLabelEnsureCommand_initOptionSets = function _SpoFolderRetentionLabelEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderUrl', 'folderId'] });
+};
+module.exports = new SpoFolderRetentionLabelEnsureCommand();
+//# sourceMappingURL=folder-retentionlabel-ensure.js.map

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -0,0 +1,157 @@
+"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 _SpoFolderRetentionLabelRemoveCommand_instances, _SpoFolderRetentionLabelRemoveCommand_initTelemetry, _SpoFolderRetentionLabelRemoveCommand_initOptions, _SpoFolderRetentionLabelRemoveCommand_initValidators, _SpoFolderRetentionLabelRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoListItemRetentionLabelRemoveCommand = require("../listitem/listitem-retentionlabel-remove");
+const SpoListRetentionLabelRemoveCommand = require("../list/list-retentionlabel-remove");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FOLDER_RETENTIONLABEL_REMOVE;
+    }
+    get description() {
+        return 'Clear the retention label from a folder';
+    }
+    constructor() {
+        super();
+        _SpoFolderRetentionLabelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeFolderRetentionLabel(logger, args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the retentionlabel from folder ${args.options.folderId || args.options.folderUrl} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield this.removeFolderRetentionLabel(logger, args);
+                }
+            }
+        });
+    }
+    removeFolderRetentionLabel(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const folderProperties = yield this.getFolderProperties(logger, args);
+                if (folderProperties.ListItemAllFields) {
+                    const options = {
+                        webUrl: args.options.webUrl,
+                        listId: folderProperties.ListItemAllFields.ParentList.Id,
+                        listItemId: folderProperties.ListItemAllFields.Id,
+                        confirm: true,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    const spoListItemRetentionLabelRemoveCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoListItemRetentionLabelRemoveCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    if (this.verbose) {
+                        logger.logToStderr(spoListItemRetentionLabelRemoveCommandOutput.stderr);
+                    }
+                }
+                else {
+                    const options = {
+                        webUrl: args.options.webUrl,
+                        listUrl: folderProperties.ServerRelativeUrl,
+                        confirm: true,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    const spoListRetentionLabelEnsureCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoListRetentionLabelRemoveCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    if (this.verbose) {
+                        logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getFolderProperties(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list and item information for folder '${args.options.folderId || args.options.folderUrl}' in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.folderId) {
+                requestUrl += `GetFolderById('${args.options.folderId}')`;
+            }
+            else {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            }
+            const requestOptions = {
+                url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return yield request_1.default.get(requestOptions);
+        });
+    }
+}
+_SpoFolderRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFolderRetentionLabelRemoveCommand_initTelemetry = function _SpoFolderRetentionLabelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            folderId: typeof args.options.folderId !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFolderRetentionLabelRemoveCommand_initOptions = function _SpoFolderRetentionLabelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--folderUrl [folderUrl]'
+    }, {
+        option: '-i, --folderId [folderId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFolderRetentionLabelRemoveCommand_initValidators = function _SpoFolderRetentionLabelRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId &&
+            !validation_1.validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFolderRetentionLabelRemoveCommand_initOptionSets = function _SpoFolderRetentionLabelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderUrl', 'folderId'] });
+};
+module.exports = new SpoFolderRetentionLabelRemoveCommand();
+//# sourceMappingURL=folder-retentionlabel-remove.js.map

package/dist/m365/spo/commands/group/group-member-add.js

@@ -20,6 +20,7 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const AadGroupGetCommand = require("../../../aad/commands/group/group-get");
 const SpoUserGetCommand = require("../user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -47,7 +48,7 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
                 const groupId = yield this.getGroupId(args, logger);
                 const resolvedUsernameList = yield this.getValidUsers(args, logger);
                 if (this.verbose) {
-                    logger.logToStderr(`Adding user(s) to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+                    logger.logToStderr(`Adding user(s) to SharePoint Group ${args.options.groupId || args.options.groupName}`);
                 }
                 const data = {
                     url: args.options.webUrl,
@@ -104,15 +105,19 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
         }
         const validUserNames = [];
         const invalidUserNames = [];
-        const userIdentifiers = args.options.userName || args.options.email || args.options.userId.toString();
+        const userIdentifiers = args.options.userName || args.options.email || args.options.aadGroupId || args.options.aadGroupName || args.options.userId.toString();
         return Promise
             .all(userIdentifiers.split(',').map((userIdentifier) => __awaiter(this, void 0, void 0, function* () {
+            const user = userIdentifier.trim();
             try {
                 if (args.options.userId) {
-                    yield this.spoUserGet(args.options, userIdentifier.trim(), logger, validUserNames);
+                    yield this.spoUserGet(args.options, user, logger, validUserNames);
+                }
+                else if (args.options.aadGroupId || args.options.aadGroupName) {
+                    yield this.aadGroupGet(args.options, user, logger, validUserNames);
                 }
                 else {
-                    yield this.aadUserGet(args.options, userIdentifier.trim(), logger, validUserNames);
+                    yield this.aadUserGet(args.options, user, logger, validUserNames);
                 }
             }
             catch (err) {
@@ -141,6 +146,19 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             validUserNames.push(JSON.parse(aadUserGetOutput.stdout).userPrincipalName);
         });
     }
+    aadGroupGet(options, userIdentifier, logger, validUserNames) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Get UPN from Azure AD for group ${userIdentifier}`);
+            }
+            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.aadGroupId && { id: userIdentifier })), (options.aadGroupName && { title: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
+            const aadGroupGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadGroupGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
+            if (this.debug) {
+                logger.logToStderr(aadGroupGetOutput.stderr);
+            }
+            validUserNames.push(JSON.parse(aadGroupGetOutput.stdout).mail);
+        });
+    }
     spoUserGet(options, userIdentifier, logger, validUserNames) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -174,7 +192,9 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
             groupName: typeof args.options.groupName !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
             email: typeof args.options.email !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined'
+            userId: typeof args.options.userId !== 'undefined',
+            aadGroupId: typeof args.options.aadGroupId !== 'undefined',
+            aadGroupName: typeof args.options.aadGroupName !== 'undefined'
         });
     });
 }, _SpoGroupMemberAddCommand_initOptions = function _SpoGroupMemberAddCommand_initOptions() {
@@ -190,6 +210,10 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         option: '--email [email]'
     }, {
         option: '--userId [userId]'
+    }, {
+        option: '--aadGroupId [aadGroupId]'
+    }, {
+        option: '--aadGroupName [aadGroupName]'
     });
 }, _SpoGroupMemberAddCommand_initValidators = function _SpoGroupMemberAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -210,10 +234,13 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         if (args.options.email && args.options.email.split(',').some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
             return `${args.options.email} contains one or more invalid email addresses`;
         }
+        if (args.options.aadGroupId && args.options.aadGroupId.split(',').some(e => !validation_1.validation.isValidGuid(e))) {
+            return `${args.options.aadGroupId} contains one or more invalid GUIDs`;
+        }
         return true;
     }));
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userName', 'email', 'userId', 'aadGroupId', 'aadGroupName'] });
 };
 module.exports = new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map