@pnp/cli-microsoft365 5.0.0-beta.fe151d6 → 5.1.0-beta.c8f5fd7

package/dist/m365/app/commands/permission/permission-list.js

@@ -0,0 +1,266 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const appGetCommand = require("../../../aad/commands/app/app-get");
+const AppCommand_1 = require("../../../base/AppCommand");
+const commands_1 = require("../../commands");
+var GetServicePrincipal;
+(function (GetServicePrincipal) {
+    GetServicePrincipal[GetServicePrincipal["withPermissions"] = 0] = "withPermissions";
+    GetServicePrincipal[GetServicePrincipal["withPermissionDefinitions"] = 1] = "withPermissionDefinitions";
+})(GetServicePrincipal || (GetServicePrincipal = {}));
+class AppPermissionListCommand extends AppCommand_1.default {
+    get name() {
+        return commands_1.default.PERMISSION_LIST;
+    }
+    get description() {
+        return 'Lists API permissions for the current AAD app';
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getServicePrincipal({ appId: this.appId }, logger, GetServicePrincipal.withPermissions)
+            .then(servicePrincipal => {
+            if (servicePrincipal) {
+                // service principal found, get permissions from the service principal
+                return this.getServicePrincipalPermissions(servicePrincipal, logger);
+            }
+            else {
+                // service principal not found, get permissions from app registration
+                return this.getAppRegPermissions(this.appId, logger);
+            }
+        })
+            .then(permissions => {
+            logger.log(permissions);
+            cb();
+        }, err => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getServicePrincipal(servicePrincipalInfo, logger, mode) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving service principal ${(_a = servicePrincipalInfo.appId) !== null && _a !== void 0 ? _a : servicePrincipalInfo.id}`);
+            }
+            const lookupUrl = servicePrincipalInfo.appId ? `?$filter=appId eq '${servicePrincipalInfo.appId}'&` : `/${servicePrincipalInfo.id}?`;
+            const requestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals${lookupUrl}$select=appId,id,displayName`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if ((servicePrincipalInfo.id && !response) ||
+                (servicePrincipalInfo.appId && response.value.length === 0)) {
+                return undefined;
+            }
+            const servicePrincipal = servicePrincipalInfo.appId ?
+                response.value[0] :
+                response;
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving permissions for service principal ${servicePrincipal.id}...`);
+            }
+            const permissionsPromises = [];
+            switch (mode) {
+                case GetServicePrincipal.withPermissions:
+                    const appRoleAssignmentsRequestOptions = {
+                        url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/appRoleAssignments`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    const oauth2PermissionGrantsRequestOptions = {
+                        url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/oauth2PermissionGrants`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    permissionsPromises.push(...[
+                        request_1.default.get(appRoleAssignmentsRequestOptions),
+                        request_1.default.get(oauth2PermissionGrantsRequestOptions)
+                    ]);
+                    break;
+                case GetServicePrincipal.withPermissionDefinitions:
+                    const oauth2PermissionScopesRequestOptions = {
+                        url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/oauth2PermissionScopes`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    const appRolesRequestOptions = {
+                        url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipal.id}/appRoles`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    permissionsPromises.push(...[
+                        request_1.default.get(oauth2PermissionScopesRequestOptions),
+                        request_1.default.get(appRolesRequestOptions)
+                    ]);
+                    break;
+            }
+            const permissions = yield Promise.all(permissionsPromises);
+            switch (mode) {
+                case GetServicePrincipal.withPermissions:
+                    servicePrincipal.appRoleAssignments = permissions[0].value;
+                    servicePrincipal.oauth2PermissionGrants = permissions[1].value;
+                    break;
+                case GetServicePrincipal.withPermissionDefinitions:
+                    servicePrincipal.oauth2PermissionScopes = permissions[0].value;
+                    servicePrincipal.appRoles = permissions[1].value;
+                    break;
+            }
+            return servicePrincipal;
+        });
+    }
+    getServicePrincipalPermissions(servicePrincipal, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Resolving permissions for the service principal...`);
+            }
+            const apiPermissions = [];
+            // hash table for resolving resource IDs to names
+            const resourceLookup = {};
+            // list of service principals for which to load permissions
+            const servicePrincipalsToResolve = [];
+            const appRoleAssignments = servicePrincipal.appRoleAssignments;
+            apiPermissions.push(...appRoleAssignments.map(appRoleAssignment => {
+                // store resource name for resolving OAuth2 grants
+                resourceLookup[appRoleAssignment.resourceId] = appRoleAssignment.resourceDisplayName;
+                // add to the list of service principals to load to get the app role
+                // display name
+                if (!servicePrincipalsToResolve.find(r => r.id === appRoleAssignment.resourceId)) {
+                    servicePrincipalsToResolve.push({ id: appRoleAssignment.resourceId });
+                }
+                return {
+                    resource: appRoleAssignment.resourceDisplayName,
+                    // we store the app role ID temporarily and will later resolve to display name
+                    permission: appRoleAssignment.appRoleId,
+                    type: 'Application'
+                };
+            }));
+            const oauth2Grants = servicePrincipal.oauth2PermissionGrants;
+            oauth2Grants.forEach(oauth2Grant => {
+                var _a;
+                // see if we can resolve the resource name from the resources
+                // retrieved from app role assignments
+                const resource = (_a = resourceLookup[oauth2Grant.resourceId]) !== null && _a !== void 0 ? _a : oauth2Grant.resourceId;
+                if (resource === oauth2Grant.resourceId &&
+                    !servicePrincipalsToResolve.find(r => r.id === oauth2Grant.resourceId)) {
+                    // resource name not found in the resources
+                    // add it to the list of resources to resolve
+                    servicePrincipalsToResolve.push({ id: oauth2Grant.resourceId });
+                }
+                const scopes = oauth2Grant.scope.split(' ');
+                scopes.forEach(scope => {
+                    apiPermissions.push({
+                        resource,
+                        permission: scope,
+                        type: 'Delegated'
+                    });
+                });
+            });
+            if (servicePrincipalsToResolve.length > 0) {
+                const servicePrincipals = yield Promise
+                    .all(servicePrincipalsToResolve
+                    .map(servicePrincipalInfo => this.getServicePrincipal(servicePrincipalInfo, logger, GetServicePrincipal.withPermissionDefinitions)));
+                servicePrincipals.forEach(servicePrincipal => {
+                    apiPermissions.forEach(apiPermission => {
+                        var _a, _b;
+                        if (apiPermission.resource === servicePrincipal.id) {
+                            apiPermission.resource = servicePrincipal.displayName;
+                        }
+                        if (apiPermission.resource === servicePrincipal.displayName &&
+                            apiPermission.type === 'Application') {
+                            apiPermission.permission = (_b = (_a = servicePrincipal.appRoles
+                                .find(appRole => appRole.id === apiPermission.permission)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : apiPermission.permission;
+                        }
+                    });
+                });
+            }
+            return apiPermissions;
+        });
+    }
+    getAppRegistration(appId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving Azure AD application registration ${appId}`);
+            }
+            const options = {
+                appId: appId,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield cli_1.Cli.executeCommandWithOutput(appGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            if (this.debug) {
+                logger.logToStderr(output.stderr);
+            }
+            return JSON.parse(output.stdout);
+        });
+    }
+    getAppRegPermissions(appId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const application = yield this.getAppRegistration(appId, logger);
+            if (application.requiredResourceAccess.length === 0) {
+                return [];
+            }
+            const servicePrincipalsToResolve = application.requiredResourceAccess
+                .map(resourceAccess => {
+                return {
+                    appId: resourceAccess.resourceAppId
+                };
+            });
+            const servicePrincipals = yield Promise
+                .all(servicePrincipalsToResolve.map(servicePrincipalInfo => this.getServicePrincipal(servicePrincipalInfo, logger, GetServicePrincipal.withPermissionDefinitions)));
+            const apiPermissions = [];
+            application.requiredResourceAccess.forEach(requiredResourceAccess => {
+                var _a;
+                const servicePrincipal = servicePrincipals
+                    .find(servicePrincipal => (servicePrincipal === null || servicePrincipal === void 0 ? void 0 : servicePrincipal.appId) === requiredResourceAccess.resourceAppId);
+                const resourceName = (_a = servicePrincipal === null || servicePrincipal === void 0 ? void 0 : servicePrincipal.displayName) !== null && _a !== void 0 ? _a : requiredResourceAccess.resourceAppId;
+                requiredResourceAccess.resourceAccess.forEach(permission => {
+                    apiPermissions.push({
+                        resource: resourceName,
+                        permission: this.getPermissionName(permission.id, permission.type, servicePrincipal),
+                        type: permission.type === 'Role' ? 'Application' : 'Delegated'
+                    });
+                });
+            });
+            return apiPermissions;
+        });
+    }
+    getPermissionName(permissionId, permissionType, servicePrincipal) {
+        var _a, _b, _c, _d;
+        if (!servicePrincipal) {
+            return permissionId;
+        }
+        switch (permissionType) {
+            case 'Role':
+                return (_b = (_a = servicePrincipal.appRoles
+                    .find(appRole => appRole.id === permissionId)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : permissionId;
+            case 'Scope':
+                return (_d = (_c = servicePrincipal.oauth2PermissionScopes
+                    .find(permissionScope => permissionScope.id === permissionId)) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : permissionId;
+        }
+        /* c8 ignore next 4 */
+        // permissionType is either 'Scope' or 'Role' but we need a safe default
+        // to avoid building errors. This code will never be reached.
+        return permissionId;
+    }
+}
+module.exports = new AppPermissionListCommand();
+//# sourceMappingURL=permission-list.js.map

package/dist/m365/app/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'app';
+exports.default = {
+    PERMISSION_LIST: `${prefix} permission list`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/base/AppCommand.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const cli_1 = require("../../cli");
+const Command_1 = require("../../Command");
+const utils_1 = require("../../utils");
+class AppCommand extends Command_1.default {
+    get resource() {
+        return 'https://graph.microsoft.com';
+    }
+    action(logger, args, cb) {
+        const m365rcJsonPath = '.m365rc.json';
+        if (!fs.existsSync(m365rcJsonPath)) {
+            return cb(new Command_1.CommandError(`Could not find file: ${m365rcJsonPath}`));
+        }
+        try {
+            const m365rcJsonContents = fs.readFileSync(m365rcJsonPath, 'utf8');
+            if (!m365rcJsonContents) {
+                return cb(new Command_1.CommandError(`File ${m365rcJsonPath} is empty`));
+            }
+            this.m365rcJson = JSON.parse(m365rcJsonContents);
+        }
+        catch (e) {
+            return cb(new Command_1.CommandError(`Could not parse file: ${m365rcJsonPath}`));
+        }
+        if (!this.m365rcJson.apps ||
+            this.m365rcJson.apps.length === 0) {
+            return cb(new Command_1.CommandError(`No Azure AD apps found in ${m365rcJsonPath}`));
+        }
+        if (args.options.appId) {
+            if (!this.m365rcJson.apps.some(app => app.appId === args.options.appId)) {
+                return cb(new Command_1.CommandError(`App ${args.options.appId} not found in ${m365rcJsonPath}`));
+            }
+            this.appId = args.options.appId;
+            return super.action(logger, args, cb);
+        }
+        if (this.m365rcJson.apps.length === 1) {
+            this.appId = this.m365rcJson.apps[0].appId;
+            return super.action(logger, args, cb);
+        }
+        if (this.m365rcJson.apps.length > 1) {
+            cli_1.Cli.prompt({
+                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
+                type: 'list',
+                choices: this.m365rcJson.apps.map((app, i) => {
+                    return {
+                        name: `${app.name} (${app.appId})`,
+                        value: i
+                    };
+                }),
+                default: 0,
+                name: 'appIdIndex'
+            }, (result) => {
+                this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
+                super.action(logger, args, cb);
+            });
+        }
+    }
+    options() {
+        const options = [
+            {
+                option: '--appId [appId]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+exports.default = AppCommand;
+//# sourceMappingURL=AppCommand.js.map

package/dist/m365/base/SpoCommand.js

@@ -11,8 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../Auth");
 const Command_1 = require("../../Command");
-const config_1 = require("../../config");
-const request_1 = require("../../request");
 const csomDefs = require('../../../csom.json');
 class SpoCommand extends Command_1.default {
     /**
@@ -60,16 +58,6 @@ class SpoCommand extends Command_1.default {
     getExcludedOptionsWithUrls() {
         return undefined;
     }
-    getRequestDigest(siteUrl) {
-        const requestOptions = {
-            url: `${siteUrl}/_api/contextinfo`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
-    }
     processOptions(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const namesOfOptionsWithUrls = this.getNamesOfOptionsWithUrls();
@@ -91,234 +79,6 @@ class SpoCommand extends Command_1.default {
             }
         });
     }
-    static isValidSharePointUrl(url) {
-        if (!url) {
-            return false;
-        }
-        if (url.indexOf('https://') !== 0) {
-            return `${url} is not a valid SharePoint Online site URL`;
-        }
-        else {
-            return true;
-        }
-    }
-    ensureFormDigest(siteUrl, logger, context, debug) {
-        return new Promise((resolve, reject) => {
-            if (this.isValidFormDigest(context)) {
-                if (debug) {
-                    logger.logToStderr('Existing form digest still valid');
-                }
-                resolve(context);
-                return;
-            }
-            this
-                .getRequestDigest(siteUrl)
-                .then((res) => {
-                const now = new Date();
-                now.setSeconds(now.getSeconds() + res.FormDigestTimeoutSeconds - 5);
-                context = {
-                    FormDigestValue: res.FormDigestValue,
-                    FormDigestTimeoutSeconds: res.FormDigestTimeoutSeconds,
-                    FormDigestExpiresAt: now,
-                    WebFullUrl: res.WebFullUrl
-                };
-                resolve(context);
-            }, (error) => {
-                reject(error);
-            });
-        });
-    }
-    isValidFormDigest(contextInfo) {
-        if (!contextInfo) {
-            return false;
-        }
-        const now = new Date();
-        if (contextInfo.FormDigestValue && now < contextInfo.FormDigestExpiresAt) {
-            return true;
-        }
-        return false;
-    }
-    waitUntilFinished(operationId, siteUrl, resolve, reject, logger, currentContext, dots) {
-        this
-            .ensureFormDigest(siteUrl, logger, currentContext, this.debug)
-            .then((res) => {
-            currentContext = res;
-            if (this.debug) {
-                logger.logToStderr(`Checking if operation ${operationId} completed...`);
-            }
-            if (!this.debug && this.verbose) {
-                dots += '.';
-                process.stdout.write(`\r${dots}`);
-            }
-            const requestOptions = {
-                url: `${siteUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': currentContext.FormDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="188" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="184" Name="${operationId.replace(/\\n/g, '&#xA;').replace(/"/g, '')}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                reject(response.ErrorInfo.ErrorMessage);
-            }
-            else {
-                const operation = json[json.length - 1];
-                const isComplete = operation.IsComplete;
-                if (isComplete) {
-                    if (!this.debug && this.verbose) {
-                        process.stdout.write('\n');
-                    }
-                    resolve();
-                    return;
-                }
-                setTimeout(() => {
-                    this.waitUntilFinished(JSON.stringify(operation._ObjectIdentity_), siteUrl, resolve, reject, logger, currentContext, dots);
-                }, operation.PollingInterval);
-            }
-        });
-    }
-    waitUntilCopyJobFinished(copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, dots) {
-        const requestUrl = `${siteUrl}/_api/site/GetCopyJobProgress`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: { "copyJobInfo": copyJobInfo },
-            responseType: 'json'
-        };
-        if (!this.debug && this.verbose) {
-            dots += '.';
-            process.stdout.write(`\r${dots}`);
-        }
-        request_1.default
-            .post(requestOptions)
-            .then((resp) => {
-            if (this.debug) {
-                logger.logToStderr('getCopyJobProgress response...');
-                logger.logToStderr(resp);
-            }
-            for (const item of resp.Logs) {
-                const log = JSON.parse(item);
-                // reject if progress error
-                if (log.Event === "JobError" || log.Event === "JobFatalError") {
-                    return reject(log.Message);
-                }
-            }
-            // two possible scenarios
-            // job done = success promise returned
-            // job in progress = recursive call using setTimeout returned
-            if (resp.JobState === 0) {
-                // job done
-                if (this.verbose) {
-                    process.stdout.write('\n');
-                }
-                resolve();
-            }
-            else {
-                setTimeout(() => {
-                    this.waitUntilCopyJobFinished(copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, dots);
-                }, pollingInterval);
-            }
-        });
-    }
-    getSpoUrl(logger, debug) {
-        if (Auth_1.default.service.spoUrl) {
-            if (debug) {
-                logger.logToStderr(`SPO URL previously retrieved ${Auth_1.default.service.spoUrl}. Returning...`);
-            }
-            return Promise.resolve(Auth_1.default.service.spoUrl);
-        }
-        return new Promise((resolve, reject) => {
-            if (debug) {
-                logger.logToStderr(`No SPO URL available. Retrieving from MS Graph...`);
-            }
-            const requestOptions = {
-                url: `https://graph.microsoft.com/v1.0/sites/root?$select=webUrl`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                Auth_1.default.service.spoUrl = res.webUrl;
-                return Auth_1.default.storeConnectionInfo();
-            })
-                .then(() => {
-                resolve(Auth_1.default.service.spoUrl);
-            }, (err) => {
-                if (Auth_1.default.service.spoUrl) {
-                    resolve(Auth_1.default.service.spoUrl);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
-    }
-    getSpoAdminUrl(logger, debug) {
-        return new Promise((resolve, reject) => {
-            this
-                .getSpoUrl(logger, debug)
-                .then((spoUrl) => {
-                resolve(spoUrl.replace(/(https:\/\/)([^\.]+)(.*)/, '$1$2-admin$3'));
-            }, (error) => {
-                reject(error);
-            });
-        });
-    }
-    getTenantId(logger, debug) {
-        if (Auth_1.default.service.tenantId) {
-            if (debug) {
-                logger.logToStderr(`SPO Tenant ID previously retrieved ${Auth_1.default.service.tenantId}. Returning...`);
-            }
-            return Promise.resolve(Auth_1.default.service.tenantId);
-        }
-        return new Promise((resolve, reject) => {
-            if (debug) {
-                logger.logToStderr(`No SPO Tenant ID available. Retrieving...`);
-            }
-            let spoAdminUrl = '';
-            this
-                .getSpoAdminUrl(logger, debug)
-                .then((_spoAdminUrl) => {
-                spoAdminUrl = _spoAdminUrl;
-                return this.getRequestDigest(spoAdminUrl);
-            })
-                .then((contextInfo) => {
-                const tenantInfoRequestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': contextInfo.FormDigestValue,
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(tenantInfoRequestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                Auth_1.default.service.tenantId = json[json.length - 1]._ObjectIdentity_.replace('\n', '&#xA;');
-                return Auth_1.default.storeConnectionInfo();
-            })
-                .then(() => {
-                resolve(Auth_1.default.service.tenantId);
-            }, (err) => {
-                if (Auth_1.default.service.tenantId) {
-                    resolve(Auth_1.default.service.tenantId);
-                }
-                else {
-                    reject(err);
-                }
-            });
-        });
-    }
     validateUnknownOptions(options, csomObject, csomPropertyType) {
         const unknownOptions = this.getUnknownOptions(options);
         const optionNames = Object.getOwnPropertyNames(unknownOptions);
@@ -337,26 +97,6 @@ class SpoCommand extends Command_1.default {
         }
         return true;
     }
-    /**
-     * Combines base and relative url considering any missing slashes
-     * @param baseUrl https://contoso.com
-     * @param relativeUrl sites/abc
-     */
-    urlCombine(baseUrl, relativeUrl) {
-        // remove last '/' of base if exists
-        if (baseUrl.lastIndexOf('/') === baseUrl.length - 1) {
-            baseUrl = baseUrl.substring(0, baseUrl.length - 1);
-        }
-        // remove '/' at 0
-        if (relativeUrl.charAt(0) === '/') {
-            relativeUrl = relativeUrl.substring(1, relativeUrl.length);
-        }
-        // remove last '/' of next if exists
-        if (relativeUrl.lastIndexOf('/') === relativeUrl.length - 1) {
-            relativeUrl = relativeUrl.substring(0, relativeUrl.length - 1);
-        }
-        return `${baseUrl}/${relativeUrl}`;
-    }
     action(logger, args, cb) {
         Auth_1.default
             .restoreAuth()

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

@@ -2,8 +2,9 @@
 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 utils_1 = require("../../../utils");
 const commands_1 = require("../commands");
 const packageJSON = require('../../../../package.json');
 class CliDoctorCommand extends Command_1.default {
@@ -30,9 +31,10 @@ class CliDoctorCommand extends Command_1.default {
             cliVersion: packageJSON.version,
             nodeVersion: process.version,
             cliAadAppId: Auth_1.default.service.appId,
-            cliAadAppTenant: Utils_1.default.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
+            cliAadAppTenant: utils_1.validation.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
         };