@pnp/cli-microsoft365 10.0.0-beta.977d78b → 10.0.0-beta.a0367997

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

@@ -37,14 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand {
                 await logger.logToStderr(`Retrieving apps...`);
             }
             const apps = await odata.getAllItems(`${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`);
-            if (apps && apps.length > 0) {
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
-            }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -26,14 +26,7 @@ class SpoFeatureListCommand extends SpoCommand {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         try {
             const features = await odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
-            if (features && features.length > 0) {
-                await logger.log(features);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No activated Features found');
-                }
-            }
+            await logger.log(features);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/file/file-copy.js

@@ -27,6 +27,9 @@ class SpoFileCopyCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTypes).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['targetUrl', 'sourceUrl'];
+    }
     async commandAction(logger, args) {
         try {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
@@ -44,7 +47,8 @@ class SpoFileCopyCommand extends SpoCommand {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
                 ignoreVersionHistory: !!args.options.ignoreVersionHistory,
-                newName: newName
+                newName: newName,
+                operation: 'copy'
             });
             if (args.options.skipWait) {
                 return;

package/dist/m365/spo/commands/file/file-move.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets, _SpoFileMoveCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,41 +32,46 @@ class SpoFileMoveCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = await this.getSourcePath(logger, args.options);
+            const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
+            const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
             if (this.verbose) {
-                await logger.logToStderr(`Moving file ${sourcePath} to ${args.options.targetUrl}...`);
+                await logger.logToStderr(`Moving file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
             }
-            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
-            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                absoluteTargetPath += args.options.newName;
+            let newName = args.options.newName;
+            // Add original file extension if not provided
+            if (newName && !newName.includes('.')) {
+                newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            else {
-                // Keep the original file name
-                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                bypassSharedLock: !!args.options.bypassSharedLock,
+                includeItemPermissions: !!args.options.includeItemPermissions,
+                newName: newName,
+                operation: 'move'
+            });
+            if (args.options.skipWait) {
+                return;
             }
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the move job to complete...');
+            }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
+            if (this.verbose) {
+                await logger.logToStderr('Getting information about the destination file...');
+            }
+            // Get destination file data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFileByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFileById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: absoluteSourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: absoluteTargetPath
-                    },
-                    overwrite: args.options.nameConflictBehavior === 'replace',
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
-                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -79,17 +85,30 @@ class SpoFileMoveCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        return file.DecodedUrl;
+    }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateCopyJobsNameConflictBehavior.Fail;
+            case 'replace':
+                return CreateCopyJobsNameConflictBehavior.Replace;
+            case 'rename':
+                return CreateCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateCopyJobsNameConflictBehavior.Fail;
+        }
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
@@ -99,8 +118,9 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            retainEditorAndModified: !!args.options.retainEditorAndModified,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            includeItemPermissions: !!args.options.includeItemPermissions,
+            bypassSharedLock: !!args.options.bypassSharedLock,
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_initOptions() {
@@ -118,9 +138,11 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--retainEditorAndModified'
+        option: '--includeItemPermissions'
     }, {
         option: '--bypassSharedLock'
+    }, {
+        option: '--skipWait'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -140,7 +162,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileMoveCommand_initTypes = function _SpoFileMoveCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('retainEditorAndModified', 'bypassSharedLock');
+    this.types.boolean.push('includeItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -49,13 +49,8 @@ class SpoListWebhookListCommand extends SpoCommand {
                 res.forEach(w => {
                     w.clientState = w.clientState || '';
                 });
-                await logger.log(res);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No webhooks found');
-                }
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -50,14 +50,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand {
         };
         try {
             const attachmentFiles = await request.get(requestOptions);
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                await logger.log(attachmentFiles.AttachmentFiles);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No attachments found');
-                }
-            }
+            await logger.log(attachmentFiles.AttachmentFiles);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -48,8 +48,8 @@ class SpoPageListCommand extends SpoCommand {
                     return p;
                 });
                 pages.filter(p => p.ListItemAllFields).forEach(page => delete page.ListItemAllFields.ID);
-                await logger.log(pages);
             }
+            await logger.log(pages);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -3,10 +3,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators;
+var _SpoPageRemoveCommand_instances, _SpoPageRemoveCommand_initTelemetry, _SpoPageRemoveCommand_initOptions, _SpoPageRemoveCommand_initValidators, _SpoPageRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,15 +21,17 @@ class SpoPageRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageRemoveCommand_instances, "m", _SpoPageRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (args.options.force) {
             await this.removePage(logger, args);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the page '${args.options.name}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove page '${args.options.name}'?` });
             if (result) {
                 await this.removePage(logger, args);
             }
@@ -37,44 +39,63 @@ class SpoPageRemoveCommand extends SpoCommand {
     }
     async removePage(logger, args) {
         try {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const reqDigest = await spo.getRequestDigest(args.options.webUrl);
-            requestDigest = reqDigest.FormDigestValue;
-            if (!pageName.endsWith('.aspx')) {
+            // Remove leading slashes from the page name (page can be nested in folders)
+            let pageName = urlUtil.removeLeadingSlashes(args.options.name);
+            if (!pageName.toLowerCase().endsWith('.aspx')) {
                 pageName += '.aspx';
             }
             if (this.verbose) {
                 await logger.logToStderr(`Removing page ${pageName}...`);
             }
+            const filePath = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${pageName}`;
             const requestOptions = {
-                url: `${args.options
-                    .webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(filePath)}')`,
                 headers: {
-                    'X-RequestDigest': requestDigest,
-                    'X-HTTP-Method': 'DELETE',
-                    'content-type': 'application/json;odata=nometadata',
                     accept: 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            await request.post(requestOptions);
+            if (args.options.bypassSharedLock) {
+                requestOptions.headers.Prefer = 'bypass-shared-lock';
+            }
+            if (args.options.recycle) {
+                requestOptions.url += '/Recycle';
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
 }
-_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
+_SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelemetry = function _SpoPageRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force,
+            recycle: !!args.options.recycle,
+            bypassSharedLock: !!args.options.bypassSharedLock
+        });
+    });
+}, _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
         option: '-n, --name <name>'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '--recycle'
+    }, {
+        option: '--bypassSharedLock'
     }, {
         option: '-f, --force'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoPageRemoveCommand_initTypes = function _SpoPageRemoveCommand_initTypes() {
+    this.types.string.push('name', 'webUrl');
+    this.types.boolean.push('force', 'bypassSharedLock', 'recycle');
 };
 export default new SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map

package/dist/m365/spo/commands/page/page-template-list.js

@@ -30,9 +30,7 @@ class SpoPageTemplateListCommand extends SpoCommand {
         }
         try {
             const res = await odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages/templates`);
-            if (res && res.length > 0) {
-                await logger.log(res);
-            }
+            await logger.log(res);
         }
         catch (err) {
             // The API returns a 404 when no templates are created on the site collection

package/dist/m365/spo/commands/site/site-admin-list.js

@@ -17,6 +17,9 @@ class SpoSiteAdminListCommand extends SpoCommand {
     get description() {
         return 'Lists all administrators of a specific SharePoint site';
     }
+    defaultProperties() {
+        return ['Id', 'LoginName', 'Title', 'PrincipalTypeString'];
+    }
     constructor() {
         super();
         _SpoSiteAdminListCommand_instances.add(this);
@@ -46,20 +49,16 @@ class SpoSiteAdminListCommand extends SpoCommand {
         const requestOptions = {
             url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
             headers: {
-                accept: 'application/json;odata=nometadata',
-                'content-type': 'application/json;charset=utf-8'
-            }
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const responseContent = JSON.parse(response);
         const primaryAdminLoginName = await spo.getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, this.verbose);
-        const mappedResult = responseContent.value.map((u) => ({
-            Id: null,
+        const mappedResult = response.value.map((u) => ({
             Email: u.email,
             LoginName: u.loginName,
             Title: u.name,
-            PrincipalType: null,
-            PrincipalTypeString: null,
             IsPrimaryAdmin: u.loginName === primaryAdminLoginName
         }));
         await logger.log(mappedResult);
@@ -78,7 +77,6 @@ class SpoSiteAdminListCommand extends SpoCommand {
         }
         const requestOptions = {
             url: `${args.options.siteUrl}/_api/web/siteusers?$filter=IsSiteAdmin eq true`,
-            method: 'GET',
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -114,6 +112,7 @@ _SpoSiteAdminListCommand_instances = new WeakSet(), _SpoSiteAdminListCommand_ini
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
 }, _SpoSiteAdminListCommand_initTypes = function _SpoSiteAdminListCommand_initTypes() {
     this.types.string.push('siteUrl');
+    this.types.boolean.push('asAdmin');
 };
 export default new SpoSiteAdminListCommand();
 //# sourceMappingURL=site-admin-list.js.map

package/dist/m365/spo/commands/site/site-admin-remove.js

@@ -77,11 +77,11 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'content-type': 'application/json;charset=utf-8'
-            }
+            },
+            responseType: 'json'
         };
         const response = await request.post(requestOptions);
-        const responseContent = JSON.parse(response);
-        return responseContent.value;
+        return response.value;
     }
     async getCorrectLoginName(options) {
         if (options.userId || options.userName) {
@@ -116,7 +116,8 @@ class SpoSiteAdminRemoveCommand extends SpoCommand {
                     siteId: siteId,
                     secondaryAdministratorLoginNames: admins.map(u => u.loginName)
                 }
-            }
+            },
+            responseType: 'json'
         };
         await request.post(requestOptions);
     }

package/dist/m365/spo/commands/site/site-sharingpermission-set.js

@@ -0,0 +1,68 @@
+import SpoCommand from '../../../base/SpoCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    siteUrl: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    }))),
+    capability: z.enum(['full', 'limited', 'ownersOnly'])
+})
+    .strict();
+class SpoSiteSharingPermissionSetCommand extends SpoCommand {
+    get name() {
+        return commands.SITE_SHARINGPERMISSION_SET;
+    }
+    get description() {
+        return 'Controls how a site and its components can be shared';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Updating sharing permissions for site '${args.options.siteUrl}'...`);
+            }
+            const { capability } = args.options;
+            if (this.verbose) {
+                await logger.logToStderr(`Updating site sharing permissions...`);
+            }
+            const requestOptionsWeb = {
+                url: `${args.options.siteUrl}/_api/Web`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    MembersCanShare: capability === 'full' || capability === 'limited'
+                }
+            };
+            await request.patch(requestOptionsWeb);
+            if (this.verbose) {
+                await logger.logToStderr(`Updating associated member group sharing permissions...`);
+            }
+            const requestOptionsMemberGroup = {
+                url: `${args.options.siteUrl}/_api/Web/AssociatedMemberGroup`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    AllowMembersEditMembership: capability === 'full'
+                }
+            };
+            await request.patch(requestOptionsMemberGroup);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoSiteSharingPermissionSetCommand();
+//# sourceMappingURL=site-sharingpermission-set.js.map

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

@@ -22,9 +22,7 @@ class SpoSiteScriptListCommand extends SpoCommand {
                 responseType: 'json'
             };
             const res = await request.post(requestOptions);
-            if (res.value && res.value.length > 0) {
-                await logger.log(res.value);
-            }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/{site/site-rename.js → tenant/tenant-site-rename.js}

@@ -3,25 +3,26 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteRenameCommand_instances, _SpoSiteRenameCommand_initTelemetry, _SpoSiteRenameCommand_initOptions, _SpoSiteRenameCommand_initValidators;
+var _SpoTenantSiteRenameCommand_instances, _SpoTenantSiteRenameCommand_initTelemetry, _SpoTenantSiteRenameCommand_initOptions, _SpoTenantSiteRenameCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
+import { timersUtil } from '../../../../utils/timersUtil.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-class SpoSiteRenameCommand extends SpoCommand {
+class SpoTenantSiteRenameCommand extends SpoCommand {
     get name() {
-        return commands.SITE_RENAME;
+        return commands.TENANT_SITE_RENAME;
     }
     get description() {
         return 'Renames the URL and title of a site collection';
     }
     constructor() {
         super();
-        _SpoSiteRenameCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSiteRenameCommand_instances, "m", _SpoSiteRenameCommand_initValidators).call(this);
+        _SpoTenantSiteRenameCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteRenameCommand_instances, "m", _SpoTenantSiteRenameCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -40,24 +41,23 @@ class SpoSiteRenameCommand extends SpoCommand {
                 optionsBitmask = optionsBitmask | 16;
             }
             const requestOptions = {
-                "SourceSiteUrl": options.url,
-                "TargetSiteUrl": options.newUrl,
-                "TargetSiteTitle": options.newTitle || null,
-                "Option": optionsBitmask,
-                "Reserve": null,
-                "SkipGestures": null,
-                "OperationId": "00000000-0000-0000-0000-000000000000"
-            };
-            const postData = {
                 url: `${spoAdminUrl}/_api/SiteRenameJobs?api-version=1.4.7`,
                 headers: {
                     'X-RequestDigest': this.context.FormDigestValue,
                     'Content-Type': 'application/json'
                 },
                 responseType: 'json',
-                data: requestOptions
+                data: {
+                    SourceSiteUrl: options.url,
+                    TargetSiteUrl: options.newUrl,
+                    TargetSiteTitle: options.newTitle || null,
+                    Option: optionsBitmask,
+                    Reserve: null,
+                    SkipGestures: null,
+                    OperationId: '00000000-0000-0000-0000-000000000000'
+                }
             };
-            const res = await request.post(postData);
+            const res = await request.post(requestOptions);
             if (options.verbose) {
                 await logger.logToStderr(res);
             }
@@ -92,23 +92,20 @@ class SpoSiteRenameCommand extends SpoCommand {
         if (this.operationData.JobState === "Success") {
             return;
         }
-        await this.sleep(SpoSiteRenameCommand.checkIntervalInMs);
+        await timersUtil.setTimeout(SpoTenantSiteRenameCommand.checkIntervalInMs);
         await command.waitForRenameCompletion(command, isVerbose, spoAdminUrl, siteUrl, iteration);
     }
-    sleep(ms) {
-        return new Promise(resolve => setTimeout(resolve, ms));
-    }
 }
-_SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelemetry = function _SpoSiteRenameCommand_initTelemetry() {
+_SpoTenantSiteRenameCommand_instances = new WeakSet(), _SpoTenantSiteRenameCommand_initTelemetry = function _SpoTenantSiteRenameCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newTitle: args.options.newTitle ? true : false,
-            suppressMarketplaceAppCheck: args.options.suppressMarketplaceAppCheck,
-            suppressWorkflow2013Check: args.options.suppressWorkflow2013Check,
-            wait: args.options.wait
+            newTitle: typeof args.options.newTitle !== 'undefined',
+            suppressMarketplaceAppCheck: !!args.options.suppressMarketplaceAppCheck,
+            suppressWorkflow2013Check: !!args.options.suppressWorkflow2013Check,
+            wait: !!args.options.wait
         });
     });
-}, _SpoSiteRenameCommand_initOptions = function _SpoSiteRenameCommand_initOptions() {
+}, _SpoTenantSiteRenameCommand_initOptions = function _SpoTenantSiteRenameCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
@@ -122,7 +119,7 @@ _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelem
     }, {
         option: '--wait'
     });
-}, _SpoSiteRenameCommand_initValidators = function _SpoSiteRenameCommand_initValidators() {
+}, _SpoTenantSiteRenameCommand_initValidators = function _SpoTenantSiteRenameCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.url.toLowerCase() === args.options.newUrl.toLowerCase()) {
             return 'The new URL cannot be the same as the target URL.';
@@ -130,6 +127,6 @@ _SpoSiteRenameCommand_instances = new WeakSet(), _SpoSiteRenameCommand_initTelem
         return true;
     });
 };
-SpoSiteRenameCommand.checkIntervalInMs = 5000;
-export default new SpoSiteRenameCommand();
-//# sourceMappingURL=site-rename.js.map
+SpoTenantSiteRenameCommand.checkIntervalInMs = 5000;
+export default new SpoTenantSiteRenameCommand();
+//# sourceMappingURL=tenant-site-rename.js.map