@pnp/cli-microsoft365 7.10.0-beta.a743796 → 7.10.0-beta.ebb7426

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

@@ -42,29 +42,27 @@ class SpoFileAddCommand extends SpoCommand {
         const fileName = fsUtil.getSafeFileName(path.basename(fullPath));
         let isCheckedOut = false;
         let listSettings;
-        if (this.debug) {
-            await logger.logToStderr(`folder path: ${folderPath}...`);
-        }
-        if (this.debug) {
-            await logger.logToStderr('Check if the specified folder exists.');
-            await logger.logToStderr('');
-        }
-        if (this.debug) {
+        if (this.verbose) {
             await logger.logToStderr(`file name: ${fileName}...`);
+            await logger.logToStderr(`folder path: ${folderPath}...`);
         }
         try {
             try {
+                if (this.verbose) {
+                    await logger.logToStderr('Check if the specified folder exists.');
+                }
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')`,
                     headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    }
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
                 };
                 await request.get(requestOptions);
             }
             catch (err) {
                 // folder does not exist so will attempt to create the folder tree
-                await spo.ensureFolder(args.options.webUrl, folderPath, logger, this.debug);
+                await spo.ensureFolder(args.options.webUrl, folderPath, logger, this.verbose);
             }
             if (args.options.checkOut) {
                 await this.fileCheckOut(fileName, args.options.webUrl, folderPath);
@@ -77,7 +75,7 @@ class SpoFileAddCommand extends SpoCommand {
             }
             const fileStats = fs.statSync(fullPath);
             const fileSize = fileStats.size;
-            if (this.debug) {
+            if (this.verbose) {
                 await logger.logToStderr(`File size is ${fileSize} bytes`);
             }
             // only up to 250 MB are allowed in a single request
@@ -91,8 +89,9 @@ class SpoFileAddCommand extends SpoCommand {
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                     headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    }
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
                 };
                 await request.post(requestOptions);
                 // session started successfully, now upload our file chunks
@@ -119,8 +118,9 @@ class SpoFileAddCommand extends SpoCommand {
                     const requestOptions = {
                         url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                         headers: {
-                            'accept': 'application/json;odata=nometadata'
-                        }
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
                     };
                     try {
                         await request.post(requestOptions);
@@ -142,7 +142,7 @@ class SpoFileAddCommand extends SpoCommand {
                     url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                     data: fileBody,
                     headers: {
-                        'accept': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata',
                         'content-length': bodyLength
                     },
                     maxBodyLength: this.fileChunkingThreshold
@@ -165,12 +165,12 @@ class SpoFileAddCommand extends SpoCommand {
                 });
             }
             if (fieldsToUpdate.length > 0) {
-                // perform list item update and checkin
+                // perform list item update and check-in
                 await this.validateUpdateListItem(args.options.webUrl, folderPath, fileName, fieldsToUpdate, logger, args.options.checkInComment);
             }
             else if (isCheckedOut) {
-                // perform checkin
-                await this.fileCheckIn(args, fileName);
+                // perform check-in
+                await this.fileCheckIn(args.options.webUrl, folderPath, fileName, args.options.checkInComment);
             }
             // approve and publish cannot be used together
             // when approve is used it will automatically publish the file
@@ -183,7 +183,7 @@ class SpoFileAddCommand extends SpoCommand {
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
                     headers: {
-                        'accept': 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
@@ -200,7 +200,7 @@ class SpoFileAddCommand extends SpoCommand {
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
                     headers: {
-                        'accept': 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
@@ -212,7 +212,11 @@ class SpoFileAddCommand extends SpoCommand {
                 // in a case the command has done checkout
                 // then have to rollback the checkout
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
+                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
                 };
                 try {
                     await request.post(requestOptions);
@@ -221,7 +225,6 @@ class SpoFileAddCommand extends SpoCommand {
                     if (this.verbose) {
                         await logger.logToStderr('Could not rollback file checkout');
                         await logger.logToStderr(err);
-                        await logger.logToStderr('');
                     }
                 }
             }
@@ -235,7 +238,7 @@ class SpoFileAddCommand extends SpoCommand {
         const requestOptions = {
             url: `${webUrl}/_api/web/lists('${listSettings.Id}')/contenttypes?$select=Name,Id`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
@@ -253,14 +256,15 @@ class SpoFileAddCommand extends SpoCommand {
         const requestOptionsGetFile = {
             url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
-            }
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
         };
         await request.get(requestOptionsGetFile);
         const requestOptionsCheckOut = {
             url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
@@ -285,7 +289,7 @@ class SpoFileAddCommand extends SpoCommand {
                 url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
                 data: fileBuffer,
                 headers: {
-                    'accept': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata',
                     'content-length': readCount
                 },
                 maxBodyLength: this.fileChunkingThreshold
@@ -341,7 +345,7 @@ class SpoFileAddCommand extends SpoCommand {
         const requestOptions = {
             url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
@@ -353,18 +357,17 @@ class SpoFileAddCommand extends SpoCommand {
         }
         const requestBody = {
             formValues: fieldsToUpdate,
-            bNewDocumentUpdate: true, // true = will automatically checkin the item, but we will use it to perform system update and also do a checkin
+            bNewDocumentUpdate: true, // true = will automatically check-in the item, but we will use it to perform system update and also do a check-in
             checkInComment: checkInComment || ''
         };
-        if (this.debug) {
-            await logger.logToStderr('ValidateUpdateListItem will perform the checkin ...');
-            await logger.logToStderr('');
+        if (this.verbose) {
+            await logger.logToStderr('ValidateUpdateListItem will perform the check-in ...');
         }
         // update the existing file list item fields
         const requestOptions = {
             url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderPath)}')/Files('${formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             data: requestBody,
             responseType: 'json'
@@ -379,11 +382,11 @@ class SpoFileAddCommand extends SpoCommand {
         }
         return;
     }
-    async fileCheckIn(args, fileName) {
+    async fileCheckIn(webUrl, folderUrl, fileName, checkInComment) {
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
+            url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(folderUrl)}')/Files('${formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting.encodeQueryParameter(checkInComment || '')}',checkintype=0)`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };

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

@@ -430,33 +430,35 @@ class SpoSiteSetCommand extends SpoCommand {
 _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry = function _SpoSiteSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            classification: typeof args.options.classification === 'string',
-            disableFlows: args.options.disableFlows,
-            socialBarOnSitePagesDisabled: args.options.socialBarOnSitePagesDisabled,
-            isPublic: args.options.isPublic,
+            classification: typeof args.options.classification !== 'undefined',
+            disableFlows: !!args.options.disableFlows,
+            socialBarOnSitePagesDisabled: !!args.options.socialBarOnSitePagesDisabled,
+            isPublic: !!args.options.isPublic,
             owners: typeof args.options.owners !== 'undefined',
-            shareByEmailEnabled: args.options.shareByEmailEnabled,
-            title: typeof args.options.title === 'string',
-            description: typeof args.options.description === 'string',
-            siteDesignId: typeof args.options.siteDesignId !== undefined,
-            sharingCapabilities: args.options.sharingCapability,
+            shareByEmailEnabled: !!args.options.shareByEmailEnabled,
+            title: typeof args.options.title !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            siteDesignId: typeof args.options.siteDesignId !== 'undefined',
+            sharingCapabilities: typeof args.options.sharingCapability !== 'undefined',
             siteLogoUrl: typeof args.options.siteLogoUrl !== 'undefined',
             siteThumbnailUrl: typeof args.options.siteThumbnailUrl !== 'undefined',
-            resourceQuota: args.options.resourceQuota,
-            resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
-            storageQuota: args.options.storageQuota,
-            storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
-            allowSelfServiceUpgrade: args.options.allowSelfServiceUpgrade,
-            lockState: args.options.lockState,
-            noScriptSite: args.options.noScriptSite,
-            wait: args.options.wait === true
+            resourceQuota: typeof args.options.resourceQuota !== 'undefined',
+            resourceQuotaWarningLevel: typeof args.options.resourceQuotaWarningLevel !== 'undefined',
+            storageQuota: typeof args.options.storageQuota !== 'undefined',
+            storageQuotaWarningLevel: typeof args.options.storageQuotaWarningLevel !== 'undefined',
+            allowSelfServiceUpgrade: !!args.options.allowSelfServiceUpgrade,
+            lockState: typeof args.options.lockState !== 'undefined',
+            noScriptSite: !!args.options.noScriptSite,
+            wait: !!args.options.wait
         });
     });
 }, _SpoSiteSetCommand_initOptions = function _SpoSiteSetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '-i, --id [id]'
+        option: '-t, --title [title]'
+    }, {
+        option: '-d, --description [description]'
     }, {
         option: '--classification [classification]'
     }, {
@@ -476,16 +478,12 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     }, {
         option: '--siteDesignId [siteDesignId]'
     }, {
-        option: '--title [title]'
-    }, {
-        option: '--description [description]'
+        option: '--sharingCapability [sharingCapability]',
+        autocomplete: this.sharingCapabilities
     }, {
         option: '--siteLogoUrl [siteLogoUrl]'
     }, {
         option: '--siteThumbnailUrl [siteThumbnailUrl]'
-    }, {
-        option: '--sharingCapability [sharingCapability]',
-        autocomplete: this.sharingCapabilities
     }, {
         option: '--resourceQuota [resourceQuota]'
     }, {

package/dist/m365/spo/commands/tenant/tenant-site-archive.js

@@ -0,0 +1,99 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoTenantSiteArchiveCommand_instances, _SpoTenantSiteArchiveCommand_initTelemetry, _SpoTenantSiteArchiveCommand_initOptions, _SpoTenantSiteArchiveCommand_initValidators, _SpoTenantSiteArchiveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { validation } from '../../../../utils/validation.js';
+import { spo } from '../../../../utils/spo.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoTenantSiteArchiveCommand extends SpoCommand {
+    get name() {
+        return commands.TENANT_SITE_ARCHIVE;
+    }
+    get description() {
+        return 'Archives a site collection';
+    }
+    constructor() {
+        super();
+        _SpoTenantSiteArchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteArchiveCommand_instances, "m", _SpoTenantSiteArchiveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const archiveSite = async () => {
+            try {
+                if (this.verbose) {
+                    await logger.logToStderr(`Archiving site ${args.options.url}...`);
+                }
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+                const reqDigest = await spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
+                  <Actions>
+                    <ObjectPath Id="2" ObjectPathId="1" />
+                    <ObjectPath Id="4" ObjectPathId="3" />
+                    <Query Id="5" ObjectPathId="3">
+                      <Query SelectAllProperties="true">
+                        <Properties />
+                      </Query>
+                    </Query>
+                  </Actions>
+                  <ObjectPaths>
+                    <Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" />
+                    <Method Id="3" ParentId="1" Name="ArchiveSiteByUrl">
+                      <Parameters>
+                        <Parameter Type="String">${args.options.url}</Parameter>
+                      </Parameters>
+                    </Method>
+                  </ObjectPaths>
+                  </Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await archiveSite();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to archive site '${args.options.url}'?` });
+            if (result) {
+                await archiveSite();
+            }
+        }
+    }
+}
+_SpoTenantSiteArchiveCommand_instances = new WeakSet(), _SpoTenantSiteArchiveCommand_initTelemetry = function _SpoTenantSiteArchiveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoTenantSiteArchiveCommand_initOptions = function _SpoTenantSiteArchiveCommand_initOptions() {
+    this.options.unshift({ option: '-u, --url <url>' }, { option: '-f, --force' });
+}, _SpoTenantSiteArchiveCommand_initValidators = function _SpoTenantSiteArchiveCommand_initValidators() {
+    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
+}, _SpoTenantSiteArchiveCommand_initTypes = function _SpoTenantSiteArchiveCommand_initTypes() {
+    this.types.string.push('url');
+    this.types.boolean.push('force');
+};
+export default new SpoTenantSiteArchiveCommand();
+//# sourceMappingURL=tenant-site-archive.js.map

package/dist/m365/spo/commands/tenant/tenant-site-unarchive.js

@@ -0,0 +1,98 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoTenantSiteUnarchiveCommand_instances, _SpoTenantSiteUnarchiveCommand_initTelemetry, _SpoTenantSiteUnarchiveCommand_initOptions, _SpoTenantSiteUnarchiveCommand_initValidators, _SpoTenantSiteUnarchiveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoTenantSiteUnarchiveCommand extends SpoCommand {
+    get name() {
+        return commands.TENANT_SITE_UNARCHIVE;
+    }
+    get description() {
+        return 'Unarchives a site collection';
+    }
+    constructor() {
+        super();
+        _SpoTenantSiteUnarchiveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantSiteUnarchiveCommand_instances, "m", _SpoTenantSiteUnarchiveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (args.options.force) {
+            await this.unarchiveSite(logger, args.options.url);
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to unarchive site '${args.options.url}'? This may cause additional billing costs.` });
+            if (result) {
+                await this.unarchiveSite(logger, args.options.url);
+            }
+        }
+    }
+    async unarchiveSite(logger, url) {
+        if (this.verbose) {
+            await logger.logToStderr(`Unarchiving site '${url}'...`);
+        }
+        try {
+            const adminCenterUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+            const requestDigest = await spo.getRequestDigest(adminCenterUrl);
+            const requestOptions = {
+                url: `${adminCenterUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': requestDigest.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
+                <Actions>
+                  <ObjectPath Id="2" ObjectPathId="1" />
+                  <ObjectPath Id="4" ObjectPathId="3" />
+                </Actions>
+                <ObjectPaths>
+                  <Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" />
+                  <Method Id="3" ParentId="1" Name="UnarchiveSiteByUrl">
+                    <Parameters>
+                      <Parameter Type="String">${url}</Parameter>
+                    </Parameters>
+                  </Method>
+                </ObjectPaths>
+              </Request>`
+            };
+            const response = await request.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+}
+_SpoTenantSiteUnarchiveCommand_instances = new WeakSet(), _SpoTenantSiteUnarchiveCommand_initTelemetry = function _SpoTenantSiteUnarchiveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoTenantSiteUnarchiveCommand_initOptions = function _SpoTenantSiteUnarchiveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '-f, --force'
+    });
+}, _SpoTenantSiteUnarchiveCommand_initValidators = function _SpoTenantSiteUnarchiveCommand_initValidators() {
+    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
+}, _SpoTenantSiteUnarchiveCommand_initTypes = function _SpoTenantSiteUnarchiveCommand_initTypes() {
+    this.types.string.push('url');
+    this.types.boolean.push('force');
+};
+export default new SpoTenantSiteUnarchiveCommand();
+//# sourceMappingURL=tenant-site-unarchive.js.map

package/dist/m365/spo/commands.js

@@ -312,6 +312,8 @@ export default {
     TENANT_RECYCLEBINITEM_RESTORE: `${prefix} tenant recyclebinitem restore`,
     TENANT_SETTINGS_LIST: `${prefix} tenant settings list`,
     TENANT_SETTINGS_SET: `${prefix} tenant settings set`,
+    TENANT_SITE_ARCHIVE: `${prefix} tenant site archive`,
+    TENANT_SITE_UNARCHIVE: `${prefix} tenant site unarchive`,
     TERM_ADD: `${prefix} term add`,
     TERM_GET: `${prefix} term get`,
     TERM_LIST: `${prefix} term list`,

package/dist/m365/teams/commands/user/user-app-add.js

@@ -26,24 +26,24 @@ class TeamsUserAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const appId = await this.getAppId(args);
-        const userId = (args.options.userId ?? args.options.userName);
-        const endpoint = `${this.resource}/v1.0`;
-        if (this.verbose) {
-            await logger.logToStderr(`Removing app with ID ${appId} for user ${args.options.userId}`);
-        }
-        const requestOptions = {
-            url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
-            }
-        };
         try {
+            const appId = await this.getAppId(args);
+            const userId = (args.options.userId ?? args.options.userName);
+            const endpoint = `${this.resource}/v1.0`;
+            if (this.verbose) {
+                await logger.logToStderr(`Adding app with ID ${appId} for user ${args.options.userId}`);
+            }
+            const requestOptions = {
+                url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
+                }
+            };
             await request.post(requestOptions);
         }
         catch (err) {

package/dist/m365/teams/commands/user/user-app-upgrade.js

@@ -0,0 +1,106 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TeamsUserAppUpgradeCommand_instances, _TeamsUserAppUpgradeCommand_initTelemetry, _TeamsUserAppUpgradeCommand_initOptions, _TeamsUserAppUpgradeCommand_initValidators, _TeamsUserAppUpgradeCommand_initOptionSets, _TeamsUserAppUpgradeCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class TeamsUserAppUpgradeCommand extends GraphCommand {
+    get name() {
+        return commands.USER_APP_UPGRADE;
+    }
+    get description() {
+        return 'Upgrade an app in the personal scope of the specified user';
+    }
+    constructor() {
+        super();
+        _TeamsUserAppUpgradeCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppUpgradeCommand_instances, "m", _TeamsUserAppUpgradeCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Upgrading app ${args.options.id || args.options.name} for user ${args.options.userId || args.options.userName}`);
+            }
+            const installedAppId = await this.getInstalledAppId(args.options, logger);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/teamwork/installedApps/${installedAppId}/upgrade`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                }
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getInstalledAppId(options, logger) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving app ID`);
+        }
+        if (options.id) {
+            return options.id;
+        }
+        const installedApps = await odata.getAllItems(`${this.resource}/v1.0/users/${formatting.encodeQueryParameter(options.userId || options.userName)}/teamwork/installedApps?$expand=teamsAppDefinition&$filter=teamsAppDefinition/displayName eq '${formatting.encodeQueryParameter(options.name)}'&$select=id`);
+        if (installedApps.length === 1) {
+            return installedApps[0].id;
+        }
+        if (installedApps.length === 0) {
+            throw `The specified Teams app ${options.name} does not exist or is not installed for the user`;
+        }
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', installedApps);
+        const result = (await cli.handleMultipleResultsFound(`Multiple installed Teams apps with name '${options.name}' found.`, resultAsKeyValuePair));
+        return result.id;
+    }
+}
+_TeamsUserAppUpgradeCommand_instances = new WeakSet(), _TeamsUserAppUpgradeCommand_initTelemetry = function _TeamsUserAppUpgradeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppUpgradeCommand_initOptions = function _TeamsUserAppUpgradeCommand_initOptions() {
+    this.options.unshift({
+        option: '--id [id]'
+    }, {
+        option: '--name [name]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _TeamsUserAppUpgradeCommand_initValidators = function _TeamsUserAppUpgradeCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
+        return true;
+    });
+}, _TeamsUserAppUpgradeCommand_initOptionSets = function _TeamsUserAppUpgradeCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'name']
+    }, {
+        options: ['userId', 'userName']
+    });
+}, _TeamsUserAppUpgradeCommand_initTypes = function _TeamsUserAppUpgradeCommand_initTypes() {
+    this.types.string.push('id', 'name', 'userId', 'userName');
+};
+export default new TeamsUserAppUpgradeCommand();
+//# sourceMappingURL=user-app-upgrade.js.map