@pnp/cli-microsoft365 6.0.0-beta.c561c1f → 6.0.0-beta.c5ce305

package/dist/m365/spo/commands/theme/theme-remove.js

@@ -1,4 +1,13 @@
 "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");
@@ -6,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoThemeRemoveCommand_instances, _SpoThemeRemoveCommand_initTelemetry, _SpoThemeRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeRemoveCommand extends SpoCommand_1.default {
@@ -24,46 +33,45 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes existing theme';
     }
-    commandAction(logger, args, cb) {
-        const removeTheme = () => {
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((spoAdminUrl) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing theme from tenant...`);
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_api/thememanager/DeleteTenantTheme`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    data: {
-                        name: args.options.name
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeTheme();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the theme`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeTheme = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing theme from tenant...`);
+                    }
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_api/thememanager/DeleteTenantTheme`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        data: {
+                            name: args.options.name
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeTheme();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeTheme();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the theme`
+                });
+                if (result.continue) {
+                    yield removeTheme();
+                }
+            }
+        });
     }
 }
 _SpoThemeRemoveCommand_instances = new WeakSet(), _SpoThemeRemoveCommand_initTelemetry = function _SpoThemeRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/theme/theme-set.js

@@ -17,7 +17,9 @@ var _SpoThemeSetCommand_instances, _SpoThemeSetCommand_initTelemetry, _SpoThemeS
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeSetCommand extends SpoCommand_1.default {
@@ -34,40 +36,37 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Add or update a theme';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            const palette = JSON.parse(args.options.theme);
-            if (this.debug) {
-                logger.logToStderr('');
-                logger.logToStderr('Palette');
-                logger.logToStderr(JSON.stringify(palette));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const palette = JSON.parse(args.options.theme);
+                if (this.debug) {
+                    logger.logToStderr('');
+                    logger.logToStderr('Palette');
+                    logger.logToStderr(JSON.stringify(palette));
+                }
+                const isInverted = args.options.isInverted ? true : false;
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': res.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><ObjectPath Id="10" ObjectPathId="9" /><Method Name="UpdateTenantTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${formatting_1.formatting.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/></ObjectPaths></Request>`
+                };
+                const processQuery = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(processQuery);
+                const contents = json.find(x => { return x['ErrorInfo']; });
+                if (contents && contents.ErrorInfo) {
+                    throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+                }
+                return Promise.resolve();
             }
-            const isInverted = args.options.isInverted ? true : false;
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.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><ObjectPath Id="10" ObjectPathId="9" /><Method Name="UpdateTenantTheme" Id="11" ObjectPathId="9"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${utils_1.formatting.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const contents = json.find(x => { return x['ErrorInfo']; });
-            if (contents && contents.ErrorInfo) {
-                return Promise.reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            return Promise.resolve();
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoThemeSetCommand_instances = new WeakSet(), _SpoThemeSetCommand_initTelemetry = function _SpoThemeSetCommand_initTelemetry() {
@@ -86,7 +85,7 @@ _SpoThemeSetCommand_instances = new WeakSet(), _SpoThemeSetCommand_initTelemetry
     });
 }, _SpoThemeSetCommand_initValidators = function _SpoThemeSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidTheme(args.options.theme)) {
+        if (!validation_1.validation.isValidTheme(args.options.theme)) {
             return 'The specified theme is not valid';
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserGetCommand extends SpoCommand_1.default {
@@ -34,34 +34,37 @@ class SpoUserGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets a site user within specific web';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${encodeURIComponent(args.options.id)}')`;
-        }
-        else if (args.options.email) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${encodeURIComponent(args.options.email)}')`;
-        }
-        else if (args.options.loginName) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${encodeURIComponent(args.options.loginName)}')`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((userInstance) => {
-            logger.log(userInstance);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${encodeURIComponent(args.options.id)}')`;
+            }
+            else if (args.options.email) {
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${encodeURIComponent(args.options.email)}')`;
+            }
+            else if (args.options.loginName) {
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${encodeURIComponent(args.options.loginName)}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const userInstance = yield request_1.default.get(requestOptions);
+                logger.log(userInstance);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry = function _SpoUserGetCommand_initTelemetry() {
@@ -88,7 +91,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
             typeof args.options.id !== 'number') {
             return `Specified id ${args.options.id} is not a number`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
     this.optionSets.push(['id', 'email', 'loginName']);

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserListCommand_instances, _SpoUserListCommand_initOptions, _SpoUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserListCommand extends SpoCommand_1.default {
@@ -35,26 +35,29 @@ class SpoUserListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'LoginName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving users from web ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        requestUrl = `${args.options.webUrl}/_api/web/siteusers`;
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((users) => {
-            logger.log(users.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving users from web ${args.options.webUrl}...`);
+            }
+            let requestUrl = '';
+            requestUrl = `${args.options.webUrl}/_api/web/siteusers`;
+            const requestOptions = {
+                url: requestUrl,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const users = yield request_1.default.get(requestOptions);
+                logger.log(users.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoUserListCommand_instances = new WeakSet(), _SpoUserListCommand_initOptions = function _SpoUserListCommand_initOptions() {
@@ -62,7 +65,7 @@ _SpoUserListCommand_instances = new WeakSet(), _SpoUserListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoUserListCommand_initValidators = function _SpoUserListCommand_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 SpoUserListCommand();
 //# sourceMappingURL=user-list.js.map

package/dist/m365/spo/commands/user/user-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserRemoveCommand extends SpoCommand_1.default {
@@ -35,47 +35,48 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes user from specific web';
     }
-    commandAction(logger, args, cb) {
-        const removeUser = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing user from  subsite ${args.options.webUrl} ...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
-            }
-            if (args.options.loginName) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${encodeURIComponent(args.options.loginName)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeUser();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeUser = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing user from  subsite ${args.options.webUrl} ...`);
+                }
+                let requestUrl = '';
+                if (args.options.id) {
+                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
+                }
+                if (args.options.loginName) {
+                    requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${encodeURIComponent(args.options.loginName)}')`;
                 }
-                else {
-                    removeUser();
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeUser();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield removeUser();
+                }
+            }
+        });
     }
 }
 _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
@@ -98,7 +99,7 @@ _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelem
     });
 }, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
     this.optionSets.push(['id', 'loginName']);

package/dist/m365/spo/commands/userprofile/userprofile-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileGetCommand_instances, _SpoUserProfileGetCommand_initOptions, _SpoUserProfileGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserProfileGetCommand extends SpoCommand_1.default {
@@ -32,29 +33,29 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets user profile property for a SharePoint user';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const userName = `i:0#.f|membership|${args.options.userName}`;
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            // in text mode, reformat properties for readability
-            if (!args.options.output ||
-                args.options.output === 'text') {
-                res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const userName = `i:0#.f|membership|${args.options.userName}`;
+                const requestOptions = {
+                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/GetPropertiesFor(accountName=@v)?@v='${encodeURIComponent(`${userName}`)}'`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (!args.options.output ||
+                    args.options.output === 'text') {
+                    res.UserProfileProperties = JSON.stringify(res.UserProfileProperties);
+                }
+                logger.log(res);
             }
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoUserProfileGetCommand_instances = new WeakSet(), _SpoUserProfileGetCommand_initOptions = function _SpoUserProfileGetCommand_initOptions() {
@@ -63,7 +64,7 @@ _SpoUserProfileGetCommand_instances = new WeakSet(), _SpoUserProfileGetCommand_i
     });
 }, _SpoUserProfileGetCommand_initValidators = function _SpoUserProfileGetCommand_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 `${args.options.userName} is not a valid user principal name`;
         }
         return true;

package/dist/m365/spo/commands/userprofile/userprofile-set.js

@@ -1,4 +1,13 @@
 "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");
@@ -7,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoUserProfileSetCommand_instances, _SpoUserProfileSetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserProfileSetCommand extends SpoCommand_1.default {
@@ -22,41 +31,40 @@ class SpoUserProfileSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets user profile property for a SharePoint user';
     }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());
-            let propertyType = 'SetSingleValueProfileProperty';
-            const data = {
-                accountName: `i:0#.f|membership|${args.options.userName}`,
-                propertyName: args.options.propertyName
-            };
-            if (propertyValue.length > 1) {
-                propertyType = 'SetMultiValuedProfileProperty';
-                data.propertyValues = [...propertyValue];
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoUrl);
+                const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());
+                let propertyType = 'SetSingleValueProfileProperty';
+                const data = {
+                    accountName: `i:0#.f|membership|${args.options.userName}`,
+                    propertyName: args.options.propertyName
+                };
+                if (propertyValue.length > 1) {
+                    propertyType = 'SetMultiValuedProfileProperty';
+                    data.propertyValues = [...propertyValue];
+                }
+                else {
+                    data.propertyValue = propertyValue[0];
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/${propertyType}`,
+                    headers: {
+                        'Accept': 'application/json;odata=nometadata',
+                        'Content-type': 'application/json;odata=verbose',
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else {
-                data.propertyValue = propertyValue[0];
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.UserProfiles.PeopleManager/${propertyType}`,
-                headers: {
-                    'Accept': 'application/json;odata=nometadata',
-                    'Content-type': 'application/json;odata=verbose',
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: data,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoUserProfileSetCommand_instances = new WeakSet(), _SpoUserProfileSetCommand_initOptions = function _SpoUserProfileSetCommand_initOptions() {