@pnp/cli-microsoft365 6.11.0-beta.6b1d864 → 6.11.0-beta.b75e15f

package/dist/m365/spfx/commands/project/project-doctor/{doctor-1.18.0-beta.1.js → doctor-1.18.0-beta.5.js}

@@ -20,4 +20,4 @@ module.exports = [
     new FN002016_DEVDEP_types_react_dom_1.FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler_1.FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.5'])
 ];
-//# sourceMappingURL=doctor-1.18.0-beta.1.js.map
+//# sourceMappingURL=doctor-1.18.0-beta.5.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -78,7 +78,7 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.2.js

@@ -105,7 +105,7 @@ module.exports = [
                 'fixWith': 'symbol'
               },
               'Function': {
-                'message': 'The \\'Function\\' type accepts any function-like value.\nIt provides no type safety when calling the function, which can be a common source of bugs.\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \'new\'.\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
+                'message': 'The \\'Function\\' type accepts any function-like value.\\nIt provides no type safety when calling the function, which can be a common source of bugs.\\nIt also accepts things like class declarations, which will throw at runtime as they will not be called with \\'new\\'.\\nIf you are expecting the function to accept certain arguments, you should explicitly define the function shape.'
               }
             }
           }

package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.18.0-beta.1.js → upgrade-1.18.0-beta.5.js}

@@ -29,33 +29,33 @@ const FN002023_DEVDEP_microsoft_eslint_config_spfx_1 = require("./rules/FN002023
 const FN010001_YORC_version_1 = require("./rules/FN010001_YORC_version");
 const FN010010_YORC_sdkVersions_teams_js_1 = require("./rules/FN010010_YORC_sdkVersions_teams_js");
 module.exports = [
-    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.1'),
-    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.1'),
-    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.1'),
-    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.1'),
-    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.1'),
-    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.1'),
-    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.1'),
-    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.1'),
+    new FN001001_DEP_microsoft_sp_core_library_1.FN001001_DEP_microsoft_sp_core_library('1.18.0-beta.5'),
+    new FN001002_DEP_microsoft_sp_lodash_subset_1.FN001002_DEP_microsoft_sp_lodash_subset('1.18.0-beta.5'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core_1.FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.18.0-beta.5'),
+    new FN001004_DEP_microsoft_sp_webpart_base_1.FN001004_DEP_microsoft_sp_webpart_base('1.18.0-beta.5'),
+    new FN001011_DEP_microsoft_sp_dialog_1.FN001011_DEP_microsoft_sp_dialog('1.18.0-beta.5'),
+    new FN001012_DEP_microsoft_sp_application_base_1.FN001012_DEP_microsoft_sp_application_base('1.18.0-beta.5'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility_1.FN001014_DEP_microsoft_sp_listview_extensibility('1.18.0-beta.5'),
+    new FN001021_DEP_microsoft_sp_property_pane_1.FN001021_DEP_microsoft_sp_property_pane('1.18.0-beta.5'),
     new FN001022_DEP_office_ui_fabric_react_1.FN001022_DEP_office_ui_fabric_react('', false),
-    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.1'),
-    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.1'),
-    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.1'),
-    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.1'),
-    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.18.0-beta.1'),
-    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.1'),
-    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.18.0-beta.1'),
-    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.1'),
-    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.1'),
+    new FN001023_DEP_microsoft_sp_component_base_1.FN001023_DEP_microsoft_sp_component_base('1.18.0-beta.5'),
+    new FN001024_DEP_microsoft_sp_diagnostics_1.FN001024_DEP_microsoft_sp_diagnostics('1.18.0-beta.5'),
+    new FN001025_DEP_microsoft_sp_dynamic_data_1.FN001025_DEP_microsoft_sp_dynamic_data('1.18.0-beta.5'),
+    new FN001026_DEP_microsoft_sp_extension_base_1.FN001026_DEP_microsoft_sp_extension_base('1.18.0-beta.5'),
+    new FN001027_DEP_microsoft_sp_http_1.FN001027_DEP_microsoft_sp_http('1.18.0-beta.5'),
+    new FN001028_DEP_microsoft_sp_list_subscription_1.FN001028_DEP_microsoft_sp_list_subscription('1.18.0-beta.5'),
+    new FN001029_DEP_microsoft_sp_loader_1.FN001029_DEP_microsoft_sp_loader('1.18.0-beta.5'),
+    new FN001030_DEP_microsoft_sp_module_interfaces_1.FN001030_DEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN001031_DEP_microsoft_sp_odata_types_1.FN001031_DEP_microsoft_sp_odata_types('1.18.0-beta.5'),
+    new FN001032_DEP_microsoft_sp_page_context_1.FN001032_DEP_microsoft_sp_page_context('1.18.0-beta.5'),
     new FN001035_DEP_fluentui_react_1.FN001035_DEP_fluentui_react('8.106.4'),
-    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.18.0-beta.1'),
-    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.1'),
-    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.1'),
-    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.1'),
-    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.1'),
-    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.1'),
-    new FN010001_YORC_version_1.FN010001_YORC_version('1.18.0-beta.1'),
+    new FN001013_DEP_microsoft_decorators_1.FN001013_DEP_microsoft_decorators('1.18.0-beta.5'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base_1.FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.18.0-beta.5'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.18.0-beta.5'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx_1.FN002023_DEVDEP_microsoft_eslint_config_spfx('1.18.0-beta.5'),
+    new FN002001_DEVDEP_microsoft_sp_build_web_1.FN002001_DEVDEP_microsoft_sp_build_web('1.18.0-beta.5'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces_1.FN002002_DEVDEP_microsoft_sp_module_interfaces('1.18.0-beta.5'),
+    new FN010001_YORC_version_1.FN010001_YORC_version('1.18.0-beta.5'),
     new FN010010_YORC_sdkVersions_teams_js_1.FN010010_YORC_sdkVersions_teams_js('2.12.0')
 ];
-//# sourceMappingURL=upgrade-1.18.0-beta.1.js.map
+//# sourceMappingURL=upgrade-1.18.0-beta.5.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -82,7 +82,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.17.2',
             '1.17.3',
             '1.17.4',
-            '1.18.0-beta.1'
+            '1.18.0-beta.5'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);

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

@@ -535,14 +535,14 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.0-beta.1': {
+            '1.18.0-beta.5': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '>=16.13.0 <17.0.0',
-                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                    range: '>=16.14.0 <17.0.0',
+                    fix: 'Install Node.js >=16.14.0 <17.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -1,16 +1,34 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpoAppBaseCommand = void 0;
 const request_1 = require("../../../../request");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (args.options.appCatalogScope === 'sitecollection') {
-                return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
+                // trim trailing slashes if there are any
+                const appCatalogUrl = args.options.appCatalogUrl.replace(/\/$/, '');
+                const appCatalogUrlChunks = appCatalogUrl.split('/');
+                // Trim the last part of the URL if it ends on '/appcatalog', but don't trim it if the site URL is called like that (/sites/appcatalog).
+                if (appCatalogUrl.toLowerCase().endsWith('/appcatalog') && appCatalogUrlChunks.length !== 5) {
+                    return appCatalogUrl.substring(0, appCatalogUrl.lastIndexOf('/'));
+                }
             }
             if (args.options.appCatalogUrl) {
-                return resolve(args.options.appCatalogUrl);
+                return args.options.appCatalogUrl.replace(/\/$/, '');
+            }
+            if (this.verbose) {
+                logger.logToStderr('Getting tenant app catalog url...');
             }
             const requestOptions = {
                 url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
@@ -19,17 +37,11 @@ class SpoAppBaseCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                if (res.CorporateCatalogUrl) {
-                    return resolve(res.CorporateCatalogUrl);
-                }
-                reject('Tenant app catalog is not configured.');
-            })
-                .catch((err) => {
-                reject(err);
-            });
+            const response = yield request_1.default.get(requestOptions);
+            if (response.CorporateCatalogUrl) {
+                return response.CorporateCatalogUrl;
+            }
+            throw new Error('Tenant app catalog is not configured.');
         });
     }
 }

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

@@ -33,6 +33,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     constructor() {
         super();
         _SpoAppAddCommand_instances.add(this);
+        this.appCatalogScopeOptions = ['tenant', 'sitecollection'];
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
@@ -75,9 +76,9 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            overwrite: (!(!args.options.overwrite)).toString(),
+            overwrite: !!args.options.overwrite,
             appCatalogScope: args.options.appCatalogScope || 'tenant',
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
+            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined'
         });
     });
 }, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
@@ -85,7 +86,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
         option: '-p, --filePath <filePath>'
     }, {
         option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
+        autocomplete: this.appCatalogScopeOptions
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
@@ -93,14 +94,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     });
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
         if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
+            const appCatalogScope = args.options.appCatalogScope.toLowerCase();
+            if (this.appCatalogScopeOptions.indexOf(appCatalogScope) === -1) {
+                return `${args.options.appCatalogScope} is not a valid appCatalogScope. Allowed values are: ${this.appCatalogScopeOptions.join(', ')}`;
             }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
+            if (appCatalogScope === 'sitecollection' && !args.options.appCatalogUrl) {
+                return `You must specify appCatalogUrl when appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);

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

@@ -21,6 +21,12 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+var OrgAssetType;
+(function (OrgAssetType) {
+    OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
+    OrgAssetType[OrgAssetType["OfficeTemplateLibrary"] = 2] = "OfficeTemplateLibrary";
+    OrgAssetType[OrgAssetType["OfficeFontLibrary"] = 4] = "OfficeFontLibrary";
+})(OrgAssetType || (OrgAssetType = {}));
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.ORGASSETSLIBRARY_ADD;
@@ -42,6 +48,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             const cdnType = cdnTypeString === 'Private' ? 1 : 0;
             const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
             try {
+                const orgAssetType = this.getOrgAssetType(args.options.orgAssetType);
                 spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
@@ -49,7 +56,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" 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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">${orgAssetType}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -63,12 +70,23 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             }
         });
     }
+    getOrgAssetType(orgAssetType) {
+        switch (orgAssetType) {
+            case 'OfficeTemplateLibrary':
+                return OrgAssetType.OfficeTemplateLibrary;
+            case 'OfficeFontLibrary':
+                return OrgAssetType.OfficeFontLibrary;
+            default:
+                return OrgAssetType.ImageDocumentLibrary;
+        }
+    }
 }
 _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.cdnType || 'Private',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined'
+            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
+            orgAssetType: args.options.orgAssetType
         });
     });
 }, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
@@ -78,7 +96,10 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: SpoOrgAssetsLibraryAddCommand.cdnTypes
+    }, {
+        option: '--orgAssetType [orgAssetType]',
+        autocomplete: SpoOrgAssetsLibraryAddCommand.orgAssetTypes
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -86,8 +107,16 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
+        if (args.options.cdnType && SpoOrgAssetsLibraryAddCommand.cdnTypes.indexOf(args.options.cdnType) < 0) {
+            return `${args.options.cdnType} is not a valid value for cdnType. Valid values are ${SpoOrgAssetsLibraryAddCommand.cdnTypes.join(', ')}`;
+        }
+        if (args.options.orgAssetType && SpoOrgAssetsLibraryAddCommand.orgAssetTypes.indexOf(args.options.orgAssetType) < 0) {
+            return `${args.options.orgAssetType} is not a valid value for orgAssetType. Valid values are ${SpoOrgAssetsLibraryAddCommand.orgAssetTypes.join(', ')}`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.libraryUrl);
     }));
 };
+SpoOrgAssetsLibraryAddCommand.orgAssetTypes = ['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary'];
+SpoOrgAssetsLibraryAddCommand.cdnTypes = ['Public', 'Private'];
 module.exports = new SpoOrgAssetsLibraryAddCommand();
 //# sourceMappingURL=orgassetslibrary-add.js.map

package/dist/m365/spo/commands/site/site-ensure.js

@@ -16,14 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initTypes, _SpoSiteEnsureCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const spoWebGetCommand = require("../web/web-get");
 const SharingCapabilities_1 = require("./SharingCapabilities");
-const spoSiteAddCommand = require("./site-add");
-const spoSiteSetCommand = require("./site-set");
+const spo_1 = require("../../../../utils/spo");
 class SpoSiteEnsureCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.SITE_ENSURE;
@@ -42,10 +39,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const res = yield this.ensureSite(logger, args);
-                if (this.debug) {
-                    logger.logToStderr(res.stderr);
-                }
-                logger.log(res.stdout);
+                logger.log(res);
                 if (this.verbose) {
                     logger.logToStderr(chalk.green('DONE'));
                 }
@@ -63,9 +57,9 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             }
             catch (err) {
                 if (this.debug) {
-                    logger.logToStderr(err.stderr);
+                    logger.logToStderr(err);
                 }
-                if (err.error.message !== '404 FILE NOT FOUND') {
+                if (err.error !== '404 FILE NOT FOUND') {
                     throw err;
                 }
                 if (this.verbose) {
@@ -74,12 +68,15 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 return this.createSite(args, logger);
             }
             if (this.debug) {
-                logger.logToStderr(getWebOutput.stderr);
+                logger.logToStderr(getWebOutput);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site found at ${args.options.url}. Checking if site matches conditions...`);
             }
-            const web = JSON.parse(getWebOutput.stdout);
+            const web = {
+                Configuration: getWebOutput.Configuration,
+                WebTemplate: getWebOutput.WebTemplate
+            };
             if (args.options.type) {
                 // type was specified so we need to check if the existing site matches
                 // it. If not, we throw an error and stop
@@ -112,51 +109,20 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         });
     }
     getWeb(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Checking if site ${args.options.url} exists...`);
-        }
-        const options = {
-            url: args.options.url,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Checking if site ${args.options.url} exists...`);
+            }
+            return yield spo_1.spo.getWeb(args.options.url, logger, this.verbose);
+        });
     }
     createSite(args, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Creating site...`);
             }
-            const options = {
-                type: args.options.type,
-                title: args.options.title,
-                alias: args.options.alias,
-                description: args.options.description,
-                classification: args.options.classification,
-                isPublic: args.options.isPublic,
-                lcid: args.options.lcid,
-                url: typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url,
-                owners: args.options.owners,
-                shareByEmailEnabled: args.options.shareByEmailEnabled,
-                siteDesign: args.options.siteDesign,
-                siteDesignId: args.options.siteDesignId,
-                timeZone: args.options.timeZone,
-                webTemplate: args.options.webTemplate,
-                resourceQuota: args.options.resourceQuota,
-                resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
-                storageQuota: args.options.storageQuota,
-                storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
-                removeDeletedSite: args.options.removeDeletedSite,
-                wait: args.options.wait,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            const validationResult = yield spoSiteAddCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteAddCommand));
-            if (validationResult !== true) {
-                throw validationResult;
-            }
-            return Cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const url = typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url;
+            return yield spo_1.spo.addSite(args.options.title, logger, this.verbose, args.options.wait, args.options.type, args.options.alias, args.options.description, args.options.owners, args.options.shareByEmailEnabled, args.options.removeDeletedSite, args.options.classification, args.options.isPublic, args.options.lcid, url, args.options.siteDesign, args.options.siteDesignId, args.options.timeZone, args.options.webTemplate, args.options.resourceQuota, args.options.resourceQuotaWarningLevel, args.options.storageQuota, args.options.storageQuotaWarningLevel);
         });
     }
     updateSite(args, logger) {
@@ -164,24 +130,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Updating site...`);
             }
-            const options = {
-                classification: args.options.classification,
-                disableFlows: args.options.disableFlows,
-                isPublic: args.options.isPublic,
-                owners: args.options.owners,
-                shareByEmailEnabled: args.options.shareByEmailEnabled,
-                siteDesignId: args.options.siteDesignId,
-                title: args.options.title,
-                url: args.options.url,
-                sharingCapability: args.options.sharingCapability,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            const validationResult = yield spoSiteSetCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteSetCommand));
-            if (validationResult !== true) {
-                throw validationResult;
-            }
-            return Cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return yield spo_1.spo.updateSite(args.options.url, logger, this.verbose, args.options.title, args.options.classification, args.options.disableFlows, args.options.isPublic, args.options.owners, args.options.shareByEmailEnabled, args.options.siteDesignId, args.options.sharingCapability);
         });
     }
     /**

package/dist/utils/aadGroup.js

@@ -71,6 +71,26 @@ exports.aadGroup = {
             }
             return groups[0].id;
         });
+    },
+    setGroup(id, isPrivate, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (verbose && logger) {
+                logger.logToStderr(`Updating Microsoft 365 Group ${id}...`);
+            }
+            const update = {};
+            if (typeof isPrivate !== 'undefined') {
+                update.visibility = isPrivate ? 'Private' : 'Public';
+            }
+            const requestOptions = {
+                url: `${graphResource}/v1.0/groups/${id}`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: update
+            };
+            yield request_1.default.patch(requestOptions);
+        });
     }
 };
 //# sourceMappingURL=aadGroup.js.map

package/dist/utils/spo.js

@@ -20,6 +20,8 @@ const request_1 = require("../request");
 const formatting_1 = require("./formatting");
 const odata_1 = require("./odata");
 const RoleType_1 = require("../m365/spo/commands/roledefinition/RoleType");
+const aadGroup_1 = require("./aadGroup");
+const SharingCapabilities_1 = require("../m365/spo/commands/site/SharingCapabilities");
 exports.spo = {
     getRequestDigest(siteUrl) {
         const requestOptions = {
@@ -702,6 +704,604 @@ exports.spo = {
             roledefinition.RoleTypeKindValue = RoleType_1.RoleType[roledefinition.RoleTypeKind];
             return roledefinition;
         });
+    },
+    /**
+    * Adds a SharePoint site.
+    * @param type Type of sites to add. Allowed values TeamSite, CommunicationSite, ClassicSite, default TeamSite
+    * @param title Site title
+    * @param alias Site alias, used in the URL and in the team site group e-mail (applies to type TeamSite)
+    * @param url Site URL (applies to type CommunicationSite, ClassicSite)
+    * @param timeZone Integer representing time zone to use for the site (applies to type ClassicSite)
+    * @param description Site description
+    * @param lcid Site language in the LCID format
+    * @param owners Comma-separated list of users to set as site owners (applies to type TeamSite, ClassicSite)
+    * @param isPublic Determines if the associated group is public or not (applies to type TeamSite)
+    * @param classification Site classification (applies to type TeamSite, CommunicationSite)
+    * @param siteDesignType of communication site to create. Allowed values Topic, Showcase, Blank, default Topic. When creating a communication site, specify either siteDesign or siteDesignId (applies to type CommunicationSite)
+    * @param siteDesignId Id of the custom site design to use to create the site. When creating a communication site, specify either siteDesign or siteDesignId (applies to type CommunicationSite)
+    * @param shareByEmailEnabled Determines whether it's allowed to share file with guests (applies to type CommunicationSite)
+    * @param webTemplate Template to use for creating the site. Default `STS#0` (applies to type ClassicSite)
+    * @param resourceQuota The quota for this site collection in Sandboxed Solutions units. Default 0 (applies to type ClassicSite)
+    * @param resourceQuotaWarningLevel The warning level for the resource quota. Default 0 (applies to type ClassicSite)
+    * @param storageQuota The storage quota for this site collection in megabytes. Default 100 (applies to type ClassicSite)
+    * @param storageQuotaWarningLevel The warning level for the storage quota in megabytes. Default 100 (applies to type ClassicSite)
+    * @param removeDeletedSite Set, to remove existing deleted site with the same URL from the Recycle Bin (applies to type ClassicSite)
+    * @param wait Wait for the site to be provisioned before completing the command (applies to type ClassicSite)
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    */
+    addSite(title, logger, verbose, wait, type, alias, description, owners, shareByEmailEnabled, removeDeletedSite, classification, isPublic, lcid, url, siteDesign, siteDesignId, timeZone, webTemplate, resourceQuota, resourceQuotaWarningLevel, storageQuota, storageQuotaWarningLevel) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (type === 'ClassicSite') {
+                const spoAdminUrl = yield exports.spo.getSpoAdminUrl(logger, verbose);
+                let context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+                let exists;
+                if (removeDeletedSite) {
+                    exists = yield exports.spo.siteExists(url, logger, verbose);
+                }
+                else {
+                    // assume site doesn't exist
+                    exists = false;
+                }
+                if (exists) {
+                    if (verbose) {
+                        logger.logToStderr('Site exists in the recycle bin');
+                    }
+                    yield exports.spo.deleteSiteFromTheRecycleBin(url, logger, verbose, wait);
+                }
+                else {
+                    if (verbose) {
+                        logger.logToStderr('Site not found');
+                    }
+                }
+                context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, context, verbose);
+                if (verbose) {
+                    logger.logToStderr(`Creating site collection ${url}...`);
+                }
+                const lcidOption = typeof lcid === 'number' ? lcid : 1033;
+                const storageQuotaOption = typeof storageQuota === 'number' ? storageQuota : 100;
+                const storageQuotaWarningLevelOption = typeof storageQuotaWarningLevel === 'number' ? storageQuotaWarningLevel : 100;
+                const resourceQuotaOption = typeof resourceQuota === 'number' ? resourceQuota : 0;
+                const resourceQuotaWarningLevelOption = typeof resourceQuotaWarningLevel === 'number' ? resourceQuotaWarningLevel : 0;
+                const webTemplateOption = webTemplate || 'STS#0';
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': context.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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcidOption}</Property><Property Name="Owner" Type="String">${formatting_1.formatting.escapeXml(owners)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuotaOption}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevelOption}</Property><Property Name="Template" Type="String">${formatting_1.formatting.escapeXml(webTemplateOption)}</Property><Property Name="TimeZoneId" Type="Int32">${timeZone}</Property><Property Name="Title" Type="String">${formatting_1.formatting.escapeXml(title)}</Property><Property Name="Url" Type="String">${formatting_1.formatting.escapeXml(url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuotaOption}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevelOption}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const operation = json[json.length - 1];
+                    const isComplete = operation.IsComplete;
+                    if (!wait || isComplete) {
+                        return;
+                    }
+                    yield new Promise((resolve, reject) => {
+                        setTimeout(() => {
+                            exports.spo.waitUntilFinished({
+                                operationId: JSON.stringify(operation._ObjectIdentity_),
+                                siteUrl: spoAdminUrl,
+                                resolve,
+                                reject,
+                                logger,
+                                currentContext: context,
+                                verbose: verbose,
+                                debug: verbose
+                            });
+                        }, operation.PollingInterval);
+                    });
+                }
+            }
+            else {
+                const isTeamSite = type !== 'CommunicationSite';
+                const spoUrl = yield exports.spo.getSpoUrl(logger, verbose);
+                if (verbose) {
+                    logger.logToStderr(`Creating new site...`);
+                }
+                let requestOptions = {};
+                if (isTeamSite) {
+                    requestOptions = {
+                        url: `${spoUrl}/_api/GroupSiteManager/CreateGroupEx`,
+                        headers: {
+                            'content-type': 'application/json; odata=verbose; charset=utf-8',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            displayName: title,
+                            alias: alias,
+                            isPublic: isPublic,
+                            optionalParams: {
+                                Description: description || '',
+                                CreationOptions: {
+                                    results: [],
+                                    Classification: classification || ''
+                                }
+                            }
+                        }
+                    };
+                    if (lcid) {
+                        requestOptions.data.optionalParams.CreationOptions.results.push(`SPSiteLanguage:${lcid}`);
+                    }
+                    if (owners) {
+                        requestOptions.data.optionalParams.Owners = {
+                            results: owners.split(',').map(o => o.trim())
+                        };
+                    }
+                }
+                else {
+                    if (siteDesignId) {
+                        siteDesignId = siteDesignId;
+                    }
+                    else {
+                        if (siteDesign) {
+                            switch (siteDesign) {
+                                case 'Topic':
+                                    siteDesignId = '00000000-0000-0000-0000-000000000000';
+                                    break;
+                                case 'Showcase':
+                                    siteDesignId = '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+                                    break;
+                                case 'Blank':
+                                    siteDesignId = 'f6cc5403-0d63-442e-96c0-285923709ffc';
+                                    break;
+                            }
+                        }
+                        else {
+                            siteDesignId = '00000000-0000-0000-0000-000000000000';
+                        }
+                    }
+                    requestOptions = {
+                        url: `${spoUrl}/_api/SPSiteManager/Create`,
+                        headers: {
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            request: {
+                                Title: title,
+                                Url: url,
+                                ShareByEmailEnabled: shareByEmailEnabled,
+                                Description: description || '',
+                                Classification: classification || '',
+                                WebTemplate: 'SITEPAGEPUBLISHING#0',
+                                SiteDesignId: siteDesignId
+                            }
+                        }
+                    };
+                    if (lcid) {
+                        requestOptions.data.request.Lcid = lcid;
+                    }
+                    if (owners) {
+                        requestOptions.data.request.Owner = owners;
+                    }
+                }
+                const res = yield request_1.default.post(requestOptions);
+                if (isTeamSite) {
+                    if (res.ErrorMessage !== null) {
+                        throw res.ErrorMessage;
+                    }
+                    else {
+                        return res.SiteUrl;
+                    }
+                }
+                else {
+                    if (res.SiteStatus === 2) {
+                        return res.SiteUrl;
+                    }
+                    else {
+                        throw 'An error has occurred while creating the site';
+                    }
+                }
+            }
+        });
+    },
+    /**
+    * Checks if a site exists
+    * Returns a boolean
+    * @param url The url of the site
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    */
+    siteExists(url, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoAdminUrl = yield exports.spo.getSpoAdminUrl(logger, verbose);
+            const context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+            if (verbose) {
+                logger.logToStderr(`Checking if the site ${url} exists...`);
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': context.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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const res1 = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res1);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                if (response.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
+                    return yield this.siteExistsInTheRecycleBin(url, logger, verbose);
+                }
+                else {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+            }
+            else {
+                const site = json[json.length - 1];
+                return site.Status === 'Recycled';
+            }
+        });
+    },
+    /**
+    * Checks if a site exists in the recycle bin
+    * Returns a boolean
+    * @param url The url of the site
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    */
+    siteExistsInTheRecycleBin(url, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (verbose) {
+                logger.logToStderr(`Site doesn't exist. Checking if the site ${url} exists in the recycle bin...`);
+            }
+            const spoAdminUrl = yield exports.spo.getSpoAdminUrl(logger, verbose);
+            const context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': context.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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                if (response.ErrorInfo.ErrorTypeName === 'Microsoft.SharePoint.Client.UnknownError') {
+                    return false;
+                }
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            const site = json[json.length - 1];
+            return site.Status === 'Recycled';
+        });
+    },
+    /**
+    * Deletes a site from the recycle bin
+    * @param url The url of the site
+    * @param logger the Logger object
+    * @param verbose set if verbose logging should be logged
+    * @param wait set to wait until finished
+    */
+    deleteSiteFromTheRecycleBin(url, logger, verbose, wait) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const spoAdminUrl = yield exports.spo.getSpoAdminUrl(logger, verbose);
+            const context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+            if (verbose) {
+                logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': context.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="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+            const operation = json[json.length - 1];
+            const isComplete = operation.IsComplete;
+            if (!wait || isComplete) {
+                return;
+            }
+            yield new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    exports.spo.waitUntilFinished({
+                        operationId: JSON.stringify(operation._ObjectIdentity_),
+                        siteUrl: spoAdminUrl,
+                        resolve,
+                        reject,
+                        logger,
+                        currentContext: context,
+                        verbose: verbose,
+                        debug: verbose
+                    });
+                }, operation.PollingInterval);
+            });
+        });
+    },
+    /**
+     * Updates a site with the given properties
+     * @param url The url of the site
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     * @param title The new title
+     * @param classification The classification to be updated
+     * @param disableFlows If flows should be disabled or not
+     * @param isPublic If site should be public or private
+     * @param owners The owners to be updated
+     * @param shareByEmailEnabled If share by e-mail should be enabled or not
+     * @param siteDesignId The site design to be updated
+     * @param sharingCapability The sharing capability to be updated
+     */
+    updateSite(url, logger, verbose, title, classification, disableFlows, isPublic, owners, shareByEmailEnabled, siteDesignId, sharingCapability) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const tenantId = yield exports.spo.getTenantId(logger, verbose);
+            const spoAdminUrl = yield exports.spo.getSpoAdminUrl(logger, verbose);
+            let context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, undefined, verbose);
+            if (verbose) {
+                logger.logToStderr('Loading site IDs...');
+            }
+            const requestOptions = {
+                url: `${url}/_api/site?$select=GroupId,Id`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const siteInfo = yield request_1.default.get(requestOptions);
+            const groupId = siteInfo.GroupId;
+            const siteId = siteInfo.Id;
+            const isGroupConnectedSite = groupId !== '00000000-0000-0000-0000-000000000000';
+            if (verbose) {
+                logger.logToStderr(`Retrieved site IDs. siteId: ${siteId}, groupId: ${groupId}`);
+            }
+            if (isGroupConnectedSite) {
+                if (verbose) {
+                    logger.logToStderr(`Site attached to group ${groupId}`);
+                }
+                if (typeof title !== 'undefined' &&
+                    typeof isPublic !== 'undefined' &&
+                    typeof owners !== 'undefined') {
+                    const promises = [];
+                    if (typeof title !== 'undefined') {
+                        const requestOptions = {
+                            url: `${spoAdminUrl}/_api/SPOGroup/UpdateGroupPropertiesBySiteId`,
+                            headers: {
+                                accept: 'application/json;odata=nometadata',
+                                'content-type': 'application/json;charset=utf-8',
+                                'X-RequestDigest': context.FormDigestValue
+                            },
+                            data: {
+                                groupId: groupId,
+                                siteId: siteId,
+                                displayName: title
+                            },
+                            responseType: 'json'
+                        };
+                        promises.push(request_1.default.post(requestOptions));
+                    }
+                    if (typeof isPublic !== 'undefined') {
+                        promises.push(aadGroup_1.aadGroup.setGroup(groupId, (isPublic === false), logger, verbose));
+                    }
+                    if (typeof owners !== 'undefined') {
+                        promises.push(exports.spo.setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose));
+                    }
+                    yield Promise.all(promises);
+                }
+            }
+            else {
+                if (verbose) {
+                    logger.logToStderr('Site is not group connected');
+                }
+                if (typeof isPublic !== 'undefined') {
+                    throw `The isPublic option can't be set on a site that is not groupified`;
+                }
+                if (owners) {
+                    yield Promise.all(owners.split(',').map((o) => __awaiter(this, void 0, void 0, function* () {
+                        yield exports.spo.setSiteAdmin(spoAdminUrl, context, url, o.trim());
+                    })));
+                }
+            }
+            context = yield exports.spo.ensureFormDigest(spoAdminUrl, logger, context, verbose);
+            if (verbose) {
+                logger.logToStderr(`Updating site ${url} properties...`);
+            }
+            let updatedProperties = false;
+            if (!isGroupConnectedSite) {
+                if (title !== undefined) {
+                    updatedProperties = true;
+                }
+            }
+            else {
+                if (classification !== undefined || disableFlows !== undefined || shareByEmailEnabled !== undefined || sharingCapability !== undefined) {
+                    updatedProperties = true;
+                }
+            }
+            if (updatedProperties) {
+                let propertyId = 27;
+                const payload = [];
+                if (!isGroupConnectedSite) {
+                    if (title) {
+                        payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting_1.formatting.escapeXml(title)}</Parameter></SetProperty>`);
+                    }
+                }
+                if (typeof classification === 'string') {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting_1.formatting.escapeXml(classification)}</Parameter></SetProperty>`);
+                }
+                if (typeof disableFlows !== 'undefined') {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${disableFlows}</Parameter></SetProperty>`);
+                }
+                if (typeof shareByEmailEnabled !== 'undefined') {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${shareByEmailEnabled}</Parameter></SetProperty>`);
+                }
+                if (sharingCapability) {
+                    const sharingCapabilityOption = SharingCapabilities_1.SharingCapabilities[sharingCapability];
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapabilityOption}</Parameter></SetProperty>`);
+                }
+                const pos = tenantId.indexOf('|') + 1;
+                const requestOptionsUpdateProperties = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': context.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>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${tenantId.substr(pos, tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting_1.formatting.encodeQueryParameter(url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptionsUpdateProperties);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const operation = json[json.length - 1];
+                    const isComplete = operation.IsComplete;
+                    if (!isComplete) {
+                        yield new Promise((resolve, reject) => {
+                            setTimeout(() => {
+                                exports.spo.waitUntilFinished({
+                                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                                    siteUrl: spoAdminUrl,
+                                    resolve,
+                                    reject,
+                                    logger,
+                                    currentContext: context,
+                                    verbose: verbose,
+                                    debug: verbose
+                                });
+                            }, operation.PollingInterval);
+                        });
+                    }
+                }
+            }
+            if (siteDesignId) {
+                yield exports.spo.applySiteDesign(siteDesignId, url, logger, verbose);
+            }
+        });
+    },
+    /**
+     * Updates the groupified site owners
+     * @param spoAdminUrl The SharePoint admin url
+     * @param groupId The ID of the group
+     * @param owners The owners to be updated
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    setGroupifiedSiteOwners(spoAdminUrl, groupId, owners, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const splittedOwners = owners.split(',').map(o => o.trim());
+            if (verbose) {
+                logger.logToStderr('Retrieving user information to set group owners...');
+            }
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/users?$filter=${splittedOwners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions)
+                .then((res) => {
+                if (res.value.length === 0) {
+                    return Promise.resolve();
+                }
+                return Promise.all(res.value.map(user => {
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
+                        headers: {
+                            'content-type': 'application/json;odata=verbose'
+                        }
+                    };
+                    return request_1.default.post(requestOptions);
+                }));
+            });
+        });
+    },
+    /**
+     * Updates the site admin
+     * @param spoAdminUrl The SharePoint admin url
+     * @param context The FormDigestInfo
+     * @param siteUrl The url of the site where the owners has to be updated
+     * @param principal The principal of the admin
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    setSiteAdmin(spoAdminUrl, context, siteUrl, principal, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (verbose && logger) {
+                logger.logToStderr(`Updating site admin ${principal} on ${siteUrl}...`);
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': context.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="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            else {
+                return;
+            }
+        });
+    },
+    /**
+     * Applies a site design
+     * @param id The ID of the site design (GUID)
+     * @param webUrl The url of the site where the design should be applied
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    applySiteDesign(id, webUrl, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (verbose) {
+                logger.logToStderr(`Applying site design ${id}...`);
+            }
+            const spoUrl = yield exports.spo.getSpoUrl(logger, verbose);
+            const requestOptions = {
+                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.ApplySiteDesign`,
+                headers: {
+                    'content-type': 'application/json;charset=utf-8',
+                    accept: 'application/json;odata=nometadata'
+                },
+                data: {
+                    siteDesignId: id,
+                    webUrl: webUrl
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    },
+    /**
+     * Gets the web properties for a given url
+     * @param url The url of the web
+     * @param logger The logger object
+     * @param verbose Set for verbose logging
+     */
+    getWeb(url, logger, verbose) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (verbose && logger) {
+                logger.logToStderr(`Getting the web properties for ${url}`);
+            }
+            const requestOptions = {
+                url: `${url}/_api/web`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const webProperties = yield request_1.default.get(requestOptions);
+            return webProperties;
+        });
     }
 };
 //# sourceMappingURL=spo.js.map

package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-add.mdx

@@ -16,11 +16,14 @@ m365 spo orgassetslibrary add [options]
 `--libraryUrl <libraryUrl>`
 : The URL of the library to promote.
 
-`--thumbnailUrl <thumbnailUrl>`
+`--thumbnailUrl [thumbnailUrl]`
 : The URL of the thumbnail to render.
 
 `--cdnType [cdnType]`
 : Specifies the CDN type. Allowed values `Public`, `Private`. Default `Private`.
+
+`--orgAssetType [orgAssetType]`
+: Specifies the type of organizational library. Allowed values `ImageDocumentLibrary`, `OfficeTemplateLibrary`, `OfficeFontLibrary`. Defaults to `ImageDocumentLibrary`.
 ```
 
 <Global />
@@ -33,6 +36,10 @@ To use this command you have to have permissions to access the tenant admin site
 
 :::
 
+To enable CDN in your tenant use the [spo cdn set](../cdn/cdn-set.mdx) command.
+
+The document library on which you run the command must at least have read permissions for all users, except external users.
+
 ## Examples
 
 Promotes an existing library to become an organization assets library
@@ -47,6 +54,12 @@ Promotes an existing library to become an organization assets library with Thumb
 m365 spo orgassetslibrary --libraryUrl "https://contoso.sharepoint.com/SiteAssets" --thumbnailUrl "https://contoso.sharepoint.com/assets/logo.png"
 ```
 
+Promotes an existing library to become an organization assets Office template library
+
+```sh
+m365 spo orgassetslibrary add --libraryUrl "https://contoso.sharepoint.com/SiteAssets" --orgAssetType "OfficeTemplateLibrary"
+```
+
 ## Response
 
 The command won't return a response on success.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.11.0-beta.6b1d864",
+  "version": "6.11.0-beta.b75e15f",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",