@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

package/dist/m365/spo/commands/web/web-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebSetCommand_instances, _SpoWebSetCommand_initTelemetry, _SpoWebSetCommand_initOptions, _SpoWebSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebSetCommand extends SpoCommand_1.default {
@@ -33,52 +33,57 @@ class SpoWebSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates subsite properties';
     }
-    commandAction(logger, args, cb) {
-        const payload = {};
-        this.addUnknownOptionsToPayload(payload, args.options);
-        if (args.options.title) {
-            payload.Title = args.options.title;
-        }
-        if (args.options.description) {
-            payload.Description = args.options.description;
-        }
-        if (typeof args.options.siteLogoUrl !== 'undefined') {
-            payload.SiteLogoUrl = args.options.siteLogoUrl;
-        }
-        if (typeof args.options.quickLaunchEnabled !== 'undefined') {
-            payload.QuickLaunchEnabled = args.options.quickLaunchEnabled === 'true';
-        }
-        if (typeof args.options.headerEmphasis !== 'undefined') {
-            payload.HeaderEmphasis = args.options.headerEmphasis;
-        }
-        if (typeof args.options.headerLayout !== 'undefined') {
-            payload.HeaderLayout = args.options.headerLayout === 'standard' ? 1 : 2;
-        }
-        if (typeof args.options.megaMenuEnabled !== 'undefined') {
-            payload.MegaMenuEnabled = args.options.megaMenuEnabled === 'true';
-        }
-        if (typeof args.options.footerEnabled !== 'undefined') {
-            payload.FooterEnabled = args.options.footerEnabled === 'true';
-        }
-        if (typeof args.options.searchScope !== 'undefined') {
-            const searchScope = args.options.searchScope.toLowerCase();
-            payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: payload
-        };
-        if (this.verbose) {
-            logger.logToStderr(`Updating properties of subsite ${args.options.webUrl}...`);
-        }
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = {};
+            this.addUnknownOptionsToPayload(payload, args.options);
+            if (args.options.title) {
+                payload.Title = args.options.title;
+            }
+            if (args.options.description) {
+                payload.Description = args.options.description;
+            }
+            if (typeof args.options.siteLogoUrl !== 'undefined') {
+                payload.SiteLogoUrl = args.options.siteLogoUrl;
+            }
+            if (typeof args.options.quickLaunchEnabled !== 'undefined') {
+                payload.QuickLaunchEnabled = args.options.quickLaunchEnabled === 'true';
+            }
+            if (typeof args.options.headerEmphasis !== 'undefined') {
+                payload.HeaderEmphasis = args.options.headerEmphasis;
+            }
+            if (typeof args.options.headerLayout !== 'undefined') {
+                payload.HeaderLayout = args.options.headerLayout === 'standard' ? 1 : 2;
+            }
+            if (typeof args.options.megaMenuEnabled !== 'undefined') {
+                payload.MegaMenuEnabled = args.options.megaMenuEnabled === 'true';
+            }
+            if (typeof args.options.footerEnabled !== 'undefined') {
+                payload.FooterEnabled = args.options.footerEnabled === 'true';
+            }
+            if (typeof args.options.searchScope !== 'undefined') {
+                const searchScope = args.options.searchScope.toLowerCase();
+                payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
+            }
+            const requestOptions = {
+                url: `${args.options.url}/_api/web`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: payload
+            };
+            if (this.verbose) {
+                logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
+            }
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     allowUnknownOptions() {
         return true;
@@ -101,7 +106,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initOptions = function _SpoWebSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -128,7 +133,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands.js

@@ -28,6 +28,7 @@ exports.default = {
     CONTENTTYPE_GET: `${prefix} contenttype get`,
     CONTENTTYPE_LIST: `${prefix} contenttype list`,
     CONTENTTYPE_REMOVE: `${prefix} contenttype remove`,
+    CONTENTTYPE_SET: `${prefix} contenttype set`,
     CONTENTTYPEHUB_GET: `${prefix} contenttypehub get`,
     CUSTOMACTION_ADD: `${prefix} customaction add`,
     CUSTOMACTION_CLEAR: `${prefix} customaction clear`,
@@ -37,6 +38,7 @@ exports.default = {
     CUSTOMACTION_REMOVE: `${prefix} customaction remove`,
     EVENTRECEIVER_GET: `${prefix} eventreceiver get`,
     EVENTRECEIVER_LIST: `${prefix} eventreceiver list`,
+    EVENTRECEIVER_REMOVE: `${prefix} eventreceiver remove`,
     EXTERNALUSER_LIST: `${prefix} externaluser list`,
     FEATURE_DISABLE: `${prefix} feature disable`,
     FEATURE_ENABLE: `${prefix} feature enable`,
@@ -55,7 +57,16 @@ exports.default = {
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
     FILE_RENAME: `${prefix} file rename`,
+    FILE_ROLEASSIGNMENT_ADD: `${prefix} file roleassignment add`,
+    FILE_ROLEASSIGNMENT_REMOVE: `${prefix} file roleassignment remove`,
+    FILE_ROLEINHERITANCE_BREAK: `${prefix} file roleinheritance break`,
+    FILE_ROLEINHERITANCE_RESET: `${prefix} file roleinheritance reset`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
+    FILE_VERSION_CLEAR: `${prefix} file version clear`,
+    FILE_VERSION_GET: `${prefix} file version get`,
+    FILE_VERSION_LIST: `${prefix} file version list`,
+    FILE_VERSION_REMOVE: `${prefix} file version remove`,
+    FILE_VERSION_RESTORE: `${prefix} file version restore`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,
     FOLDER_GET: `${prefix} folder get`,
@@ -63,15 +74,19 @@ exports.default = {
     FOLDER_MOVE: `${prefix} folder move`,
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
+    FOLDER_ROLEASSIGNMENT_REMOVE: `${prefix} folder roleassignment remove`,
+    FOLDER_ROLEASSIGNMENT_ADD: `${prefix} folder roleassignment add`,
+    FOLDER_ROLEINHERITANCE_BREAK: `${prefix} folder roleinheritance break`,
+    FOLDER_ROLEINHERITANCE_RESET: `${prefix} folder roleinheritance reset`,
     GET: `${prefix} get`,
     GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_REMOVE: `${prefix} group user remove`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_REMOVE: `${prefix} group member remove`,
     HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
     HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
     HOMESITE_GET: `${prefix} homesite get`,
@@ -86,7 +101,6 @@ exports.default = {
     HUBSITE_RIGHTS_GRANT: `${prefix} hubsite rights grant`,
     HUBSITE_RIGHTS_REVOKE: `${prefix} hubsite rights revoke`,
     HUBSITE_SET: `${prefix} hubsite set`,
-    HUBSITE_THEME_SYNC: `${prefix} hubsite theme sync`,
     HUBSITE_UNREGISTER: `${prefix} hubsite unregister`,
     KNOWLEDGEHUB_GET: `${prefix} knowledgehub get`,
     KNOWLEDGEHUB_REMOVE: `${prefix} knowledgehub remove`,
@@ -101,6 +115,8 @@ exports.default = {
     LIST_LABEL_SET: `${prefix} list label set`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
+    LIST_ROLEASSIGNMENT_REMOVE: `${prefix} list roleassignment remove`,
+    LIST_ROLEASSIGNMENT_ADD: `${prefix} list roleassignment add`,
     LIST_ROLEINHERITANCE_BREAK: `${prefix} list roleinheritance break`,
     LIST_ROLEINHERITANCE_RESET: `${prefix} list roleinheritance reset`,
     LIST_SET: `${prefix} list set`,
@@ -120,12 +136,15 @@ exports.default = {
     LIST_WEBHOOK_SET: `${prefix} list webhook set`,
     LISTITEM_ADD: `${prefix} listitem add`,
     LISTITEM_ATTACHMENT_LIST: `${prefix} listitem attachment list`,
+    LISTITEM_BATCH_ADD: `${prefix} listitem batch add`,
     LISTITEM_GET: `${prefix} listitem get`,
     LISTITEM_ISRECORD: `${prefix} listitem isrecord`,
     LISTITEM_LIST: `${prefix} listitem list`,
     LISTITEM_RECORD_DECLARE: `${prefix} listitem record declare`,
     LISTITEM_RECORD_UNDECLARE: `${prefix} listitem record undeclare`,
     LISTITEM_REMOVE: `${prefix} listitem remove`,
+    LISTITEM_ROLEASSIGNMENT_ADD: `${prefix} listitem roleassignment add`,
+    LISTITEM_ROLEASSIGNMENT_REMOVE: `${prefix} listitem roleassignment remove`,
     LISTITEM_ROLEINHERITANCE_BREAK: `${prefix} listitem roleinheritance break`,
     LISTITEM_ROLEINHERITANCE_RESET: `${prefix} listitem roleinheritance reset`,
     LISTITEM_SET: `${prefix} listitem set`,
@@ -170,6 +189,7 @@ exports.default = {
     REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
+    ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
@@ -194,6 +214,9 @@ exports.default = {
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
     SITE_GROUPIFY: `${prefix} site groupify`,
+    SITE_HUBSITE_CONNECT: `${prefix} site hubsite connect`,
+    SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
+    SITE_HUBSITE_THEME_SYNC: `${prefix} site hubsite theme sync`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
@@ -265,6 +288,10 @@ exports.default = {
     WEB_LIST: `${prefix} web list`,
     WEB_REINDEX: `${prefix} web reindex`,
     WEB_REMOVE: `${prefix} web remove`,
+    WEB_ROLEASSIGNMENT_REMOVE: `${prefix} web roleassignment remove`,
+    WEB_ROLEASSIGNMENT_ADD: `${prefix} web roleassignment add`,
+    WEB_ROLEINHERITANCE_BREAK: `${prefix} web roleinheritance break`,
+    WEB_ROLEINHERITANCE_RESET: `${prefix} web roleinheritance reset`,
     WEB_SET: `${prefix} web set`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/teams/commands/Meeting.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Meeting.js.map

package/dist/m365/teams/commands/app/app-install.js

@@ -13,11 +13,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators;
+var _TeamsAppInstallCommand_instances, _TeamsAppInstallCommand_initTelemetry, _TeamsAppInstallCommand_initOptions, _TeamsAppInstallCommand_initValidators, _TeamsAppInstallCommand_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 formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -28,6 +29,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsAppInstallCommand_instances, "m", _TeamsAppInstallCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_INSTALL;
@@ -35,32 +37,35 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
     get description() {
         return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
-    commandAction(logger, args, cb) {
-        this
-            .validateUser(args, logger)
-            .then(_ => {
-            var _a;
-            let url = `${this.resource}/v1.0`;
-            if (args.options.teamId) {
-                url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.validateUser(args, logger);
+                let url = `${this.resource}/v1.0`;
+                if (args.options.teamId) {
+                    url += `/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
+                }
+                else {
+                    url += `/users/${formatting_1.formatting.encodeQueryParameter(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+                }
+                const requestOptions = {
+                    url: url,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
+                    }
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else {
-                url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: url,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        });
     }
     // we need this method, because passing an invalid user ID to the API
     // won't cause an error
@@ -77,7 +82,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
             debug: args.options.debug,
             verbose: args.options.verbose
         };
-        return cli_1.Cli
+        return Cli_1.Cli
             .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
             .then((res) => {
             if (this.verbose) {
@@ -101,32 +106,24 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--appId <appId>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        if (!args.options.teamId &&
-            !args.options.userId &&
-            !args.options.userName) {
-            return `Specify either teamId, userId or userName`;
-        }
-        if ((args.options.teamId && args.options.userId) ||
-            (args.options.teamId && args.options.userName) ||
-            (args.options.userId && args.options.userName)) {
-            return `Specify either teamId, userId or userName but not multiple`;
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.teamId &&
-            !utils_1.validation.isValidGuid(args.options.teamId)) {
+            !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         if (args.options.userId &&
-            !utils_1.validation.isValidGuid(args.options.userId)) {
+            !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
+    this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
 };
 module.exports = new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

package/dist/m365/teams/commands/app/app-list.js

@@ -15,8 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsAppListCommand_instances, _TeamsAppListCommand_initTelemetry, _TeamsAppListCommand_initOptions, _TeamsAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
-const aadGroup_1 = require("../../../../utils/aadGroup");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppListCommand extends GraphCommand_1.default {
@@ -31,91 +30,47 @@ class TeamsAppListCommand extends GraphCommand_1.default {
         return commands_1.default.APP_LIST;
     }
     get description() {
-        return 'Lists apps from the Microsoft Teams app catalog or apps installed in the specified team';
+        return 'Lists apps from the Microsoft Teams app catalog';
     }
     defaultProperties() {
         return ['id', 'displayName', 'distributionMethod'];
     }
-    getTeamId(args) {
-        if (args.options.teamId) {
-            return Promise.resolve(args.options.teamId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.teamName)
-            .then(group => {
-            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            return group.id;
-        });
-    }
-    getEndpointUrl(args) {
-        return new Promise((resolve, reject) => {
-            if (args.options.teamId || args.options.teamName) {
-                this
-                    .getTeamId(args)
-                    .then((teamId) => {
-                    let endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/installedApps?$expand=teamsApp`;
-                    if (!args.options.all) {
-                        endpoint += `&$filter=teamsApp/distributionMethod eq 'organization'`;
-                    }
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
-            }
-            else {
-                let endpoint = `${this.resource}/v1.0/appCatalogs/teamsApps`;
-                if (!args.options.all) {
-                    endpoint += `?$filter=distributionMethod eq 'organization'`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${this.resource}/v1.0/appCatalogs/teamsApps`;
+                if (args.options.distributionMethod) {
+                    requestUrl += `?$filter=distributionMethod eq '${args.options.distributionMethod}'`;
                 }
-                return resolve(endpoint);
+                const items = yield odata_1.odata.getAllItems(requestUrl);
+                logger.log(items);
             }
-        });
-    }
-    commandAction(logger, args, cb) {
-        this
-            .getEndpointUrl(args)
-            .then(endpoint => utils_1.odata.getAllItems(endpoint))
-            .then((items) => {
-            if (args.options.teamId || args.options.teamName) {
-                items.forEach(t => {
-                    t.displayName = t.teamsApp.displayName;
-                    t.distributionMethod = t.teamsApp.distributionMethod;
-                });
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            all: args.options.all || false,
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined'
+            distributionMethod: args.options.distributionMethod || false
         });
     });
 }, _TeamsAppListCommand_initOptions = function _TeamsAppListCommand_initOptions() {
     this.options.unshift({
-        option: '-a, --all'
-    }, {
-        option: '-i, --teamId [teamId]'
-    }, {
-        option: '-t --teamName [teamName]'
+        option: '--distributionMethod [distributionMethod]',
+        autocomplete: TeamsAppListCommand.allowedDistributionMethods
     });
 }, _TeamsAppListCommand_initValidators = function _TeamsAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
+        if (args.options.distributionMethod &&
+            TeamsAppListCommand.allowedDistributionMethods.indexOf(args.options.distributionMethod) < 0) {
+            return `'${args.options.distributionMethod}' is not a valid distributionMethod. Allowed distribution methods are: ${TeamsAppListCommand.allowedDistributionMethods.join(', ')}`;
         }
         return true;
     }));
 };
+TeamsAppListCommand.allowedDistributionMethods = ['store', 'organization', 'sideloaded'];
 module.exports = new TeamsAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/teams/commands/app/app-publish.js

@@ -33,27 +33,29 @@ class TeamsAppPublishCommand extends GraphCommand_1.default {
     get description() {
         return 'Publishes Teams app to the organization\'s app catalog';
     }
-    commandAction(logger, args, cb) {
-        const fullPath = path.resolve(args.options.filePath);
-        if (this.verbose) {
-            logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
-            headers: {
-                "content-type": "application/zip",
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: fs.readFileSync(fullPath)
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            if (res && res.id) {
-                logger.log(res.id);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const fullPath = path.resolve(args.options.filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding app '${fullPath}' to app catalog...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps`,
+                    headers: {
+                        'content-type': 'application/zip',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: fs.readFileSync(fullPath)
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        });
     }
 }
 _TeamsAppPublishCommand_instances = new WeakSet(), _TeamsAppPublishCommand_initOptions = function _TeamsAppPublishCommand_initOptions() {

package/dist/m365/teams/commands/app/app-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsAppRemoveCommand_instances, _TeamsAppRemoveCommand_initTelemetry, _TeamsAppRemoveCommand_initOptions, _TeamsAppRemoveCommand_initValidators;
 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("../../commands");
 class TeamsAppRemoveCommand extends GraphCommand_1.default {
@@ -34,37 +34,38 @@ class TeamsAppRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes a Teams app from the organization\'s app catalog';
     }
-    commandAction(logger, args, cb) {
-        const { id: appId } = args.options;
-        const removeApp = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id: appId } = args.options;
+            const removeApp = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Teams app ${appId} from the app catalog?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeApp();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Teams app ${appId} from the app catalog?`
+                });
+                if (result.continue) {
+                    yield removeApp();
+                }
+            }
+        });
     }
 }
 _TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTelemetry = function _TeamsAppRemoveCommand_initTelemetry() {
@@ -81,7 +82,7 @@ _TeamsAppRemoveCommand_instances = new WeakSet(), _TeamsAppRemoveCommand_initTel
     });
 }, _TeamsAppRemoveCommand_initValidators = function _TeamsAppRemoveCommand_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;