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

package/dist/m365/commands/login.js

@@ -34,77 +34,80 @@ class LoginCommand extends Command_1.default {
     get description() {
         return 'Log in to Microsoft 365';
     }
-    commandAction(logger, args, cb) {
-        // disconnect before re-connecting
-        if (this.debug) {
-            logger.logToStderr(`Logging out from Microsoft 365...`);
-        }
-        const logout = () => Auth_1.default.service.logout();
-        const login = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Signing in to Microsoft 365...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // disconnect before re-connecting
+            if (this.debug) {
+                logger.logToStderr(`Logging out from Microsoft 365...`);
             }
-            Auth_1.default.service.appId = args.options.appId || config_1.default.cliAadAppId;
-            Auth_1.default.service.tenant = args.options.tenant || config_1.default.tenant;
-            switch (args.options.authType) {
-                case 'password':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Password;
-                    Auth_1.default.service.userName = args.options.userName;
-                    Auth_1.default.service.password = args.options.password;
-                    break;
-                case 'certificate':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Certificate;
-                    Auth_1.default.service.certificate = args.options.certificateBase64Encoded ? args.options.certificateBase64Encoded : fs.readFileSync(args.options.certificateFile, 'base64');
-                    Auth_1.default.service.thumbprint = args.options.thumbprint;
-                    Auth_1.default.service.password = args.options.password;
-                    break;
-                case 'identity':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Identity;
-                    Auth_1.default.service.userName = args.options.userName;
-                    break;
-                case 'browser':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Browser;
-                    break;
-                case 'secret':
-                    Auth_1.default.service.authType = Auth_1.AuthType.Secret;
-                    Auth_1.default.service.secret = args.options.secret;
-                    break;
+            const logout = () => Auth_1.default.service.logout();
+            const login = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Signing in to Microsoft 365...`);
+                }
+                Auth_1.default.service.appId = args.options.appId || config_1.default.cliAadAppId;
+                Auth_1.default.service.tenant = args.options.tenant || config_1.default.tenant;
+                switch (args.options.authType) {
+                    case 'password':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Password;
+                        Auth_1.default.service.userName = args.options.userName;
+                        Auth_1.default.service.password = args.options.password;
+                        break;
+                    case 'certificate':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Certificate;
+                        Auth_1.default.service.certificate = args.options.certificateBase64Encoded ? args.options.certificateBase64Encoded : fs.readFileSync(args.options.certificateFile, 'base64');
+                        Auth_1.default.service.thumbprint = args.options.thumbprint;
+                        Auth_1.default.service.password = args.options.password;
+                        break;
+                    case 'identity':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Identity;
+                        Auth_1.default.service.userName = args.options.userName;
+                        break;
+                    case 'browser':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Browser;
+                        break;
+                    case 'secret':
+                        Auth_1.default.service.authType = Auth_1.AuthType.Secret;
+                        Auth_1.default.service.secret = args.options.secret;
+                        break;
+                }
+                try {
+                    yield Auth_1.default.ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug);
+                    Auth_1.default.service.connected = true;
+                }
+                catch (error) {
+                    if (this.debug) {
+                        logger.logToStderr('Error:');
+                        logger.logToStderr(error);
+                        logger.logToStderr('');
+                    }
+                    throw new Command_1.CommandError(error.message);
+                }
+            });
+            try {
+                yield Auth_1.default.clearConnectionInfo();
             }
-            Auth_1.default
-                .ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug)
-                .then(() => {
-                Auth_1.default.service.connected = true;
-                cb();
-            }, (rej) => {
+            catch (error) {
                 if (this.debug) {
-                    logger.logToStderr('Error:');
-                    logger.logToStderr(rej);
-                    logger.logToStderr('');
+                    logger.logToStderr(new Command_1.CommandError(error));
                 }
-                cb(new Command_1.CommandError(rej.message));
-            });
-        };
-        Auth_1.default
-            .clearConnectionInfo()
-            .then(() => {
-            logout();
-            login();
-        }, (error) => {
-            if (this.debug) {
-                logger.logToStderr(new Command_1.CommandError(error));
             }
-            logout();
-            login();
+            finally {
+                logout();
+                yield login();
+            }
         });
     }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
             this.initAction(args, logger);
-            this.commandAction(logger, args, cb);
-        }, (error) => {
-            cb(new Command_1.CommandError(error));
+            yield this.commandAction(logger, args);
         });
     }
 }

package/dist/m365/commands/logout.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
@@ -10,33 +19,35 @@ class LogoutCommand extends Command_1.default {
     get description() {
         return 'Log out from Microsoft 365';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr('Logging out from Microsoft 365...');
-        }
-        const logout = () => {
-            Auth_1.default.service.logout();
-            cb();
-        };
-        Auth_1.default
-            .clearConnectionInfo()
-            .then(() => {
-            logout();
-        }, (error) => {
-            if (this.debug) {
-                logger.logToStderr(new Command_1.CommandError(error));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Logging out from Microsoft 365...');
+            }
+            const logout = () => Auth_1.default.service.logout();
+            try {
+                yield Auth_1.default.clearConnectionInfo();
+            }
+            catch (error) {
+                if (this.debug) {
+                    logger.logToStderr(new Command_1.CommandError(error));
+                }
+            }
+            finally {
+                logout();
             }
-            logout();
         });
     }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
             this.initAction(args, logger);
-            this.commandAction(logger, args, cb);
-        }, (error) => {
-            cb(new Command_1.CommandError(error));
+            this.commandAction(logger);
         });
     }
 }

package/dist/m365/commands/request.js

@@ -38,68 +38,65 @@ class RequestCommand extends Command_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        if (this.debug) {
-            logger.logToStderr(`Preparing request...`);
-        }
-        const method = (args.options.method || 'get').toUpperCase();
-        const headers = {};
-        const unknownOptions = this.getUnknownOptions(args.options);
-        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-        unknownOptionsNames.forEach(o => {
-            headers[o] = unknownOptions[o];
-        });
-        if (!headers.accept) {
-            headers.accept = 'application/json';
-        }
-        if (args.options.resource) {
-            headers['x-resource'] = args.options.resource;
-        }
-        const config = {
-            url: args.options.url,
-            headers,
-            method,
-            data: args.options.body
-        };
-        if (headers.accept.toString().startsWith('application/json')) {
-            config.responseType = 'json';
-        }
-        if (args.options.filePath) {
-            config.responseType = 'stream';
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Executing request...`);
-        }
-        if (args.options.filePath) {
-            request_1.default
-                .execute(config)
-                .then((file) => {
-                return new Promise((resolve, reject) => {
-                    const writer = fs.createWriteStream(args.options.filePath);
-                    file.data.pipe(writer);
-                    writer.on('error', err => {
-                        reject(err);
-                    });
-                    writer.on('close', () => {
-                        resolve(args.options.filePath);
-                    });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.debug) {
+                logger.logToStderr(`Preparing request...`);
+            }
+            try {
+                const method = (args.options.method || 'get').toUpperCase();
+                const headers = {};
+                const unknownOptions = this.getUnknownOptions(args.options);
+                const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
+                unknownOptionsNames.forEach(o => {
+                    headers[o] = unknownOptions[o];
                 });
-            })
-                .then((file) => {
+                if (!headers.accept) {
+                    headers.accept = 'application/json';
+                }
+                if (args.options.resource) {
+                    headers['x-resource'] = args.options.resource;
+                }
+                const config = {
+                    url: args.options.url,
+                    headers,
+                    method,
+                    data: args.options.body
+                };
+                if (headers.accept.toString().startsWith('application/json')) {
+                    config.responseType = 'json';
+                }
+                if (args.options.filePath) {
+                    config.responseType = 'stream';
+                }
                 if (this.verbose) {
-                    logger.logToStderr(`File saved to path ${file}`);
+                    logger.logToStderr(`Executing request...`);
                 }
-                cb();
-            }, (err) => this.handleError(err, logger, cb));
-        }
-        else {
-            request_1.default
-                .execute(config)
-                .then(response => {
-                logger.log(response);
-                cb();
-            }, (rawRes) => this.handleError(rawRes, logger, cb));
-        }
+                if (args.options.filePath) {
+                    const file = yield request_1.default.execute(config);
+                    const filePath = yield new Promise((resolve, reject) => {
+                        const writer = fs.createWriteStream(args.options.filePath);
+                        file.data.pipe(writer);
+                        writer.on('error', err => {
+                            reject(err);
+                        });
+                        writer.on('close', () => {
+                            resolve(args.options.filePath);
+                        });
+                    });
+                    if (this.verbose) {
+                        logger.logToStderr(`File saved to path ${filePath}`);
+                    }
+                }
+                else {
+                    const res = yield request_1.default.execute(config);
+                    logger.log(res);
+                }
+            }
+            catch (err) {
+                this.handleError(err);
+            }
+        });
     }
 }
 _RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {

package/dist/m365/commands/status.js

@@ -1,8 +1,17 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
-const utils_1 = require("../../utils");
+const accessToken_1 = require("../../utils/accessToken");
 const commands_1 = require("./commands");
 class StatusCommand extends Command_1.default {
     get name() {
@@ -11,39 +20,57 @@ class StatusCommand extends Command_1.default {
     get description() {
         return 'Shows Microsoft 365 login status';
     }
-    commandAction(logger, args, cb) {
-        if (Auth_1.default.service.connected) {
-            if (this.debug) {
-                logger.logToStderr({
-                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
-                    authType: Auth_1.AuthType[Auth_1.default.service.authType],
-                    accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
-                });
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (Auth_1.default.service.connected) {
+                try {
+                    yield Auth_1.default.ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug);
+                }
+                catch (err) {
+                    if (this.debug) {
+                        logger.logToStderr(err);
+                    }
+                    Auth_1.default.service.logout();
+                    throw new Command_1.CommandError(`Your login has expired. Sign in again to continue. ${err.message}`);
+                }
+                if (this.debug) {
+                    logger.logToStderr({
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
+                        accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
+                    });
+                }
+                else {
+                    logger.log({
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant
+                    });
+                }
             }
             else {
-                logger.log({
-                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
-                });
+                if (this.verbose) {
+                    logger.logToStderr('Logged out from Microsoft 365');
+                }
+                else {
+                    logger.log('Logged out');
+                }
             }
-        }
-        else {
-            if (this.verbose) {
-                logger.logToStderr('Logged out from Microsoft 365');
+        });
+    }
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
             }
-            else {
-                logger.log('Logged out');
+            catch (error) {
+                throw new Command_1.CommandError(error);
             }
-        }
-        cb();
-    }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
             this.initAction(args, logger);
-            this.commandAction(logger, args, cb);
-        }, (error) => {
-            cb(new Command_1.CommandError(error));
+            yield this.commandAction(logger);
         });
     }
 }

package/dist/m365/commands/version.js

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const AnonymousCommand_1 = require("../base/AnonymousCommand");
 const commands_1 = require("./commands");
@@ -10,9 +19,10 @@ class VersionCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Shows CLI for Microsoft 365 version';
     }
-    commandAction(logger, args, cb) {
-        logger.log(`v${packageJSON.version}`);
-        cb();
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            logger.log(`v${packageJSON.version}`);
+        });
     }
 }
 module.exports = new VersionCommand();

package/dist/m365/file/commands/convert/convert-pdf.js

@@ -38,67 +38,72 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
     get description() {
         return 'Converts the specified file to PDF using Microsoft Graph';
     }
-    commandAction(logger, args, cb) {
-        let sourceFileUrl = '';
-        // path to the local file that contains the PDF-converted source file
-        let localTargetFilePath = args.options.targetFile;
-        let sourceIsLocalFile = true;
-        let targetIsLocalFile = true;
-        let error;
-        const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
-        if (typeof isAppOnlyAuth === 'undefined') {
-            return cb(new Command_1.CommandError('Unable to determine authentication type'));
-        }
-        if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
-            sourceIsLocalFile = false;
-        }
-        if (args.options.targetFile.toLowerCase().startsWith('https://')) {
-            localTargetFilePath = path.join(os.tmpdir(), (0, uuid_1.v4)());
-            targetIsLocalFile = false;
-            if (this.debug) {
-                logger.logToStderr(`Target set to a URL. Will store the temporary converted file at ${localTargetFilePath}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let sourceFileUrl = '';
+            // path to the local file that contains the PDF-converted source file
+            let localTargetFilePath = args.options.targetFile;
+            let sourceIsLocalFile = true;
+            let targetIsLocalFile = true;
+            let error;
+            const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+            if (typeof isAppOnlyAuth === 'undefined') {
+                throw 'Unable to determine authentication type';
             }
-        }
-        this
-            .getSourceFileUrl(logger, args, isAppOnlyAuth)
-            .then((_sourceFileUrl) => {
-            sourceFileUrl = _sourceFileUrl;
-            return this.getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl);
-        })
-            .then((graphFileUrl) => this.convertFile(logger, graphFileUrl))
-            .then(fileResponse => this.writeFileToDisk(logger, fileResponse, localTargetFilePath))
-            .then(_ => this.uploadConvertedFileIfNecessary(logger, targetIsLocalFile, localTargetFilePath, args.options.targetFile))
-            .then(_ => this.deleteRemoteSourceFileIfNecessary(logger, sourceIsLocalFile, sourceFileUrl), 
-        // catch the error from any of the previous promises so that we can
-        // clean up resources in case something went wrong
-        // if this.deleteRemoteSourceFileIfNecessary fails, it won't be caught
-        // here, but rather at the end
-        err => error = err)
-            .then(_ => {
-            // if the target was a remote file, delete the local temp file
-            if (!targetIsLocalFile) {
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting the temporary PDF file at ${localTargetFilePath}...`);
+            if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
+                sourceIsLocalFile = false;
+            }
+            if (args.options.targetFile.toLowerCase().startsWith('https://')) {
+                localTargetFilePath = path.join(os.tmpdir(), (0, uuid_1.v4)());
+                targetIsLocalFile = false;
+                if (this.debug) {
+                    logger.logToStderr(`Target set to a URL. Will store the temporary converted file at ${localTargetFilePath}`);
                 }
+            }
+            try {
                 try {
-                    fs.unlinkSync(localTargetFilePath);
+                    sourceFileUrl = yield this.getSourceFileUrl(logger, args, isAppOnlyAuth);
+                    const graphFileUrl = yield this.getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl);
+                    const fileResponse = yield this.convertFile(logger, graphFileUrl);
+                    yield this.writeFileToDisk(logger, fileResponse, localTargetFilePath);
+                    yield this.uploadConvertedFileIfNecessary(logger, targetIsLocalFile, localTargetFilePath, args.options.targetFile);
                 }
-                catch (e) {
-                    return cb(e);
+                catch (err) {
+                    // catch the error from any of the previous promises so that we can
+                    // clean up resources in case something went wrong
+                    // if this.deleteRemoteSourceFileIfNecessary fails, it won't be caught
+                    // here, but rather at the end
+                    error = err;
                 }
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr(`Target is a local path. Not deleting`);
+                yield this.deleteRemoteSourceFileIfNecessary(logger, sourceIsLocalFile, sourceFileUrl);
+                // if the target was a remote file, delete the local temp file
+                if (!targetIsLocalFile) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Deleting the temporary PDF file at ${localTargetFilePath}...`);
+                    }
+                    try {
+                        fs.unlinkSync(localTargetFilePath);
+                    }
+                    catch (e) {
+                        throw e;
+                    }
+                }
+                else {
+                    if (this.debug) {
+                        logger.logToStderr(`Target is a local path. Not deleting`);
+                    }
+                }
+                if (error) {
+                    this.handleRejectedODataJsonPromise(error);
                 }
             }
-            if (error) {
-                this.handleRejectedODataJsonPromise(error, logger, cb);
-            }
-            else {
-                cb();
+            catch (err) {
+                if (err instanceof Command_1.CommandError) {
+                    throw err;
+                }
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     /**
      * Returns web URL of the file to convert to PDF. If the user specified a URL