@pnp/cli-microsoft365 6.2.0-beta.edaa477 → 6.3.0-beta.1140b31

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -0,0 +1,157 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFolderRetentionLabelRemoveCommand_instances, _SpoFolderRetentionLabelRemoveCommand_initTelemetry, _SpoFolderRetentionLabelRemoveCommand_initOptions, _SpoFolderRetentionLabelRemoveCommand_initValidators, _SpoFolderRetentionLabelRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoListItemRetentionLabelRemoveCommand = require("../listitem/listitem-retentionlabel-remove");
+const SpoListRetentionLabelRemoveCommand = require("../list/list-retentionlabel-remove");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FOLDER_RETENTIONLABEL_REMOVE;
+    }
+    get description() {
+        return 'Clear the retention label from a folder';
+    }
+    constructor() {
+        super();
+        _SpoFolderRetentionLabelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRetentionLabelRemoveCommand_instances, "m", _SpoFolderRetentionLabelRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeFolderRetentionLabel(logger, args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the retentionlabel from folder ${args.options.folderId || args.options.folderUrl} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield this.removeFolderRetentionLabel(logger, args);
+                }
+            }
+        });
+    }
+    removeFolderRetentionLabel(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const folderProperties = yield this.getFolderProperties(logger, args);
+                if (folderProperties.ListItemAllFields) {
+                    const options = {
+                        webUrl: args.options.webUrl,
+                        listId: folderProperties.ListItemAllFields.ParentList.Id,
+                        listItemId: folderProperties.ListItemAllFields.Id,
+                        confirm: true,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    const spoListItemRetentionLabelRemoveCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoListItemRetentionLabelRemoveCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    if (this.verbose) {
+                        logger.logToStderr(spoListItemRetentionLabelRemoveCommandOutput.stderr);
+                    }
+                }
+                else {
+                    const options = {
+                        webUrl: args.options.webUrl,
+                        listUrl: folderProperties.ServerRelativeUrl,
+                        confirm: true,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    const spoListRetentionLabelEnsureCommandOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoListRetentionLabelRemoveCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    if (this.verbose) {
+                        logger.logToStderr(spoListRetentionLabelEnsureCommandOutput.stderr);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getFolderProperties(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list and item information for folder '${args.options.folderId || args.options.folderUrl}' in site at ${args.options.webUrl}...`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.folderId) {
+                requestUrl += `GetFolderById('${args.options.folderId}')`;
+            }
+            else {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            }
+            const requestOptions = {
+                url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return yield request_1.default.get(requestOptions);
+        });
+    }
+}
+_SpoFolderRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFolderRetentionLabelRemoveCommand_initTelemetry = function _SpoFolderRetentionLabelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            folderId: typeof args.options.folderId !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFolderRetentionLabelRemoveCommand_initOptions = function _SpoFolderRetentionLabelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--folderUrl [folderUrl]'
+    }, {
+        option: '-i, --folderId [folderId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFolderRetentionLabelRemoveCommand_initValidators = function _SpoFolderRetentionLabelRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId &&
+            !validation_1.validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFolderRetentionLabelRemoveCommand_initOptionSets = function _SpoFolderRetentionLabelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderUrl', 'folderId'] });
+};
+module.exports = new SpoFolderRetentionLabelRemoveCommand();
+//# sourceMappingURL=folder-retentionlabel-remove.js.map

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

@@ -78,6 +78,9 @@ class SpoListAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.schemaXml) {
+                this.warn(logger, `Option 'schemaXml' is deprecated.`);
+            }
             if (this.verbose) {
                 logger.logToStderr(`Creating list in site at ${args.options.webUrl}...`);
             }

package/dist/m365/spo/commands/list/list-retentionlabel-remove.js

@@ -0,0 +1,146 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoListRetentionLabelRemoveCommand_instances, _SpoListRetentionLabelRemoveCommand_initTelemetry, _SpoListRetentionLabelRemoveCommand_initOptions, _SpoListRetentionLabelRemoveCommand_initValidators, _SpoListRetentionLabelRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoListRetentionLabelRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.LIST_RETENTIONLABEL_REMOVE;
+    }
+    get description() {
+        return 'Clears the retention label on the specified list or library.';
+    }
+    constructor() {
+        super();
+        _SpoListRetentionLabelRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelRemoveCommand_instances, "m", _SpoListRetentionLabelRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelRemoveCommand_instances, "m", _SpoListRetentionLabelRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelRemoveCommand_instances, "m", _SpoListRetentionLabelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListRetentionLabelRemoveCommand_instances, "m", _SpoListRetentionLabelRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeListRetentionLabel(logger, args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the retention label from list '${args.options.listId || args.options.listTitle || args.options.listUrl}'?`
+                });
+                if (result.continue) {
+                    yield this.removeListRetentionLabel(logger, args);
+                }
+            }
+        });
+    }
+    removeListRetentionLabel(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Clears the retention label from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
+            }
+            try {
+                const listServerRelativeUrl = yield this.getListServerRelativeUrl(args, logger);
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        listUrl: listAbsoluteUrl,
+                        complianceTagValue: '',
+                        blockDelete: false,
+                        blockEdit: false,
+                        syncToItems: false
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getListServerRelativeUrl(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Getting the list server relative URL');
+            }
+            if (args.options.listUrl) {
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+            }
+            let listRestUrl = '';
+            if (args.options.listId) {
+                listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            }
+            else {
+                listRestUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const listInstance = yield request_1.default.get(requestOptions);
+            return listInstance.RootFolder.ServerRelativeUrl;
+        });
+    }
+}
+_SpoListRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListRetentionLabelRemoveCommand_initTelemetry = function _SpoListRetentionLabelRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoListRetentionLabelRemoveCommand_initOptions = function _SpoListRetentionLabelRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '-i, --listId [listId]'
+    }, {
+        option: '-l, --listUrl [listUrl]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoListRetentionLabelRemoveCommand_initValidators = function _SpoListRetentionLabelRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoListRetentionLabelRemoveCommand_initOptionSets = function _SpoListRetentionLabelRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+};
+module.exports = new SpoListRetentionLabelRemoveCommand();
+//# sourceMappingURL=list-retentionlabel-remove.js.map

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

@@ -67,6 +67,9 @@ class SpoListSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.schemaXml) {
+                this.warn(logger, `Option 'schemaXml' is deprecated.`);
+            }
             if (this.verbose) {
                 logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
             }

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

@@ -177,7 +177,7 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
         return true;
     }));
 }, _SpoListItemListCommand_initOptionSets = function _SpoListItemListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 }, _SpoListItemListCommand_initTypes = function _SpoListItemListCommand_initTypes() {
     this.types.string.push('webUrl', 'camlQuery', 'pageSize', 'pageNumber', 'fields', 'filter');
 };

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-remove.js

@@ -47,7 +47,7 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the retentionlabel from list item ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to remove the retentionlabel from list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield this.removeListItemRetentionLabel(logger, args);
@@ -58,7 +58,7 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand_1.default {
     removeListItemRetentionLabel(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Removing retention label from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
+                logger.logToStderr(`Removing retention label from list item ${args.options.listItemId} from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' in site at ${args.options.webUrl}...`);
             }
             try {
                 let url = `${args.options.webUrl}/_api/web`;

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -17,6 +17,7 @@ var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_i
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -37,19 +38,6 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getAppInfo(args) {
         if (args.options.appId && args.options.appDisplayName) {
             return Promise.resolve({
@@ -136,7 +124,7 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const appInfo = yield this.getAppInfo(args);
                 let permission = yield this.addPermissions(args, appInfo);
                 if (this.roleNeedsElevation(args.options.permission)) {

package/dist/m365/spo/commands/site/site-apppermission-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionGetCommand_instances, _SpoSiteAppPermissionGetCommand_initOptions, _SpoSiteAppPermissionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -32,19 +33,6 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionGetCommand_instances, "m", _SpoSiteAppPermissionGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionGetCommand_instances, "m", _SpoSiteAppPermissionGetCommand_initValidators).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getApplicationPermission(args, siteId) {
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/permissions/${args.options.id}`,
@@ -58,7 +46,7 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const siteId = yield this.getSpoSiteId(args);
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const permissionObject = yield this.getApplicationPermission(args, siteId);
                 const transposed = [];
                 permissionObject.grantedToIdentities.forEach((permissionEntity) => {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionListCommand_instances, _SpoSiteAppPermissionListCommand_initTelemetry, _SpoSiteAppPermissionListCommand_initOptions, _SpoSiteAppPermissionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -34,19 +35,6 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionListCommand_instances, "m", _SpoSiteAppPermissionListCommand_initValidators).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getFilteredPermissions(args, permissions) {
         let filterProperty = 'displayName';
         let filterValue = args.options.appDisplayName;
@@ -95,7 +83,7 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const permRes = yield this.getPermissions();
                 let permissions = permRes.value;
                 if (args.options.appId || args.options.appDisplayName) {

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

@@ -17,6 +17,7 @@ var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCom
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,19 +37,6 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
-    }
     getPermissions() {
         const requestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -98,7 +86,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    this.siteId = yield this.getSpoSiteId(args);
+                    this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                     const permissionIdsToRemove = yield this.getPermissionIds(args);
                     const tasks = [];
                     for (const permissionId of permissionIdsToRemove) {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionSetCommand_instances, _SpoSiteAppPermissionSetCommand_initTelemetry, _SpoSiteAppPermissionSetCommand_initOptions, _SpoSiteAppPermissionSetCommand_initValidators, _SpoSiteAppPermissionSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -36,19 +37,6 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionSetCommand_instances, "m", _SpoSiteAppPermissionSetCommand_initOptionSets).call(this);
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.siteUrl);
-        const siteRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(siteRequestOptions)
-            .then((site) => site.id);
-    }
     getFilteredPermissions(args, permissions) {
         let filterProperty = 'displayName';
         let filterValue = args.options.appDisplayName;
@@ -85,7 +73,7 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                this.siteId = yield this.getSpoSiteId(args);
+                this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
                 const sitePermissionId = yield this.getPermission(args);
                 const requestOptions = {
                     url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${sitePermissionId}`,

package/dist/m365/spo/commands.js

@@ -57,11 +57,14 @@ exports.default = {
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
     FILE_RENAME: `${prefix} file rename`,
+    FILE_RETENTIONLABEL_ENSURE: `${prefix} file retentionlabel ensure`,
+    FILE_RETENTIONLABEL_REMOVE: `${prefix} file retentionlabel remove`,
     FILE_ROLEASSIGNMENT_ADD: `${prefix} file roleassignment add`,
     FILE_ROLEASSIGNMENT_REMOVE: `${prefix} file roleassignment remove`,
     FILE_ROLEINHERITANCE_BREAK: `${prefix} file roleinheritance break`,
     FILE_ROLEINHERITANCE_RESET: `${prefix} file roleinheritance reset`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
+    FILE_SHARINGLINK_ADD: `${prefix} file sharinglink add`,
     FILE_SHARINGLINK_GET: `${prefix} file sharinglink get`,
     FILE_SHARINGLINK_LIST: `${prefix} file sharinglink list`,
     FILE_SHARINGLINK_REMOVE: `${prefix} file sharinglink remove`,
@@ -77,6 +80,8 @@ exports.default = {
     FOLDER_MOVE: `${prefix} folder move`,
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
+    FOLDER_RETENTIONLABEL_ENSURE: `${prefix} folder retentionlabel ensure`,
+    FOLDER_RETENTIONLABEL_REMOVE: `${prefix} folder retentionlabel remove`,
     FOLDER_ROLEASSIGNMENT_REMOVE: `${prefix} folder roleassignment remove`,
     FOLDER_ROLEASSIGNMENT_ADD: `${prefix} folder roleassignment add`,
     FOLDER_ROLEINHERITANCE_BREAK: `${prefix} folder roleinheritance break`,
@@ -120,6 +125,7 @@ exports.default = {
     LIST_REMOVE: `${prefix} list remove`,
     LIST_RETENTIONLABEL_ENSURE: `${prefix} list retentionlabel ensure`,
     LIST_RETENTIONLABEL_GET: `${prefix} list retentionlabel get`,
+    LIST_RETENTIONLABEL_REMOVE: `${prefix} list retentionlabel remove`,
     LIST_ROLEASSIGNMENT_REMOVE: `${prefix} list roleassignment remove`,
     LIST_ROLEASSIGNMENT_ADD: `${prefix} list roleassignment add`,
     LIST_ROLEINHERITANCE_BREAK: `${prefix} list roleinheritance break`,

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

@@ -41,14 +41,14 @@ class TeamsChatListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isAppOnlyAuth = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-            if (isAppOnlyAuth && !args.options.userId && !args.options.userName) {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
                 throw `The option 'userId' or 'userName' is required when obtaining chats using app only permissions`;
             }
-            else if (!isAppOnlyAuth && (args.options.userId || args.options.userName)) {
+            else if (!isAppOnlyAccessToken && (args.options.userId || args.options.userName)) {
                 throw `The options 'userId' or 'userName' cannot be used when obtaining chats using delegated permissions`;
             }
-            let requestUrl = `${this.resource}/v1.0/${!isAppOnlyAuth ? 'me' : `users/${args.options.userId || args.options.userName}`}/chats`;
+            let requestUrl = `${this.resource}/v1.0/${!isAppOnlyAccessToken ? 'me' : `users/${args.options.userId || args.options.userName}`}/chats`;
             if (args.options.type) {
                 requestUrl += `?$filter=chatType eq '${args.options.type}'`;
             }

package/dist/m365/teams/commands/meeting/meeting-attendancereport-list.js

@@ -42,19 +42,19 @@ class TeamsMeetingAttendancereportListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isAppOnlyAuth = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-            if (isAppOnlyAuth && !args.options.userId && !args.options.userName && !args.options.email) {
+            const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+            if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName && !args.options.email) {
                 this.handleError(`The option 'userId', 'userName' or 'email' is required when retrieving meeting attendance report using app only permissions`);
             }
-            else if (!isAppOnlyAuth && (args.options.userId || args.options.userName || args.options.email)) {
+            else if (!isAppOnlyAccessToken && (args.options.userId || args.options.userName || args.options.email)) {
                 this.handleError(`The options 'userId', 'userName' and 'email' cannot be used when retrieving meeting attendance reports using delegated permissions`);
             }
             try {
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving attendance report for ${isAppOnlyAuth ? 'specific user' : 'currently logged in user'}`);
+                    logger.logToStderr(`Retrieving attendance report for ${isAppOnlyAccessToken ? 'specific user' : 'currently logged in user'}`);
                 }
                 let requestUrl = `${this.resource}/v1.0/`;
-                if (isAppOnlyAuth) {
+                if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
                     if (args.options.userId) {
                         requestUrl += args.options.userId;