@pnp/cli-microsoft365 6.0.0-beta.2979870 → 6.0.0-beta.3261c97

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

@@ -74,20 +74,23 @@ class TeamsAppListCommand extends GraphCommand_1.default {
             }
         });
     }
-    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;
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const endpoint = yield this.getEndpointUrl(args);
+                const items = yield utils_1.odata.getAllItems(endpoint);
+                if (args.options.teamId || args.options.teamName) {
+                    items.forEach(t => {
+                        t.displayName = t.teamsApp.displayName;
+                        t.distributionMethod = t.teamsApp.distributionMethod;
+                    });
+                }
+                logger.log(items);
             }
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsAppListCommand_instances = new WeakSet(), _TeamsAppListCommand_initTelemetry = function _TeamsAppListCommand_initTelemetry() {

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

@@ -33,27 +33,30 @@ 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* () {
+            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)
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                if (res && res.id) {
+                    logger.log(res.id);
+                }
+            }
+            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

@@ -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() {

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

@@ -34,36 +34,37 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
     get description() {
         return 'Uninstalls an app from a Microsoft Team team';
     }
-    commandAction(logger, args, cb) {
-        const uninstallApp = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.id}`,
+                    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) {
-            uninstallApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    uninstallApp();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield uninstallApp();
+            }
+            else {
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield uninstallApp();
+                }
+            }
+        });
     }
 }
 _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_initTelemetry = function _TeamsAppUninstallCommand_initTelemetry() {

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

@@ -36,25 +36,28 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates Teams app in the organization\'s app catalog';
     }
-    commandAction(logger, args, cb) {
-        const { filePath } = args.options;
-        this
-            .getAppId(args)
-            .then((appId) => {
-            const fullPath = path.resolve(filePath);
-            if (this.verbose) {
-                logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { filePath } = args.options;
+            try {
+                const appId = yield this.getAppId(args);
+                const fullPath = path.resolve(filePath);
+                if (this.verbose) {
+                    logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
+                    headers: {
+                        "content-type": "application/zip"
+                    },
+                    data: fs.readFileSync(fullPath)
+                };
+                yield request_1.default.put(requestOptions);
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
-                headers: {
-                    "content-type": "application/zip"
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return request_1.default.put(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppId(args) {
         if (args.options.id) {

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

@@ -34,41 +34,42 @@ class TeamsCacheRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the Microsoft Teams client cache';
     }
-    commandAction(logger, args, cb) {
-        if (args.options.confirm) {
-            this.clearTeamsCache(logger, cb);
-        }
-        else {
-            logger.logToStderr('This command will execute the following steps.');
-            logger.logToStderr('- Stop the Microsoft Teams client.');
-            logger.logToStderr('- Clear the Microsoft Teams cached files.');
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear your Microsoft Teams cache?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.confirm) {
+                    yield this.clearTeamsCache(logger);
                 }
                 else {
-                    this.clearTeamsCache(logger, cb);
+                    logger.logToStderr('This command will execute the following steps.');
+                    logger.logToStderr('- Stop the Microsoft Teams client.');
+                    logger.logToStderr('- Clear the Microsoft Teams cached files.');
+                    const result = yield cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to clear your Microsoft Teams cache?`
+                    });
+                    if (result.continue) {
+                        yield this.clearTeamsCache(logger);
+                    }
                 }
-            });
-        }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
-    clearTeamsCache(logger, cb) {
+    clearTeamsCache(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 yield this.killRunningProcess(logger);
                 yield this.removeCacheFiles(logger);
             }
             catch (e) {
-                cb(e.message);
-                return;
+                throw e.message;
             }
             logger.logToStderr('Teams cache cleared!');
-            cb();
         });
     }
     killRunningProcess(logger) {

package/dist/m365/teams/commands/channel/channel-add.js

@@ -85,14 +85,17 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         }
         return request_1.default.post(requestOptions);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => this.createChannel(args, teamId))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                const res = yield this.createChannel(args, teamId);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChannelAddCommand_instances = new WeakSet(), _TeamsChannelAddCommand_initTelemetry = function _TeamsChannelAddCommand_initTelemetry() {

package/dist/m365/teams/commands/channel/channel-get.js

@@ -73,34 +73,32 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
             return Promise.resolve(channelItem.id);
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            let url = '';
-            if (args.options.primary) {
-                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(args);
+                let url = '';
+                if (args.options.primary) {
+                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/primaryChannel`;
+                }
+                else {
+                    url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+                }
+                const requestOptions = {
+                    url: url,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
             }
-            else {
-                url = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(channelId)}`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: url,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initTelemetry = function _TeamsChannelGetCommand_initTelemetry() {

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

@@ -50,20 +50,21 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
-            if (args.options.type) {
-                endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+                if (args.options.type) {
+                    endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+                }
+                const items = yield utils_1.odata.getAllItems(endpoint);
+                logger.log(items);
             }
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChannelListCommand_instances = new WeakSet(), _TeamsChannelListCommand_initTelemetry = function _TeamsChannelListCommand_initTelemetry() {

package/dist/m365/teams/commands/channel/channel-member-add.js

@@ -36,29 +36,24 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds a conversation member in a private channel.';
     }
-    commandAction(logger, args, cb) {
-        let teamId = '';
-        let channelId = '';
-        this
-            .getTeamId(args)
-            .then((_teamId) => {
-            teamId = _teamId;
-            return this.getChannelId(_teamId, args);
-        })
-            .then((_channelId) => {
-            channelId = _channelId;
-            return this.getUserId(args);
-        })
-            .then((userIds) => {
-            const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
-            const roles = args.options.owner ? ["owner"] : [];
-            const tasks = [];
-            for (const userId of userIds) {
-                tasks.push(this.addUser(userId, endpoint, roles));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(teamId, args);
+                const userIds = yield this.getUserId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/channels/${encodeURIComponent(channelId)}/members`;
+                const roles = args.options.owner ? ["owner"] : [];
+                const tasks = [];
+                for (const userId of userIds) {
+                    tasks.push(this.addUser(userId, endpoint, roles));
+                }
+                yield Promise.all(tasks);
             }
-            return Promise.all(tasks);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     addUser(userId, endpoint, roles) {
         const requestOptions = {

package/dist/m365/teams/commands/channel/channel-member-list.js

@@ -39,30 +39,28 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
-    commandAction(logger, args, cb) {
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
-            const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((memberships) => {
-            if (args.options.role) {
-                if (args.options.role === 'member') {
-                    // Members have no role value
-                    memberships = memberships.filter(i => i.roles.length === 0);
-                }
-                else {
-                    memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.teamId = yield this.getTeamId(args);
+                const channelId = yield this.getChannelId(args);
+                const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
+                let memberships = yield utils_1.odata.getAllItems(endpoint);
+                if (args.options.role) {
+                    if (args.options.role === 'member') {
+                        // Members have no role value
+                        memberships = memberships.filter(i => i.roles.length === 0);
+                    }
+                    else {
+                        memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+                    }
                 }
+                logger.log(memberships);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(memberships);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getTeamId(args) {
         if (args.options.teamId) {

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -38,33 +38,34 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates the role of the specified member in the specified Microsoft Teams private team channel';
     }
-    commandAction(logger, args, cb) {
-        const removeMember = () => {
-            this
-                .removeMemberFromChannel(args)
-                .then(cb, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeMember();
-        }
-        else {
-            const userName = args.options.userName || args.options.userId || args.options.id;
-            const teamName = args.options.teamName || args.options.teamId;
-            const channelName = args.options.channelName || args.options.channelId;
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeMember = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.removeMemberFromChannel(args);
                 }
-                else {
-                    removeMember();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeMember();
+            }
+            else {
+                const userName = args.options.userName || args.options.userId || args.options.id;
+                const teamName = args.options.teamName || args.options.teamId;
+                const channelName = args.options.channelName || args.options.channelId;
+                const result = yield cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the member ${userName} from the channel ${channelName} in team ${teamName}?`
+                });
+                if (result.continue) {
+                    yield removeMember();
+                }
+            }
+        });
     }
     removeMemberFromChannel(args) {
         return this