@pnp/cli-microsoft365 5.0.0-beta.fc638c4 → 5.1.0-beta.04832fc

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeGetCommand extends SpoCommand_1.default {
@@ -14,11 +14,11 @@ class SpoThemeGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             if (this.verbose) {
@@ -29,7 +29,7 @@ class SpoThemeGetCommand extends SpoCommand_1.default {
                 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="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Query Id="15" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="11" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="13" ParentId="11" Name="GetTenantTheme"><Parameters><Parameter Type="String">${Utils_1.default.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                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="12" ObjectPathId="11" /><ObjectPath Id="14" ObjectPathId="13" /><Query Id="15" ObjectPathId="13"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="11" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="13" ParentId="11" Name="GetTenantTheme"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         })

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeListCommand extends SpoCommand_1.default {
@@ -14,7 +15,7 @@ class SpoThemeListCommand extends SpoCommand_1.default {
         return ['name'];
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((spoAdminUrl) => {
             if (this.verbose) {

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeRemoveCommand extends SpoCommand_1.default {
@@ -18,7 +19,7 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const removeTheme = () => {
-            this
+            utils_1.spo
                 .getSpoAdminUrl(logger, this.debug)
                 .then((spoAdminUrl) => {
                 if (this.verbose) {

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoThemeSetCommand extends SpoCommand_1.default {
@@ -19,11 +19,11 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoAdminUrl = '';
-        this
+        utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
             spoAdminUrl = _spoAdminUrl;
-            return this.getRequestDigest(spoAdminUrl);
+            return utils_1.spo.getRequestDigest(spoAdminUrl);
         })
             .then((res) => {
             const palette = JSON.parse(args.options.theme);
@@ -38,7 +38,7 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
                 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.default.escapeXml(args.options.name)}</Parameter><Parameter Type="String">{"isInverted":${isInverted},"name":"${Utils_1.default.escapeXml(args.options.name)}","palette":${JSON.stringify(palette)}}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="9" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/></ObjectPaths></Request>`
+                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);
         })
@@ -66,7 +66,7 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidTheme(args.options.theme)) {
+        if (!utils_1.validation.isValidTheme(args.options.theme)) {
             return 'The specified theme is not valid';
         }
         return true;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserGetCommand extends SpoCommand_1.default {
@@ -77,7 +78,7 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             typeof args.options.id !== 'number') {
             return `Specified id ${args.options.id} is not a number`;
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoUserGetCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserListCommand extends SpoCommand_1.default {
@@ -44,7 +45,7 @@ class SpoUserListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoUserListCommand();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserRemoveCommand extends SpoCommand_1.default {
@@ -85,7 +86,7 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
         if (args.options.id && args.options.loginName) {
             return 'Use either id or loginName, but not both';
         }
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoUserRemoveCommand();

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserProfileGetCommand extends SpoCommand_1.default {
@@ -12,7 +12,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
         return 'Sets user profile property for a SharePoint user';
     }
     commandAction(logger, args, cb) {
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((spoUrl) => {
             const userName = `i:0#.f|membership|${args.options.userName}`;
@@ -45,7 +45,7 @@ class SpoUserProfileGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidUserPrincipalName(args.options.userName)) {
+        if (!utils_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,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoUserProfileSetCommand extends SpoCommand_1.default {
@@ -12,11 +13,11 @@ class SpoUserProfileSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         let spoUrl = '';
-        this
+        utils_1.spo
             .getSpoUrl(logger, this.debug)
             .then((_spoUrl) => {
             spoUrl = _spoUrl;
-            return this.getRequestDigest(spoUrl);
+            return utils_1.spo.getRequestDigest(spoUrl);
         })
             .then((res) => {
             const propertyValue = args.options.propertyValue.split(',').map(o => o.trim());

package/dist/m365/spo/commands/web/web-add.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -27,7 +28,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let siteInfo = null;
         let subsiteFullUrl = '';
-        this
+        utils_1.spo
             .getRequestDigest(args.options.parentWebUrl)
             .then((res) => {
             const requestOptions = {
@@ -87,7 +88,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 }
                 return Promise.reject(SpoWebAddCommand.DONE);
             }
-            return this.getRequestDigest(subsiteFullUrl);
+            return utils_1.spo.getRequestDigest(subsiteFullUrl);
         })
             .then((res) => {
             const requestOptions = {
@@ -157,7 +158,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.parentWebUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.parentWebUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/web/web-clientsidewebpart-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebClientSideWebPartListCommand extends SpoCommand_1.default {
@@ -50,7 +51,7 @@ class SpoWebClientSideWebPartListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoWebClientSideWebPartListCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebGetCommand extends SpoCommand_1.default {
@@ -47,7 +48,7 @@ class SpoWebGetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoWebGetCommand();

package/dist/m365/spo/commands/web/web-installedlanguage-list.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebInstalledLanguageListCommand extends SpoCommand_1.default {
@@ -41,7 +42,7 @@ class SpoWebInstalledLanguageListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoWebInstalledLanguageListCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebListCommand extends SpoCommand_1.default {
@@ -45,7 +46,7 @@ class SpoWebListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoWebListCommand();

package/dist/m365/spo/commands/web/web-reindex.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
-const ClientSvc_1 = require("../../ClientSvc");
 const commands_1 = require("../../commands");
 const propertybag_base_1 = require("../propertybag/propertybag-base");
 class SpoWebReindexCommand extends SpoCommand_1.default {
@@ -17,17 +17,16 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
         return 'Requests reindexing the specified subsite';
     }
     commandAction(logger, args, cb) {
-        const clientSvcCommons = new ClientSvc_1.ClientSvc(logger, this.debug);
         let requestDigest = '';
         let webIdentityResp;
-        this
+        utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((res) => {
             requestDigest = res.FormDigestValue;
             if (this.debug) {
                 logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
             }
-            return clientSvcCommons.getCurrentWebIdentity(args.options.webUrl, requestDigest);
+            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
         })
             .then((identityResp) => {
             webIdentityResp = identityResp;
@@ -37,14 +36,14 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Checking if the site is a no-script site...`);
             }
-            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.webUrl, requestDigest, webIdentityResp, clientSvcCommons);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then((isNoScriptSite) => {
             if (isNoScriptSite) {
                 if (this.verbose) {
                     logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
                 }
-                return this.reindexLists(args.options.webUrl, requestDigest, logger, webIdentityResp, clientSvcCommons);
+                return this.reindexLists(args.options.webUrl, requestDigest, logger, webIdentityResp);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
@@ -72,7 +71,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             }
         });
     }
-    reindexLists(webUrl, requestDigest, logger, webIdentityResp, clientSvcCommons) {
+    reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
         return new Promise((resolve, reject) => {
             (() => {
                 if (this.debug) {
@@ -88,7 +87,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 return request_1.default.get(requestOptions);
             })()
                 .then((lists) => {
-                const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, clientSvcCommons, logger));
+                const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
                 return Promise.all(promises);
             })
                 .then(() => {
@@ -97,7 +96,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             }, (err) => reject(err));
         });
     }
-    reindexList(list, webUrl, requestDigest, webIdentityResp, clientSvcCommons, logger) {
+    reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
         return new Promise((resolve, reject) => {
             if (list.NoCrawl) {
                 if (this.debug) {
@@ -106,7 +105,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                 resolve();
                 return;
             }
-            clientSvcCommons
+            utils_1.spo
                 .getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest)
                 .then((folderIdentityResp) => {
                 let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
@@ -128,7 +127,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoWebReindexCommand();

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebRemoveCommand extends SpoCommand_1.default {
@@ -65,7 +66,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
     }
 }
 module.exports = new SpoWebRemoveCommand();

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebSetCommand extends SpoCommand_1.default {
@@ -116,7 +117,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands.js

@@ -64,6 +64,7 @@ exports.default = {
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
+    GROUP_USER_REMOVE: `${prefix} group user remove`,
     HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
     HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
     HOMESITE_GET: `${prefix} homesite get`,
@@ -184,6 +185,7 @@ exports.default = {
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
+    SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,
     SITE_RENAME: `${prefix} site rename`,
     SITE_SET: `${prefix} site set`,

package/dist/m365/teams/commands/app/app-install.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
+const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppInstallCommand extends GraphCommand_1.default {
@@ -9,44 +11,96 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
         return commands_1.default.APP_INSTALL;
     }
     get description() {
-        return 'Installs an app from the catalog to a Microsoft Teams team';
+        return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
     }
     commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const requestOptions = {
-            url: `${endpoint}/teams/${args.options.teamId}/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+        this
+            .validateUser(args, logger)
+            .then(_ => {
+            var _a;
+            let url = `${this.resource}/v1.0`;
+            if (args.options.teamId) {
+                url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
             }
-        };
-        request_1.default
-            .post(requestOptions)
+            else {
+                url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
+            }
+            const requestOptions = {
+                url: url,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
+    // we need this method, because passing an invalid user ID to the API
+    // won't cause an error
+    validateUser(args, logger) {
+        if (!args.options.userId) {
+            return Promise.resolve(true);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Checking if user ${args.options.userId} exists...`);
+        }
+        const options = {
+            id: args.options.userId,
+            output: 'json',
+            debug: args.options.debug,
+            verbose: args.options.verbose
+        };
+        return cli_1.Cli
+            .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
+            .then((res) => {
+            if (this.verbose) {
+                logger.logToStderr(res.stderr);
+            }
+            return true;
+        }, (err) => {
+            if (this.verbose) {
+                logger.logToStderr(err.stderr);
+            }
+            return Promise.reject(`User with ID ${args.options.userId} not found. Original error: ${err.error.message}`);
+        });
+    }
     options() {
         const options = [
-            {
-                option: '--appId <appId>'
-            },
-            {
-                option: '--teamId <teamId>'
-            }
+            { option: '--appId <appId>' },
+            { option: '--teamId [teamId' },
+            { option: '--userId [userId]' },
+            { option: '--userName [userName]' }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.appId)) {
+        if (!utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (!Utils_1.default.isValidGuid(args.options.teamId)) {
+        if (!args.options.teamId &&
+            !args.options.userId &&
+            !args.options.userName) {
+            return `Specify either teamId, userId or userName`;
+        }
+        if ((args.options.teamId && args.options.userId) ||
+            (args.options.teamId && args.options.userName) ||
+            (args.options.userId && args.options.userName)) {
+            return `Specify either teamId, userId or userName but not multiple`;
+        }
+        if (args.options.teamId &&
+            !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.userId &&
+            !utils_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
         return true;
     }
 }

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

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class TeamsAppListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class TeamsAppListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.APP_LIST;
     }
@@ -76,15 +76,15 @@ class TeamsAppListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
     commandAction(logger, args, cb) {
         this
             .getEndpointUrl(args)
-            .then((endpoint) => this.getAllItems(endpoint, logger, true))
-            .then(() => {
+            .then(endpoint => utils_1.odata.getAllItems(endpoint, logger))
+            .then((items) => {
             if (args.options.teamId || args.options.teamName) {
-                this.items.forEach(t => {
+                items.forEach(t => {
                     t.displayName = t.teamsApp.displayName;
                     t.distributionMethod = t.teamsApp.distributionMethod;
                 });
             }
-            logger.log(this.items);
+            logger.log(items);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
@@ -107,7 +107,7 @@ class TeamsAppListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
         if (args.options.teamId && args.options.teamName) {
             return 'Specify either teamId or teamName, but not both.';
         }
-        if (args.options.teamId && !Utils_1.default.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;