@pnp/cli-microsoft365 5.0.0-beta.aff293c → 5.0.0-beta.c797165

package/dist/m365/aad/commands/sp/sp-add.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadSpAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SP_ADD;
+    }
+    get description() {
+        return 'Adds a service principal to a registered Azure AD app';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.appId = (!(!args.options.appId)).toString();
+        telemetryProps.appName = (!(!args.options.appName)).toString();
+        telemetryProps.objectId = (!(!args.options.objectId)).toString();
+        return telemetryProps;
+    }
+    getAppId(args) {
+        if (args.options.appId) {
+            return Promise.resolve(args.options.appId);
+        }
+        let spMatchQuery = '';
+        if (args.options.appName) {
+            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appName)}'`;
+        }
+        else if (args.options.objectId) {
+            spMatchQuery = `id eq '${encodeURIComponent(args.options.objectId)}'`;
+        }
+        const appIdRequestOptions = {
+            url: `${this.resource}/v1.0/applications?$filter=${spMatchQuery}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(appIdRequestOptions)
+            .then(response => {
+            const spItem = response.value[0];
+            if (!spItem) {
+                return Promise.reject(`The specified Azure AD app doesn't exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appName} found: ${response.value.map(x => x.appId)}`);
+            }
+            return Promise.resolve(spItem.appId);
+        });
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getAppId(args)
+            .then((appId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                data: {
+                    appId: appId
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        })
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '--appId [appId]'
+            },
+            {
+                option: '--appName [appName]'
+            },
+            {
+                option: '--objectId [objectId]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        let optionsSpecified = 0;
+        optionsSpecified += args.options.appId ? 1 : 0;
+        optionsSpecified += args.options.appName ? 1 : 0;
+        optionsSpecified += args.options.objectId ? 1 : 0;
+        if (optionsSpecified !== 1) {
+            return 'Specify either appId, appName, or objectId';
+        }
+        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid appId GUID`;
+        }
+        if (args.options.objectId && !Utils_1.default.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid objectId GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadSpAddCommand();
+//# sourceMappingURL=sp-add.js.map

package/dist/m365/aad/commands/sp/sp-get.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const Utils_1 = require("../../../../Utils");
-const AadCommand_1 = require("../../../base/AadCommand");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadSpGetCommand extends AadCommand_1.default {
+class AadSpGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.SP_GET;
     }
@@ -18,35 +18,58 @@ class AadSpGetCommand extends AadCommand_1.default {
         telemetryProps.objectId = (!(!args.options.objectId)).toString();
         return telemetryProps;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving service principal information...`);
+    getSpId(args) {
+        if (args.options.objectId) {
+            return Promise.resolve(args.options.objectId);
         }
         let spMatchQuery = '';
-        if (args.options.appId) {
-            spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
-        }
-        else if (args.options.objectId) {
-            spMatchQuery = `objectId eq '${encodeURIComponent(args.options.objectId)}'`;
-        }
-        else {
+        if (args.options.displayName) {
             spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
         }
-        const requestOptions = {
-            url: `${this.resource}/myorganization/servicePrincipals?api-version=1.6&$filter=${spMatchQuery}`,
+        else if (args.options.appId) {
+            spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
+        }
+        const idRequestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
             headers: {
-                accept: 'application/json;odata=nometadata'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                logger.log(res.value[0]);
+        return request_1.default
+            .get(idRequestOptions)
+            .then(response => {
+            const spItem = response.value[0];
+            if (!spItem) {
+                return Promise.reject(`The specified Azure AD app does not exist`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
             }
+            return Promise.resolve(spItem.id);
+        });
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving service principal information...`);
+        }
+        this
+            .getSpId(args)
+            .then((id) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals/${id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then((res) => {
+            logger.log(res);
             cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [

package/dist/m365/aad/commands/user/user-password-validate.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserPasswordValidateCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_PASSWORD_VALIDATE;
+    }
+    get description() {
+        return "Check a user's password against the organization's password validation policy";
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `${this.resource}/beta/users/validatePassword`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            data: {
+                password: args.options.password
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .post(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-p, --password <password>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new AadUserPasswordValidateCommand();
+//# sourceMappingURL=user-password-validate.js.map

package/dist/m365/aad/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'aad';
 exports.default = {
     APP_ADD: `${prefix} app add`,
+    APP_GET: `${prefix} app get`,
     APP_SET: `${prefix} app set`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_LIST: `${prefix} app role list`,
@@ -46,9 +47,11 @@ exports.default = {
     SITECLASSIFICATION_ENABLE: `${prefix} siteclassification enable`,
     SITECLASSIFICATION_GET: `${prefix} siteclassification get`,
     SITECLASSIFICATION_SET: `${prefix} siteclassification set`,
+    SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     USER_GET: `${prefix} user get`,
     USER_LIST: `${prefix} user list`,
+    USER_PASSWORD_VALIDATE: `${prefix} user password validate`,
     USER_SET: `${prefix} user set`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/base/M365RcJson.js

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

package/dist/m365/cli/commands/cli-doctor.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../Auth");
+const cli_1 = require("../../../cli");
 const Command_1 = require("../../../Command");
 const Utils_1 = require("../../../Utils");
 const commands_1 = require("../commands");
@@ -33,6 +34,7 @@ class CliDoctorCommand extends Command_1.default {
             cliAadAppTenant: Utils_1.default.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
             authMode: Auth_1.AuthType[Auth_1.default.service.authType],
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
+            cliConfig: cli_1.Cli.getInstance().config.all,
             roles: roles,
             scopes: scopes
         };

package/dist/m365/file/commands/file-add.js

@@ -20,7 +20,7 @@ class FileAddCommand extends GraphCommand_1.default {
             folderUrlWithoutTrailingSlash = folderUrlWithoutTrailingSlash.substr(0, folderUrlWithoutTrailingSlash.length - 1);
         }
         this
-            .getGraphFileUrl(logger, `${folderUrlWithoutTrailingSlash}/${path.basename(args.options.filePath)}`)
+            .getGraphFileUrl(logger, `${folderUrlWithoutTrailingSlash}/${path.basename(args.options.filePath)}`, args.options.siteUrl)
             .then(graphFileUrl => this.uploadFile(args.options.filePath, graphFileUrl))
             .then(_ => cb(), rawRes => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
@@ -80,20 +80,23 @@ class FileAddCommand extends GraphCommand_1.default {
      *
      * @param logger Logger instance
      * @param fileWebUrl Web URL of the file for which to get drive item URL
+     * @param siteUrl URL of the site to which upload the file. Optional. Specify to suppress lookup.
      * @returns Graph's drive item URL for the specified file
      */
-    getGraphFileUrl(logger, fileWebUrl) {
+    getGraphFileUrl(logger, fileWebUrl, siteUrl) {
         if (this.debug) {
             logger.logToStderr(`Resolving Graph drive item URL for ${fileWebUrl}`);
         }
-        const _url = url.parse(fileWebUrl);
+        const _fileWebUrl = url.parse(fileWebUrl);
+        const _siteUrl = url.parse(siteUrl || fileWebUrl);
+        const isSiteUrl = typeof siteUrl !== 'undefined';
         let siteId = '';
         let driveRelativeFileUrl = '';
         return this
-            .getGraphSiteInfoFromFullUrl(_url.host, _url.path)
+            .getGraphSiteInfoFromFullUrl(_siteUrl.host, _siteUrl.path, isSiteUrl)
             .then(siteInfo => {
             siteId = siteInfo.id;
-            let siteRelativeFileUrl = _url.path.replace(siteInfo.serverRelativeUrl, '');
+            let siteRelativeFileUrl = _fileWebUrl.path.replace(siteInfo.serverRelativeUrl, '');
             // normalize site-relative URLs for root site collections and root sites
             if (!siteRelativeFileUrl.startsWith('/')) {
                 siteRelativeFileUrl = '/' + siteRelativeFileUrl;
@@ -116,13 +119,14 @@ class FileAddCommand extends GraphCommand_1.default {
      * Automatically detects which path chunks correspond to (sub)site.
      * @param hostName SharePoint host name, eg. contoso.sharepoint.com
      * @param urlPath Server-relative file URL, eg. /sites/site/docs/file1.aspx
+     * @param isSiteUrl Set to true to indicate that the specified URL is a site URL
      * @returns ID and server-relative URL of the site denoted by urlPath
      */
-    getGraphSiteInfoFromFullUrl(hostName, urlPath) {
+    getGraphSiteInfoFromFullUrl(hostName, urlPath, isSiteUrl) {
         const siteId = '';
         const urlChunks = urlPath.split('/');
         return new Promise((resolve, reject) => {
-            this.getGraphSiteInfo(hostName, urlChunks, 0, siteId, resolve, reject);
+            this.getGraphSiteInfo(hostName, urlChunks, isSiteUrl ? urlChunks.length - 1 : 0, siteId, resolve, reject);
         });
     }
     /**
@@ -156,20 +160,28 @@ class FileAddCommand extends GraphCommand_1.default {
             },
             responseType: 'json'
         };
+        const getResult = (id, serverRelativeUrl) => {
+            return {
+                id,
+                serverRelativeUrl
+            };
+        };
         request_1.default
             .get(requestOptions)
             .then((res) => {
-            this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, res.id, resolve, reject);
+            if (currentChunk === urlChunks.length - 1) {
+                resolve(getResult(res.id, currentPath));
+            }
+            else {
+                this.getGraphSiteInfo(hostName, urlChunks, ++currentChunk, res.id, resolve, reject);
+            }
         }, err => {
             if (lastSiteId) {
                 let serverRelativeUrl = `${urlChunks.slice(0, currentChunk).join('/')}`;
                 if (!serverRelativeUrl.startsWith('/')) {
                     serverRelativeUrl = '/' + serverRelativeUrl;
                 }
-                resolve({
-                    id: lastSiteId,
-                    serverRelativeUrl: serverRelativeUrl
-                });
+                resolve(getResult(lastSiteId, serverRelativeUrl));
             }
             else {
                 reject(err);
@@ -206,7 +218,8 @@ class FileAddCommand extends GraphCommand_1.default {
     options() {
         const options = [
             { option: '-u, --folderUrl <folderUrl>' },
-            { option: '-p, --filePath <filePath>' }
+            { option: '-p, --filePath <filePath>' },
+            { option: '--siteUrl [siteUrl]' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
@@ -215,6 +228,12 @@ class FileAddCommand extends GraphCommand_1.default {
         if (!fs.existsSync(args.options.filePath)) {
             return `Specified source file ${args.options.sourceFile} doesn't exist`;
         }
+        if (args.options.siteUrl) {
+            const isValidSiteUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
+            if (isValidSiteUrl !== true) {
+                return isValidSiteUrl;
+            }
+        }
         return SpoCommand_1.default.isValidSharePointUrl(args.options.folderUrl);
     }
 }

package/dist/m365/file/commands/file-list.js

@@ -0,0 +1,181 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../request");
+const GraphItemsListCommand_1 = require("../../base/GraphItemsListCommand");
+const SpoCommand_1 = require("../../base/SpoCommand");
+const commands_1 = require("../commands");
+class FileListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    constructor() {
+        super(...arguments);
+        this.foldersToGetFilesFrom = [];
+    }
+    get name() {
+        return commands_1.default.LIST;
+    }
+    get description() {
+        return 'Retrieves files from the specified folder and site';
+    }
+    defaultProperties() {
+        return ['name', 'lastModifiedByUser'];
+    }
+    commandAction(logger, args, cb) {
+        let webUrl = args.options.webUrl;
+        if (!webUrl.endsWith('/')) {
+            webUrl += '/';
+        }
+        const folderUrl = new URL(args.options.folderUrl, webUrl);
+        let driveId = '';
+        this
+            .getSiteId(args.options.webUrl, logger)
+            .then((siteId) => this.getDocumentLibrary(siteId, folderUrl, args.options.folderUrl, logger))
+            .then((drive) => {
+            driveId = drive.id;
+            return this.getStartingFolderId(drive, folderUrl, logger);
+        })
+            .then((folderId) => {
+            if (this.verbose) {
+                logger.logToStderr(`Loading folders to get files from...`);
+            }
+            // add the starting folder to the list of folders to get files from
+            this.foldersToGetFilesFrom.push(folderId);
+            return this.loadFoldersToGetFilesFrom(folderId, driveId, args.options.recursive);
+        })
+            .then(_ => {
+            if (this.debug) {
+                logger.logToStderr(`Folders to get files from: ${this.foldersToGetFilesFrom.join(', ')}`);
+            }
+            return this.loadFilesFromFolders(driveId, this.foldersToGetFilesFrom, logger);
+        })
+            .then(_ => {
+            logger.log(this.items);
+            cb();
+        }, err => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getSiteId(webUrl, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting site id...`);
+        }
+        const url = new URL(webUrl);
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${encodeURIComponent(url.host)}:${url.pathname}?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((site) => {
+            if (this.verbose) {
+                logger.logToStderr(`Site id: ${site.id}`);
+            }
+            return site.id;
+        });
+    }
+    getDocumentLibrary(siteId, folderUrl, folderUrlFromUser, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting document library...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${siteId}/drives?$select=webUrl,id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((drives) => {
+            const lowerCaseFolderUrl = folderUrl.href.toLowerCase();
+            const drive = drives.value
+                .sort((a, b) => b.webUrl.localeCompare(a.webUrl))
+                .find((d) => {
+                const driveUrl = d.webUrl.toLowerCase();
+                // ensure that the drive url is a prefix of the folder url
+                return lowerCaseFolderUrl.startsWith(driveUrl) &&
+                    (driveUrl.length === lowerCaseFolderUrl.length ||
+                        lowerCaseFolderUrl[driveUrl.length] === '/');
+            });
+            if (!drive) {
+                return Promise.reject(`Document library '${folderUrlFromUser}' not found`);
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Document library: ${drive.webUrl}, ${drive.id}`);
+            }
+            return Promise.resolve(drive);
+        });
+    }
+    getStartingFolderId(documentLibrary, folderUrl, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Getting starting folder id...`);
+        }
+        const documentLibraryRelativeFolderUrl = folderUrl.href.replace(new RegExp(documentLibrary.webUrl, 'i'), '');
+        const requestOptions = {
+            url: `${this.resource}/v1.0/drives/${documentLibrary.id}/root${documentLibraryRelativeFolderUrl.length > 0 ? `:${documentLibraryRelativeFolderUrl}` : ''}?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((folder) => {
+            if (this.verbose) {
+                logger.logToStderr(`Starting folder id: ${folder.id}`);
+            }
+            return folder.id;
+        });
+    }
+    loadFoldersToGetFilesFrom(folderId, driveId, recursive) {
+        if (!recursive) {
+            return Promise.resolve();
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/drives/${driveId}/items('${folderId}')/children?$filter=folder ne null&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((subfolders) => {
+            const subfolderIds = subfolders.value.map((subfolder) => subfolder.id);
+            this.foldersToGetFilesFrom = this.foldersToGetFilesFrom.concat(subfolderIds);
+            return Promise
+                .all(subfolderIds.map((subfolderId) => this.loadFoldersToGetFilesFrom(subfolderId, driveId, recursive)))
+                .then(_ => Promise.resolve());
+        });
+    }
+    loadFilesFromFolders(driveId, folderIds, logger) {
+        if (this.verbose) {
+            logger.logToStderr(`Loading files from folders...`);
+        }
+        this.items = [];
+        return Promise
+            .all(folderIds.map((folderId) => 
+        // get items from folder. Because we can't filter out folders here
+        // we need to get all items from the folder and filter them out later
+        this.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`, logger, false)))
+            .then(_ => {
+            // remove folders from the list of files
+            this.items = this.items.filter((item) => item.file);
+            this.items.forEach(file => { var _a, _b; return file.lastModifiedByUser = (_b = (_a = file.lastModifiedBy) === null || _a === void 0 ? void 0 : _a.user) === null || _b === void 0 ? void 0 : _b.displayName; });
+            return Promise.resolve();
+        });
+    }
+    options() {
+        const options = [
+            { option: '-u, --webUrl <webUrl>' },
+            { option: '-f, --folderUrl <folderUrl>' },
+            { option: '--recursive' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new FileListCommand();
+//# sourceMappingURL=file-list.js.map

package/dist/m365/file/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'file';
 exports.default = {
     ADD: `${prefix} add`,
-    CONVERT_PDF: `${prefix} convert pdf`
+    CONVERT_PDF: `${prefix} convert pdf`,
+    LIST: `${prefix} list`
 };
 //# sourceMappingURL=commands.js.map