@pnp/cli-microsoft365 6.8.0-beta.f473be5 → 6.9.0-beta.148279d

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

@@ -50,83 +50,86 @@ class AadAppGetCommand extends GraphCommand_1.default {
         });
     }
     getAppObjectId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
-        }
-        const { appId, name } = args.options;
-        const filter = appId ?
-            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.objectId) {
+                return args.options.objectId;
+            }
+            const { appId, name } = args.options;
+            const filter = appId ?
+                `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
                 const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
-                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+                throw `No Azure AD application registration with ${applicationIdentifier} found`;
             }
-            return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
+            throw `Multiple Azure AD application registration with name ${name} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
         });
     }
     getAppInfo(appObjectId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
     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...`);
             }
-            catch (e) {
-                logger.logToStderr(`Error reading ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
-                return Promise.resolve(appInfo);
+            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 = [];
-        }
-        if (!m365rc.apps.some(a => a.appId === appInfo.appId)) {
-            m365rc.apps.push({
-                appId: appInfo.appId,
-                name: appInfo.displayName
-            });
-            try {
-                fs.writeFileSync(filePath, JSON.stringify(m365rc, null, 2));
+            if (!m365rc.apps) {
+                m365rc.apps = [];
             }
-            catch (e) {
-                logger.logToStderr(`Error writing ${filePath}: ${e}. Please add app info to ${filePath} manually.`);
+            if (!m365rc.apps.some(a => a.appId === appInfo.appId)) {
+                m365rc.apps.push({
+                    appId: appInfo.appId,
+                    name: appInfo.displayName
+                });
+                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);
+            return appInfo;
+        });
     }
 }
 _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = function _AadAppGetCommand_initTelemetry() {

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

@@ -74,34 +74,33 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
         });
     }
     getObjectId(args, logger) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
-        }
-        const { appId, name } = args.options;
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
-        }
-        const filter = appId ?
-            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.objectId) {
+                return args.options.objectId;
+            }
+            const { appId, name } = args.options;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
+            }
+            const filter = appId ?
+                `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
                 const applicationIdentifier = appId ? `ID ${appId}` : `name ${name}`;
-                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+                throw `No Azure AD application registration with ${applicationIdentifier} found`;
             }
-            return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please choose one of the object IDs: ${res.value.map(a => a.id).join(', ')}`);
+            throw `Multiple Azure AD application registration with name ${name} found. Please choose one of the object IDs: ${res.value.map(a => a.id).join(', ')}`;
         });
     }
 }

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

@@ -67,17 +67,19 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
         });
     }
     getAppInfo(appId, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about roles for Azure AD app ${appId}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about roles for Azure AD app ${appId}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
     getAllowedMemberTypes(args) {
         switch (args.options.allowedMembers) {
@@ -92,34 +94,33 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
         }
     }
     getAppObjectId(args, logger) {
-        if (args.options.appObjectId) {
-            return Promise.resolve(args.options.appObjectId);
-        }
-        const { appId, appName } = args.options;
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
-        }
-        const filter = appId ?
-            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appObjectId) {
+                return args.options.appObjectId;
+            }
+            const { appId, appName } = args.options;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
+            }
+            const filter = appId ?
+                `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
                 const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+                throw `No Azure AD application registration with ${applicationIdentifier} found`;
             }
-            return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
+            throw `Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
         });
     }
 }

package/dist/m365/aad/commands/app/app-role-list.js

@@ -50,34 +50,33 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
         });
     }
     getAppObjectId(args, logger) {
-        if (args.options.appObjectId) {
-            return Promise.resolve(args.options.appObjectId);
-        }
-        const { appId, appName } = args.options;
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
-        }
-        const filter = appId ?
-            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appObjectId) {
+                return args.options.appObjectId;
+            }
+            const { appId, appName } = args.options;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
+            }
+            const filter = appId ?
+                `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
                 const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+                throw `No Azure AD application registration with ${applicationIdentifier} found`;
             }
-            return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
+            throw `Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`;
         });
     }
 }

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -63,10 +63,9 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
         });
     }
     processAppRoleDelete(logger, args) {
-        return this
-            .getAppObjectId(args, logger)
-            .then((appObjectId) => this.getAadApp(appObjectId, logger))
-            .then((aadApp) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const appObjectId = yield this.getAppObjectId(args, logger);
+            const aadApp = yield this.getAadApp(appObjectId, logger);
             const appRoleDeleteIdentifierNameValue = args.options.name ? `name '${args.options.name}'` : (args.options.claim ? `claim '${args.options.claim}'` : `id '${args.options.id}'`);
             if (this.verbose) {
                 logger.logToStderr(`Deleting role with ${appRoleDeleteIdentifierNameValue} from Azure AD app ${aadApp.id}...`);
@@ -78,99 +77,103 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
             if (args.options.name &&
                 appRoleToDelete !== undefined &&
                 appRoleToDelete.length > 1) {
-                return Promise.reject(`Multiple roles with the provided 'name' were found. Please disambiguate using the claims : ${appRoleToDelete.map(role => `${role.value}`).join(', ')}`);
+                throw `Multiple roles with the provided 'name' were found. Please disambiguate using the claims : ${appRoleToDelete.map(role => `${role.value}`).join(', ')}`;
             }
             if (appRoleToDelete.length === 0) {
-                return Promise.reject(`No app role with ${appRoleDeleteIdentifierNameValue} found.`);
+                throw `No app role with ${appRoleDeleteIdentifierNameValue} found.`;
             }
             const roleToDelete = appRoleToDelete[0];
             if (roleToDelete.isEnabled) {
-                return this
-                    .disableAppRole(logger, aadApp, roleToDelete.id)
-                    .then(_ => this.deleteAppRole(logger, aadApp, roleToDelete.id));
+                yield this.disableAppRole(logger, aadApp, roleToDelete.id);
+                yield this.deleteAppRole(logger, aadApp, roleToDelete.id);
             }
             else {
-                return this.deleteAppRole(logger, aadApp, roleToDelete.id);
+                yield this.deleteAppRole(logger, aadApp, roleToDelete.id);
             }
         });
     }
     disableAppRole(logger, aadApp, roleId) {
-        const roleIndex = aadApp.appRoles.findIndex((role) => role.id === roleId);
-        if (this.verbose) {
-            logger.logToStderr(`Disabling the app role`);
-        }
-        aadApp.appRoles[roleIndex].isEnabled = false;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${aadApp.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                appRoles: aadApp.appRoles
+        return __awaiter(this, void 0, void 0, function* () {
+            const roleIndex = aadApp.appRoles.findIndex((role) => role.id === roleId);
+            if (this.verbose) {
+                logger.logToStderr(`Disabling the app role`);
             }
-        };
-        return request_1.default.patch(requestOptions);
+            aadApp.appRoles[roleIndex].isEnabled = false;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${aadApp.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    appRoles: aadApp.appRoles
+                }
+            };
+            return request_1.default.patch(requestOptions);
+        });
     }
     deleteAppRole(logger, aadApp, roleId) {
-        if (this.verbose) {
-            logger.logToStderr(`Deleting the app role.`);
-        }
-        const updatedAppRoles = aadApp.appRoles.filter((role) => role.id !== roleId);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${aadApp.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                appRoles: updatedAppRoles
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Deleting the app role.`);
             }
-        };
-        return request_1.default.patch(requestOptions);
+            const updatedAppRoles = aadApp.appRoles.filter((role) => role.id !== roleId);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${aadApp.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    appRoles: updatedAppRoles
+                }
+            };
+            return request_1.default.patch(requestOptions);
+        });
     }
     getAadApp(appId, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving app roles information for the Azure AD app ${appId}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving app roles information for the Azure AD app ${appId}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
     getAppObjectId(args, logger) {
-        if (args.options.appObjectId) {
-            return Promise.resolve(args.options.appObjectId);
-        }
-        const { appId, appName } = args.options;
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
-        }
-        const filter = appId ?
-            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
-            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appObjectId) {
+                return args.options.appObjectId;
+            }
+            const { appId, appName } = args.options;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
+            }
+            const filter = appId ?
+                `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+                `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
             if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].id);
+                return res.value[0].id;
             }
             if (res.value.length === 0) {
                 const applicationIdentifier = appId ? `ID ${appId}` : `name ${appName}`;
-                return Promise.reject(`No Azure AD application registration with ${applicationIdentifier} found`);
+                throw `No Azure AD application registration with ${applicationIdentifier} found`;
             }
-            return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate using app object IDs: ${res.value.map(a => a.id).join(', ')}`);
+            throw `Multiple Azure AD application registration with name ${appName} found. Please disambiguate using app object IDs: ${res.value.map(a => a.id).join(', ')}`;
         });
     }
 }