@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.d8f63d2

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/powershell:alpine-3.12
+FROM mcr.microsoft.com/powershell:alpine-3.17
 
 ARG CLI_VERSION=latest
 
@@ -48,6 +48,7 @@ RUN bash -c 'echo "export PATH=$PATH:/home/cli-microsoft365/.npm-global/bin:/hom
   && bash -c 'm365 cli completion sh setup' \
   && pwsh -c 'm365 cli completion pwsh setup --profile $profile'
 
+RUN pip install setuptools==58
 RUN pip install jmespath-terminal
 
 CMD [ "bash", "-l" ]

package/dist/cli/Cli.js

@@ -801,6 +801,22 @@ class Cli {
             return response;
         });
     }
+    static handleMultipleResultsFound(promptMessage, errorMessage, values) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const interactive = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.interactive, false);
+            if (!interactive) {
+                throw errorMessage;
+            }
+            const response = yield Cli.prompt({
+                type: 'list',
+                name: 'select',
+                default: 0,
+                message: promptMessage,
+                choices: Object.keys(values)
+            });
+            return values[response.select];
+        });
+    }
     static removeShortOptions(args) {
         const filteredArgs = JSON.parse(JSON.stringify(args));
         const optionsToRemove = Object.getOwnPropertyNames(args.options)

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

@@ -122,11 +122,11 @@ class AadAppAddCommand extends GraphCommand_1.default {
         });
     }
     grantAdminConsent(appInfo, adminConsent, logger) {
-        if (!adminConsent || this.appPermissions.length === 0) {
-            return Promise.resolve(appInfo);
-        }
-        return this.createServicePrincipal(appInfo.appId)
-            .then((sp) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!adminConsent || this.appPermissions.length === 0) {
+                return appInfo;
+            }
+            const sp = yield this.createServicePrincipal(appInfo.appId);
             if (this.debug) {
                 logger.logToStderr("Service principal created, returned object id: " + sp.id);
             }
@@ -145,115 +145,121 @@ class AadAppAddCommand extends GraphCommand_1.default {
                     }
                 });
             });
-            return Promise.all(tasks)
-                .then(_ => {
-                return appInfo;
-            });
+            yield Promise.all(tasks);
+            return appInfo;
         });
     }
     addRoleToServicePrincipal(objectId, resourceId, appRoleId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/servicePrincipals/${objectId}/appRoleAssignments`,
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            responseType: 'json',
-            data: {
-                appRoleId: appRoleId,
-                principalId: objectId,
-                resourceId: resourceId
-            }
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/servicePrincipals/${objectId}/appRoleAssignments`,
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    appRoleId: appRoleId,
+                    principalId: objectId,
+                    resourceId: resourceId
+                }
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     grantOAuth2Permission(appId, resourceId, scopeName) {
-        const grantAdminConsentApplicationRequestOptions = {
-            url: `${this.resource}/v1.0/myorganization/oauth2PermissionGrants`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                clientId: appId,
-                consentType: "AllPrincipals",
-                principalId: null,
-                resourceId: resourceId,
-                scope: scopeName
-            }
-        };
-        return request_1.default.post(grantAdminConsentApplicationRequestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const grantAdminConsentApplicationRequestOptions = {
+                url: `${this.resource}/v1.0/myorganization/oauth2PermissionGrants`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    clientId: appId,
+                    consentType: "AllPrincipals",
+                    principalId: null,
+                    resourceId: resourceId,
+                    scope: scopeName
+                }
+            };
+            return request_1.default.post(grantAdminConsentApplicationRequestOptions);
+        });
     }
     createServicePrincipal(appId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/servicePrincipals`,
-            headers: {
-                'content-type': 'application/json'
-            },
-            data: {
-                appId: appId
-            },
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/servicePrincipals`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                data: {
+                    appId: appId
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     updateAppFromManifest(args, appInfo) {
-        if (!args.options.manifest) {
-            return Promise.resolve(appInfo);
-        }
-        const v2Manifest = JSON.parse(args.options.manifest);
-        // remove properties that might be coming from the original app that was
-        // used to create the manifest and which can't be updated
-        delete v2Manifest.id;
-        delete v2Manifest.appId;
-        delete v2Manifest.publisherDomain;
-        // extract secrets from the manifest. Store them in a separate variable
-        const secrets = this.getSecretsFromManifest(v2Manifest);
-        // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
-        if (args.options.apisApplication || args.options.apisDelegated) {
-            // take submitted delegated / application permissions as options
-            // otherwise, they will be skipped in the app update
-            v2Manifest.requiredResourceAccess = appInfo.requiredResourceAccess;
-        }
-        if (args.options.redirectUris) {
-            // take submitted redirectUris/platform as options
-            // otherwise, they will be removed from the app
-            v2Manifest.replyUrlsWithType = args.options.redirectUris.split(',').map(u => {
-                return {
-                    url: u.trim(),
-                    type: this.translatePlatformToType(args.options.platform)
-                };
-            });
-        }
-        if (args.options.multitenant) {
-            // override manifest setting when using multitenant flag
-            v2Manifest.signInAudience = 'AzureADMultipleOrgs';
-        }
-        if (args.options.implicitFlow) {
-            // remove manifest settings when using implicitFlow flag
-            delete v2Manifest.oauth2AllowIdTokenImplicitFlow;
-            delete v2Manifest.oauth2AllowImplicitFlow;
-        }
-        if (args.options.scopeName) {
-            // override manifest setting when using options.
-            delete v2Manifest.oauth2Permissions;
-        }
-        if (args.options.certificateFile || args.options.certificateBase64Encoded) {
-            // override manifest setting when using options.
-            delete v2Manifest.keyCredentials;
-        }
-        const graphManifest = this.transformManifest(v2Manifest);
-        const updateAppRequestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
-            headers: {
-                'content-type': 'application/json'
-            },
-            responseType: 'json',
-            data: graphManifest
-        };
-        return request_1.default
-            .patch(updateAppRequestOptions)
-            .then(_ => this.updatePreAuthorizedAppsFromManifest(v2Manifest, appInfo))
-            .then(_ => this.createSecrets(secrets, appInfo));
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.manifest) {
+                return appInfo;
+            }
+            const v2Manifest = JSON.parse(args.options.manifest);
+            // remove properties that might be coming from the original app that was
+            // used to create the manifest and which can't be updated
+            delete v2Manifest.id;
+            delete v2Manifest.appId;
+            delete v2Manifest.publisherDomain;
+            // extract secrets from the manifest. Store them in a separate variable
+            const secrets = this.getSecretsFromManifest(v2Manifest);
+            // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
+            if (args.options.apisApplication || args.options.apisDelegated) {
+                // take submitted delegated / application permissions as options
+                // otherwise, they will be skipped in the app update
+                v2Manifest.requiredResourceAccess = appInfo.requiredResourceAccess;
+            }
+            if (args.options.redirectUris) {
+                // take submitted redirectUris/platform as options
+                // otherwise, they will be removed from the app
+                v2Manifest.replyUrlsWithType = args.options.redirectUris.split(',').map(u => {
+                    return {
+                        url: u.trim(),
+                        type: this.translatePlatformToType(args.options.platform)
+                    };
+                });
+            }
+            if (args.options.multitenant) {
+                // override manifest setting when using multitenant flag
+                v2Manifest.signInAudience = 'AzureADMultipleOrgs';
+            }
+            if (args.options.implicitFlow) {
+                // remove manifest settings when using implicitFlow flag
+                delete v2Manifest.oauth2AllowIdTokenImplicitFlow;
+                delete v2Manifest.oauth2AllowImplicitFlow;
+            }
+            if (args.options.scopeName) {
+                // override manifest setting when using options.
+                delete v2Manifest.oauth2Permissions;
+            }
+            if (args.options.certificateFile || args.options.certificateBase64Encoded) {
+                // override manifest setting when using options.
+                delete v2Manifest.keyCredentials;
+            }
+            const graphManifest = this.transformManifest(v2Manifest);
+            const updateAppRequestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: graphManifest
+            };
+            yield request_1.default.patch(updateAppRequestOptions);
+            yield this.updatePreAuthorizedAppsFromManifest(v2Manifest, appInfo);
+            yield this.createSecrets(secrets, appInfo);
+            return appInfo;
+        });
     }
     getSecretsFromManifest(manifest) {
         if (!manifest.passwordCredentials || manifest.passwordCredentials.length === 0) {
@@ -275,44 +281,45 @@ class AadAppAddCommand extends GraphCommand_1.default {
         return secrets;
     }
     updatePreAuthorizedAppsFromManifest(manifest, appInfo) {
-        if (!manifest ||
-            !manifest.preAuthorizedApplications ||
-            manifest.preAuthorizedApplications.length === 0) {
-            return Promise.resolve(appInfo);
-        }
-        const graphManifest = {
-            api: {
-                preAuthorizedApplications: manifest.preAuthorizedApplications
-            }
-        };
-        graphManifest.api.preAuthorizedApplications.forEach((p) => {
-            p.delegatedPermissionIds = p.permissionIds;
-            delete p.permissionIds;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!manifest ||
+                !manifest.preAuthorizedApplications ||
+                manifest.preAuthorizedApplications.length === 0) {
+                return appInfo;
+            }
+            const graphManifest = {
+                api: {
+                    preAuthorizedApplications: manifest.preAuthorizedApplications
+                }
+            };
+            graphManifest.api.preAuthorizedApplications.forEach((p) => {
+                p.delegatedPermissionIds = p.permissionIds;
+                delete p.permissionIds;
+            });
+            const updateAppRequestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: graphManifest
+            };
+            yield request_1.default.patch(updateAppRequestOptions);
+            return appInfo;
         });
-        const updateAppRequestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
-            headers: {
-                'content-type': 'application/json'
-            },
-            responseType: 'json',
-            data: graphManifest
-        };
-        return request_1.default
-            .patch(updateAppRequestOptions)
-            .then(_ => Promise.resolve(appInfo));
     }
     createSecrets(secrets, appInfo) {
-        if (secrets.length === 0) {
-            return Promise.resolve(appInfo);
-        }
-        return Promise
-            .all(secrets.map(secret => this.createSecret({
-            appObjectId: appInfo.id,
-            displayName: secret.name,
-            expirationDate: secret.expirationDate
-        })))
-            .then(secrets => {
-            appInfo.secrets = secrets;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (secrets.length === 0) {
+                return appInfo;
+            }
+            const secretsOutput = yield Promise
+                .all(secrets.map(secret => this.createSecret({
+                appObjectId: appInfo.id,
+                displayName: secret.name,
+                expirationDate: secret.expirationDate
+            })));
+            appInfo.secrets = secretsOutput;
             return appInfo;
         });
     }
@@ -405,52 +412,52 @@ class AadAppAddCommand extends GraphCommand_1.default {
         return graphManifest;
     }
     configureUri(args, appInfo, logger) {
-        if (!args.options.uri) {
-            return Promise.resolve(appInfo);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Configuring Azure AD application ID URI...`);
-        }
-        const applicationInfo = {};
-        if (args.options.uri) {
-            const appUri = args.options.uri.replace(/_appId_/g, appInfo.appId);
-            applicationInfo.identifierUris = [appUri];
-        }
-        if (args.options.scopeName) {
-            applicationInfo.api = {
-                oauth2PermissionScopes: [{
-                        adminConsentDescription: args.options.scopeAdminConsentDescription,
-                        adminConsentDisplayName: args.options.scopeAdminConsentDisplayName,
-                        id: (0, uuid_1.v4)(),
-                        type: args.options.scopeConsentBy === 'adminsAndUsers' ? 'User' : 'Admin',
-                        value: args.options.scopeName
-                    }]
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.uri) {
+                return appInfo;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Configuring Azure AD application ID URI...`);
+            }
+            const applicationInfo = {};
+            if (args.options.uri) {
+                const appUri = args.options.uri.replace(/_appId_/g, appInfo.appId);
+                applicationInfo.identifierUris = [appUri];
+            }
+            if (args.options.scopeName) {
+                applicationInfo.api = {
+                    oauth2PermissionScopes: [{
+                            adminConsentDescription: args.options.scopeAdminConsentDescription,
+                            adminConsentDisplayName: args.options.scopeAdminConsentDisplayName,
+                            id: (0, uuid_1.v4)(),
+                            type: args.options.scopeConsentBy === 'adminsAndUsers' ? 'User' : 'Admin',
+                            value: args.options.scopeName
+                        }]
+                };
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: applicationInfo
             };
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
-            headers: {
-                'content-type': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: applicationInfo
-        };
-        return request_1.default
-            .patch(requestOptions)
-            .then(_ => appInfo);
+            yield request_1.default.patch(requestOptions);
+            return appInfo;
+        });
     }
     resolveApis(args, logger) {
         var _a;
-        if (!args.options.apisDelegated && !args.options.apisApplication
-            && (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) === 'undefined' || this.manifest.requiredResourceAccess.length === 0)) {
-            return Promise.resolve([]);
-        }
-        if (this.verbose) {
-            logger.logToStderr('Resolving requested APIs...');
-        }
-        return odata_1.odata
-            .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`)
-            .then(servicePrincipals => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.apisDelegated && !args.options.apisApplication
+                && (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) === 'undefined' || this.manifest.requiredResourceAccess.length === 0)) {
+                return [];
+            }
+            if (this.verbose) {
+                logger.logToStderr('Resolving requested APIs...');
+            }
+            const servicePrincipals = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
             let resolvedApis = [];
             try {
                 if (args.options.apisDelegated || args.options.apisApplication) {
@@ -496,10 +503,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
                     logger.logToStderr(`App role assignments: ${JSON.stringify(this.appPermissions.flatMap(permission => permission.resourceAccess.filter(access => access.type === "Role")), null, 2)}`);
                     logger.logToStderr(`OAuth2 permissions: ${JSON.stringify(this.appPermissions.flatMap(permission => permission.scope), null, 2)}`);
                 }
-                return Promise.resolve(resolvedApis);
+                return resolvedApis;
             }
             catch (e) {
-                return Promise.reject(e);
+                throw e;
             }
         });
     }
@@ -565,48 +572,48 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
     }
     configureSecret(args, appInfo, logger) {
-        if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
-            return Promise.resolve(appInfo);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Configure Azure AD app secret...`);
-        }
-        return this
-            .createSecret({ appObjectId: appInfo.id })
-            .then(secret => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
+                return appInfo;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Configure Azure AD app secret...`);
+            }
+            const secret = yield this.createSecret({ appObjectId: appInfo.id });
             if (!appInfo.secrets) {
                 appInfo.secrets = [];
             }
             appInfo.secrets.push(secret);
-            return Promise.resolve(appInfo);
+            return appInfo;
         });
     }
     createSecret({ appObjectId, displayName = undefined, expirationDate = undefined }) {
-        let secretExpirationDate = expirationDate;
-        if (!secretExpirationDate) {
-            secretExpirationDate = new Date();
-            secretExpirationDate.setFullYear(secretExpirationDate.getFullYear() + 1);
-        }
-        const secretName = displayName !== null && displayName !== void 0 ? displayName : 'Default';
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}/addPassword`,
-            headers: {
-                'content-type': 'application/json'
-            },
-            responseType: 'json',
-            data: {
-                passwordCredential: {
-                    displayName: secretName,
-                    endDateTime: secretExpirationDate.toISOString()
-                }
+        return __awaiter(this, void 0, void 0, function* () {
+            let secretExpirationDate = expirationDate;
+            if (!secretExpirationDate) {
+                secretExpirationDate = new Date();
+                secretExpirationDate.setFullYear(secretExpirationDate.getFullYear() + 1);
             }
-        };
-        return request_1.default
-            .post(requestOptions)
-            .then((password) => Promise.resolve({
-            displayName: secretName,
-            value: password.secretText
-        }));
+            const secretName = displayName !== null && displayName !== void 0 ? displayName : 'Default';
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}/addPassword`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    passwordCredential: {
+                        displayName: secretName,
+                        endDateTime: secretExpirationDate.toISOString()
+                    }
+                }
+            };
+            const response = yield request_1.default.post(requestOptions);
+            return {
+                displayName: secretName,
+                value: response.secretText
+            };
+        });
     }
     getCertificateBase64Encoded(args, logger) {
         if (args.options.certificateBase64Encoded) {
@@ -623,43 +630,45 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
     }
     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}...`);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.save) {
+                return appInfo;
             }
-            try {
-                const fileContents = fs.readFileSync(filePath, 'utf8');
-                if (fileContents) {
-                    m365rc = JSON.parse(fileContents);
+            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 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 reading ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
-                return Promise.resolve(appInfo);
+                logger.logToStderr(`Error writing ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
             }
-        }
-        if (!m365rc.apps) {
-            m365rc.apps = [];
-        }
-        m365rc.apps.push({
-            appId: appInfo.appId,
-            name: this.appName
+            return appInfo;
         });
-        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);
     }
     translatePlatformToType(platform) {
         if (platform === 'publicClient') {