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

package/.devcontainer/Dockerfile

@@ -23,11 +23,11 @@ RUN apt-get update && apt-get install -y \
   vim \
   python3.8 \
   python3-pip \
-  && curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash - \
+  && curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - \
   && apt-get install nodejs -y \
   && rm -rf /var/lib/apt/lists/*
 
-RUN pip3 install mkdocs-material==3.1.0 pymdown-extensions==6.0
+RUN pip3 install mkdocs-material==7.1.7 pymdown-extensions==9.0
 
 RUN useradd \
   --user-group \

package/dist/appInsights.js

@@ -4,6 +4,8 @@ const packageJSON = require('../package.json');
 // disable automatic third-party instrumentation for Application Insights
 // speeds up execution by preventing loading unnecessary dependencies
 process.env.APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 'none';
+// prevents tests from hanging
+process.env.APPLICATION_INSIGHTS_NO_STATSBEAT = 'true';
 const appInsights = require("applicationinsights");
 const crypto = require("crypto");
 const fs = require("fs");

package/dist/cli/Cli.js

@@ -386,7 +386,10 @@ class Cli {
             logStatementType = typeof logStatement;
         }
         if (!options.output || options.output === 'json') {
-            return JSON.stringify(logStatement, null, 2);
+            return JSON
+                .stringify(logStatement, null, 2)
+                // replace unescaped newlines with escaped newlines #2807
+                .replace(/([^\\])\\n/g, '$1\\\\\\n');
         }
         if (logStatement instanceof Command_1.CommandError) {
             const chalk = require('chalk');

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -7,6 +8,10 @@ const Utils_1 = require("../../../../Utils");
 const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
 const commands_1 = require("../../commands");
 class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    constructor() {
+        super(...arguments);
+        this.appName = '';
+    }
     get name() {
         return commands_1.default.APP_ADD;
     }
@@ -32,18 +37,23 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         this
             .resolveApis(args, logger)
             .then(apis => this.createAppRegistration(args, apis, logger))
+            .then(appInfo => {
+            // based on the assumption that we're adding AAD app to the current
+            // directory. If we in the future extend the command with allowing
+            // users to create AAD app in a different directory, we'll need to
+            // adjust this
+            appInfo.tenantId = Utils_1.default.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+            return Promise.resolve(appInfo);
+        })
             .then(appInfo => this.updateAppFromManifest(args, appInfo))
             .then(appInfo => this.configureUri(args, appInfo, logger))
             .then(appInfo => this.configureSecret(args, appInfo, logger))
+            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
             .then((_appInfo) => {
             const appInfo = {
                 appId: _appInfo.appId,
                 objectId: _appInfo.id,
-                // based on the assumption that we're adding AAD app to the current
-                // directory. If we in the future extend the command with allowing
-                // users to create AAD app in a different directory, we'll need to
-                // adjust this
-                tenantId: Utils_1.default.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                tenantId: _appInfo.tenantId
             };
             if (_appInfo.secret) {
                 appInfo.secret = _appInfo.secret;
@@ -60,6 +70,7 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
         if (!applicationInfo.displayName && this.manifest) {
             applicationInfo.displayName = this.manifest.name;
         }
+        this.appName = applicationInfo.displayName;
         if (apis.length > 0) {
             applicationInfo.requiredResourceAccess = apis;
         }
@@ -332,6 +343,45 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             return Promise.resolve(appInfo);
         });
     }
+    saveAppInfo(args, appInfo, logger) {
+        if (!args.options.save) {
+            return Promise.resolve(appInfo);
+        }
+        const filePath = '.m365rc.json';
+        if (this.verbose) {
+            logger.logToStderr(`Saving Azure AD app registration information to the ${filePath} file...`);
+        }
+        let m365rc = {};
+        if (fs.existsSync(filePath)) {
+            if (this.debug) {
+                logger.logToStderr(`Reading existing ${filePath}...`);
+            }
+            try {
+                const fileContents = fs.readFileSync(filePath, 'utf8');
+                if (fileContents) {
+                    m365rc = JSON.parse(fileContents);
+                }
+            }
+            catch (e) {
+                logger.logToStderr(`Error reading ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+                return Promise.resolve(appInfo);
+            }
+        }
+        if (!m365rc.apps) {
+            m365rc.apps = [];
+        }
+        m365rc.apps.push({
+            appId: appInfo.appId,
+            name: this.appName
+        });
+        try {
+            fs.writeFileSync(filePath, JSON.stringify(m365rc, null, 2));
+        }
+        catch (e) {
+            logger.logToStderr(`Error writing ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+        }
+        return Promise.resolve(appInfo);
+    }
     options() {
         const options = [
             {
@@ -377,6 +427,9 @@ class AadAppAddCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
             },
             {
                 option: '--manifest [manifest]'
+            },
+            {
+                option: '--save'
             }
         ];
         const parentOptions = super.options();

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

@@ -5,6 +5,7 @@ const path = require("path");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const Utils_1 = require("../../../../Utils");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_ADD;
@@ -14,6 +15,8 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let group;
+        let ownerIds = [];
+        let memberIds = [];
         if (this.verbose) {
             logger.logToStderr(`Creating Microsoft 365 Group...`);
         }
@@ -35,8 +38,16 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                 visibility: args.options.isPrivate === 'true' ? 'Private' : 'Public'
             }
         };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getUserIds(logger, args.options.owners)
+            .then((ownerIdsRes) => {
+            ownerIds = ownerIdsRes;
+            return this.getUserIds(logger, args.options.members);
+        })
+            .then((memberIdsRes) => {
+            memberIds = memberIdsRes;
+            return request_1.default.post(requestOptions);
+        })
             .then((res) => {
             group = res;
             if (!args.options.logoPath) {
@@ -61,72 +72,32 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             });
         })
             .then(() => {
-            if (!args.options.owners) {
-                if (this.debug) {
-                    logger.logToStderr('Owners not set. Skipping');
-                }
-                return Promise.resolve(undefined);
-            }
-            const owners = args.options.owners.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group owners...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            if (ownerIds.length === 0) {
+                return Promise.resolve([]);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
+            return Promise.all(ownerIds.map(ownerId => request_1.default.post({
                 url: `${this.resource}/v1.0/groups/${group.id}/owners/$ref`,
                 headers: {
                     'content-type': 'application/json'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${ownerId}`
                 }
             })));
         })
             .then(() => {
-            if (!args.options.members) {
-                if (this.debug) {
-                    logger.logToStderr('Members not set. Skipping');
-                }
-                return Promise.resolve(undefined);
-            }
-            const members = args.options.members.split(',').map(o => o.trim());
-            if (this.verbose) {
-                logger.logToStderr('Retrieving user information to set group members...');
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (!res) {
-                return Promise.resolve();
+            if (memberIds.length === 0) {
+                return Promise.resolve([]);
             }
-            return Promise.all(res.value.map(u => request_1.default.post({
+            return Promise.all(memberIds.map(memberId => request_1.default.post({
                 url: `${this.resource}/v1.0/groups/${group.id}/members/$ref`,
                 headers: {
                     'content-type': 'application/json'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
+                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${memberId}`
                 }
             })));
         })
@@ -135,6 +106,41 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
+    getUserIds(logger, users) {
+        if (!users) {
+            if (this.debug) {
+                logger.logToStderr('No users to validate, skipping.');
+            }
+            return Promise.resolve([]);
+        }
+        if (this.verbose) {
+            logger.logToStderr('Retrieving user information.');
+        }
+        const userArr = users.split(',').map(o => o.trim());
+        let promises = [];
+        let userIds = [];
+        promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise.all(promises).then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with group creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
     setGroupLogo(requestOptions, retryLeft, resolve, reject, logger) {
         request_1.default
             .put(requestOptions)

package/dist/m365/aad/commands/oauth2grant/oauth2grant-add.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 AadOAuth2GrantAddCommand extends AadCommand_1.default {
+class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.OAUTH2GRANT_ADD;
     }
@@ -16,20 +16,17 @@ class AadOAuth2GrantAddCommand extends AadCommand_1.default {
             logger.logToStderr(`Granting the service principal specified permissions...`);
         }
         const requestOptions = {
-            url: `${this.resource}/myorganization/oauth2PermissionGrants?api-version=1.6`,
+            url: `${this.resource}/v1.0/oauth2PermissionGrants`,
             headers: {
-                'content-type': 'application/json'
+                'content-type': 'application/json;odata.metadata=none'
             },
             responseType: 'json',
             data: {
-                "odata.type": "Microsoft.DirectoryServices.OAuth2PermissionGrant",
                 "clientId": args.options.clientId,
                 "consentType": "AllPrincipals",
                 "principalId": null,
                 "resourceId": args.options.resourceId,
-                "scope": args.options.scope,
-                "startTime": "0001-01-01T00:00:00",
-                "expiryTime": "9000-01-01T00:00:00"
+                "scope": args.options.scope
             }
         };
         request_1.default

package/dist/m365/aad/commands/oauth2grant/oauth2grant-list.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 AadOAuth2GrantListCommand extends AadCommand_1.default {
+class AadOAuth2GrantListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.OAUTH2GRANT_LIST;
     }
@@ -19,9 +19,9 @@ class AadOAuth2GrantListCommand extends AadCommand_1.default {
             logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
         }
         const requestOptions = {
-            url: `${this.resource}/myorganization/oauth2PermissionGrants?api-version=1.6&$filter=clientId eq '${encodeURIComponent(args.options.clientId)}'`,
+            url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${encodeURIComponent(args.options.spObjectId)}'`,
             headers: {
-                accept: 'application/json;odata=nometadata'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
@@ -37,15 +37,15 @@ class AadOAuth2GrantListCommand extends AadCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --clientId <clientId>'
+                option: '-i, --spObjectId <spObjectId>'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.clientId)) {
-            return `${args.options.clientId} is not a valid GUID`;
+        if (!Utils_1.default.isValidGuid(args.options.spObjectId)) {
+            return `${args.options.spObjectId} is not a valid GUID`;
         }
         return true;
     }

package/dist/m365/aad/commands/oauth2grant/oauth2grant-remove.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -11,24 +12,47 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
         return 'Remove specified service principal OAuth2 permissions';
     }
     commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Removing OAuth2 permissions...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
+        const removeOauth2Grant = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing OAuth2 permissions...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .delete(requestOptions)
+                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
         };
-        request_1.default
-            .delete(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        if (args.options.confirm) {
+            removeOauth2Grant();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeOauth2Grant();
+                }
+            });
+        }
     }
     options() {
         const options = [
             {
                 option: '-i, --grantId <grantId>'
+            },
+            {
+                option: '--confirm'
             }
         ];
         const parentOptions = super.options();

package/dist/m365/aad/commands/oauth2grant/oauth2grant-set.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const AadCommand_1 = require("../../../base/AadCommand");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadOAuth2GrantSetCommand extends AadCommand_1.default {
+class AadOAuth2GrantSetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.OAUTH2GRANT_SET;
     }
@@ -15,7 +15,7 @@ class AadOAuth2GrantSetCommand extends AadCommand_1.default {
             logger.logToStderr(`Updating OAuth2 permissions...`);
         }
         const requestOptions = {
-            url: `${this.resource}/myorganization/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}?api-version=1.6`,
+            url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
             headers: {
                 'content-type': 'application/json'
             },

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