@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadOAuth2GrantListCommand_instances, _AadOAuth2GrantListCommand_initOptions, _AadOAuth2GrantListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantListCommand extends GraphCommand_1.default {
@@ -65,7 +65,7 @@ _AadOAuth2GrantListCommand_instances = new WeakSet(), _AadOAuth2GrantListCommand
     });
 }, _AadOAuth2GrantListCommand_initValidators = function _AadOAuth2GrantListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.spObjectId)) {
+        if (!validation_1.validation.isValidGuid(args.options.spObjectId)) {
             return `${args.options.spObjectId} is not a valid GUID`;
         }
         return true;

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadOAuth2GrantRemoveCommand_instances, _AadOAuth2GrantRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -55,7 +55,7 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
                 yield removeOauth2Grant();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/aad/commands/siteclassification/siteclassification-disable.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadSiteClassificationDisableCommand_instances, _AadSiteClassificationDisableCommand_initTelemetry, _AadSiteClassificationDisableCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -75,7 +75,7 @@ class AadSiteClassificationDisableCommand extends GraphCommand_1.default {
                 yield disableSiteClassification();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators, _AadSpAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadSpAddCommand extends GraphCommand_1.default {
@@ -107,10 +107,10 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
     });
 }, _AadSpAddCommand_initValidators = function _AadSpAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid objectId GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadSpGetCommand extends GraphCommand_1.default {
@@ -107,10 +107,10 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators, _AadUserGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserGetCommand extends GraphCommand_1.default {
@@ -96,7 +96,7 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
 }, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/user/user-guest-add.js

@@ -0,0 +1,103 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadUserGuestAddCommand_instances, _AadUserGuestAddCommand_initTelemetry, _AadUserGuestAddCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserGuestAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserGuestAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.USER_GUEST_ADD;
+    }
+    get description() {
+        return 'Invite an external user to the organization';
+    }
+    defaultProperties() {
+        return ['id', 'inviteRedeemUrl', 'invitedUserDisplayName', 'invitedUserEmailAddress', 'invitedUserType', 'resetRedemption', 'sendInvitationMessage', 'status'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/invitations`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        invitedUserEmailAddress: args.options.emailAddress,
+                        inviteRedirectUrl: args.options.inviteRedirectUrl || 'https://myapplications.microsoft.com',
+                        invitedUserDisplayName: args.options.displayName,
+                        sendInvitationMessage: args.options.sendInvitationMessage,
+                        invitedUserMessageInfo: {
+                            customizedMessageBody: args.options.welcomeMessage,
+                            messageLanguage: args.options.messageLanguage || 'en-US',
+                            ccRecipients: args.options.ccRecipients ? this.mapEmailsToRecipients([args.options.ccRecipients]) : undefined
+                        }
+                    }
+                };
+                const result = yield request_1.default.post(requestOptions);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    mapEmailsToRecipients(emails) {
+        return emails.map(mail => ({
+            emailAddress: {
+                address: mail.trim()
+            }
+        }));
+    }
+}
+_AadUserGuestAddCommand_instances = new WeakSet(), _AadUserGuestAddCommand_initTelemetry = function _AadUserGuestAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            inviteRedirectUrl: typeof args.options.inviteRedirectUrl !== 'undefined',
+            welcomeMessage: typeof args.options.welcomeMessage !== 'undefined',
+            messageLanguage: typeof args.options.messageLanguage !== 'undefined',
+            ccRecipients: typeof args.options.ccRecipients !== 'undefined',
+            sendInvitationMessage: !!args.options.sendInvitationMessage
+        });
+    });
+}, _AadUserGuestAddCommand_initOptions = function _AadUserGuestAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--emailAddress <emailAddress>'
+    }, {
+        option: '--displayName [displayName]'
+    }, {
+        option: '--inviteRedirectUrl [inviteRedirectUrl]'
+    }, {
+        option: '--welcomeMessage [welcomeMessage]'
+    }, {
+        option: '--messageLanguage [messageLanguage]'
+    }, {
+        option: '--ccRecipients [ccRecipients]'
+    }, {
+        option: '--sendInvitationMessage'
+    });
+};
+module.exports = new AadUserGuestAddCommand();
+//# sourceMappingURL=user-guest-add.js.map

package/dist/m365/aad/commands/user/user-hibp.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserHibpCommand_instances, _AadUserHibpCommand_initTelemetry, _AadUserHibpCommand_initOptions, _AadUserHibpCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class AadUserHibpCommand extends AnonymousCommand_1.default {
@@ -74,7 +74,7 @@ _AadUserHibpCommand_instances = new WeakSet(), _AadUserHibpCommand_initTelemetry
     });
 }, _AadUserHibpCommand_initValidators = function _AadUserHibpCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (!validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return 'Specify valid userName';
         }
         return true;

package/dist/m365/aad/commands/user/user-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserListCommand_instances, _AadUserListCommand_initTelemetry, _AadUserListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserListCommand extends GraphCommand_1.default {
@@ -49,7 +49,7 @@ class AadUserListCommand extends GraphCommand_1.default {
                 }
                 const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.user' : 'users';
                 const url = `${this.resource}/v1.0/${endpoint}?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
-                const users = yield utils_1.odata.getAllItems(url);
+                const users = yield odata_1.odata.getAllItems(url);
                 logger.log(users);
             }
             catch (err) {

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators, _AadUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserSetCommand extends GraphCommand_1.default {
@@ -98,7 +98,7 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
 }, _AadUserSetCommand_initValidators = function _AadUserSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.objectId &&
-            !utils_1.validation.isValidGuid(args.options.objectId)) {
+            !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/user/user-signin-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserSigninListCommand_instances, _AadUserSigninListCommand_initTelemetry, _AadUserSigninListCommand_initOptions, _AadUserSigninListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadUserSigninListCommand extends GraphCommand_1.default {
@@ -52,7 +53,7 @@ class AadUserSigninListCommand extends GraphCommand_1.default {
                         `appDisplayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
                 }
                 endpoint += filter;
-                const signins = yield utils_1.odata.getAllItems(endpoint);
+                const signins = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(signins);
             }
             catch (err) {
@@ -88,10 +89,10 @@ _AadUserSigninListCommand_instances = new WeakSet(), _AadUserSigninListCommand_i
         if (args.options.appId && args.options.appDisplayName) {
             return 'Specify either appId or appDisplayName, but not both';
         }
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands.js

@@ -54,6 +54,7 @@ exports.default = {
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     USER_GET: `${prefix} user get`,
+    USER_GUEST_ADD: `${prefix} user guest add`,
     USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const AadAppGetCommand = require("../../aad/commands/app/app-get");
 const AppCommand_1 = require("../../base/AppCommand");
 const commands_1 = require("../commands");
@@ -29,7 +29,7 @@ class AppGetCommand extends AppCommand_1.default {
                 verbose: args.options.verbose
             };
             try {
-                const appGetOutput = yield cli_1.Cli.executeCommandWithOutput(AadAppGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                const appGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadAppGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
                 if (this.verbose) {
                     logger.logToStderr(appGetOutput.stderr);
                 }

package/dist/m365/app/commands/app-open.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const settingsNames_1 = require("../../../settingsNames");
 const AppCommand_1 = require("../../base/AppCommand");
 const commands_1 = require("../commands");
@@ -46,7 +46,7 @@ class AppOpenCommand extends AppCommand_1.default {
         return new Promise((resolve, reject) => {
             const previewPrefix = args.options.preview === true ? "preview." : "";
             const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
-            if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+            if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 logger.log(`Use a web browser to open the page ${url}`);
                 return resolve();
             }

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const appGetCommand = require("../../../aad/commands/app/app-get");
 const AppCommand_1 = require("../../../base/AppCommand");
@@ -207,7 +207,7 @@ class AppPermissionListCommand extends AppCommand_1.default {
                 debug: this.debug,
                 verbose: this.verbose
             };
-            const output = yield cli_1.Cli.executeCommandWithOutput(appGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const output = yield Cli_1.Cli.executeCommandWithOutput(appGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
             if (this.debug) {
                 logger.logToStderr(output.stderr);
             }

package/dist/m365/base/AppCommand.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
-const cli_1 = require("../../cli");
+const Cli_1 = require("../../cli/Cli");
 const Command_1 = require("../../Command");
-const utils_1 = require("../../utils");
+const validation_1 = require("../../utils/validation");
 class AppCommand extends Command_1.default {
     constructor() {
         super();
@@ -67,7 +67,7 @@ class AppCommand extends Command_1.default {
                 return _super.action.call(this, logger, args);
             }
             if (this.m365rcJson.apps.length > 1) {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield 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) => {
@@ -90,7 +90,7 @@ _AppCommand_instances = new WeakSet(), _AppCommand_initOptions = function _AppCo
     this.options.unshift({ option: '--appId [appId]' });
 }, _AppCommand_initValidators = function _AppCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
         return true;

package/dist/m365/booking/commands/business/business-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class BookingBusinessListCommand extends GraphCommand_1.default {
@@ -26,7 +26,7 @@ class BookingBusinessListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = `${this.resource}/v1.0/solutions/bookingBusinesses`;
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {

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

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../Auth");
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const Command_1 = require("../../../Command");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const commands_1 = require("../commands");
 const packageJSON = require('../../../../package.json');
 class CliDoctorCommand extends Command_1.default {
@@ -41,10 +41,10 @@ class CliDoctorCommand extends Command_1.default {
                 cliVersion: packageJSON.version,
                 nodeVersion: process.version,
                 cliAadAppId: Auth_1.default.service.appId,
-                cliAadAppTenant: utils_1.validation.isValidGuid(Auth_1.default.service.tenant) ? 'single' : Auth_1.default.service.tenant,
+                cliAadAppTenant: validation_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,
+                cliConfig: Cli_1.Cli.getInstance().config.all,
                 roles: roles,
                 scopes: scopes
             };

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const config_1 = require("../../../config");
 const settingsNames_1 = require("../../../settingsNames");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
@@ -24,7 +24,7 @@ class CliReconsentCommand extends AnonymousCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `https://login.microsoftonline.com/${config_1.default.tenant}/oauth2/authorize?client_id=${config_1.default.cliAadAppId}&response_type=code&prompt=admin_consent`;
-            if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+            if (Cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
                 logger.log(`To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to ${url}`);
                 return;
             }

package/dist/m365/cli/commands/config/config-get.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliConfigGetCommand_instances, _CliConfigGetCommand_initTelemetry, _CliConfigGetCommand_initOptions, _CliConfigGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const settingsNames_1 = require("../../../../settingsNames");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -35,7 +35,7 @@ class CliConfigGetCommand extends AnonymousCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            logger.log(cli_1.Cli.getInstance().config.get(args.options.key));
+            logger.log(Cli_1.Cli.getInstance().config.get(args.options.key));
         });
     }
 }

package/dist/m365/cli/commands/config/config-reset.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliConfigResetCommand_instances, _CliConfigResetCommand_initTelemetry, _CliConfigResetCommand_initOptions, _CliConfigResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const settingsNames_1 = require("../../../../settingsNames");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -36,10 +36,10 @@ class CliConfigResetCommand extends AnonymousCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.key) {
-                cli_1.Cli.getInstance().config.delete(args.options.key);
+                Cli_1.Cli.getInstance().config.delete(args.options.key);
             }
             else {
-                cli_1.Cli.getInstance().config.clear();
+                Cli_1.Cli.getInstance().config.clear();
             }
         });
     }

package/dist/m365/cli/commands/config/config-set.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _CliConfigSetCommand_instances, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const settingsNames_1 = require("../../../../settingsNames");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -50,7 +50,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                     value = args.options.value;
                     break;
             }
-            cli_1.Cli.getInstance().config.set(args.options.key, value);
+            Cli_1.Cli.getInstance().config.set(args.options.key, value);
         });
     }
 }

package/dist/m365/commands/status.js

@@ -11,7 +11,7 @@ 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 utils_1 = require("../../utils");
+const accessToken_1 = require("../../utils/accessToken");
 const commands_1 = require("./commands");
 class StatusCommand extends Command_1.default {
     get name() {
@@ -35,14 +35,19 @@ class StatusCommand extends Command_1.default {
                 }
                 if (this.debug) {
                     logger.logToStderr({
-                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
                         authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
                         accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
                     });
                 }
                 else {
                     logger.log({
-                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant
                     });
                 }
             }

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

@@ -19,7 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const url = require("url");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const GraphCommand_1 = require("../../base/GraphCommand");
 const commands_1 = require("../commands");
 class FileAddCommand extends GraphCommand_1.default {
@@ -257,12 +257,12 @@ _FileAddCommand_instances = new WeakSet(), _FileAddCommand_initTelemetry = funct
             return `Specified source file ${args.options.sourceFile} doesn't exist`;
         }
         if (args.options.siteUrl) {
-            const isValidSiteUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            const isValidSiteUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
             if (isValidSiteUrl !== true) {
                 return isValidSiteUrl;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.folderUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.folderUrl);
     }));
 };
 module.exports = new FileAddCommand();

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FileListCommand_instances, _FileListCommand_initTelemetry, _FileListCommand_initOptions, _FileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const odata_1 = require("../../../utils/odata");
+const validation_1 = require("../../../utils/validation");
 const GraphCommand_1 = require("../../base/GraphCommand");
 const commands_1 = require("../commands");
 class FileListCommand extends GraphCommand_1.default {
@@ -172,7 +173,7 @@ class FileListCommand extends GraphCommand_1.default {
             .all(folderIds.map((folderId) => 
         // get items from folder. Because we can't filter out folders here
         // we need to get all items from the folder and filter them out later
-        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
+        odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
             .then(res => {
             // flatten data from all promises
             files = files.concat(...res);
@@ -192,7 +193,7 @@ _FileListCommand_instances = new WeakSet(), _FileListCommand_initTelemetry = fun
 }, _FileListCommand_initOptions = function _FileListCommand_initOptions() {
     this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-f, --folderUrl <folderUrl>' }, { option: '--recursive' });
 }, _FileListCommand_initValidators = function _FileListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new FileListCommand();
 //# sourceMappingURL=file-list.js.map