@pnp/cli-microsoft365 8.1.0-beta.bf59841 → 9.0.0-beta.1516729

package/dist/m365/entra/commands/m365group/m365group-user-set.js

@@ -3,14 +3,15 @@ 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 _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets;
+var _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets, _EntraM365GroupUserSetCommand_initTypes;
 import request from '../../../../request.js';
-import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
@@ -25,135 +26,209 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     constructor() {
         super();
         _EntraM365GroupUserSetCommand_instances.add(this);
+        this.allowedRoles = ['owner', 'member'];
         __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_SET, commands.M365GROUP_USER_SET);
+        if (args.options.userName) {
+            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
+        }
         try {
-            const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const userNames = args.options.userNames || args.options.userName;
+            const groupId = await this.getGroupId(logger, args);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
-            let users = await this.getOwners(groupId, logger);
-            const membersAndGuests = await this.getMembersAndGuests(groupId, logger);
-            users = users.concat(membersAndGuests);
-            // Filter out duplicate added values for owners (as they are returned as members as well)
-            users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
-            if (this.debug) {
-                await logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
-                await logger.logToStderr(users);
-                await logger.logToStderr('');
-            }
-            if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
-                const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'m365group user add\' command to add new users.' :
-                    'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
-                throw new Error(userNotInGroup);
-            }
-            if (args.options.role === "Owner") {
-                const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
-                if (foundMember !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json',
-                        data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + foundMember.id }
-                    };
-                    await request.post(requestOptions);
-                }
-                else {
-                    const userAlreadyOwner = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already an owner in the specified Microsoft 365 group, and thus cannot be promoted.' :
-                        'The specified user is already an owner in the specified Microsoft Teams team, and thus cannot be promoted.';
-                    throw new Error(userAlreadyOwner);
-                }
-            }
-            else {
-                const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
-                if (foundOwner !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    };
-                    await request.delete(requestOptions);
-                }
-                else {
-                    const userAlreadyMember = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already a member in the specified Microsoft 365 group, and thus cannot be demoted.' :
-                        'The specified user is already a member in the specified Microsoft Teams team, and thus cannot be demoted.';
-                    throw new Error(userAlreadyMember);
-                }
-            }
+            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            // we can't simply switch the role
+            // first add users to the new role
+            await this.addUsers(groupId, userIds, args.options.role);
+            // remove users from the old role
+            await this.removeUsersFromRole(logger, groupId, userIds, args.options.role);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getOwners(groupId, logger) {
+    async getGroupId(logger, args) {
+        if (args.options.groupId) {
+            return args.options.groupId;
+        }
+        if (args.options.teamId) {
+            return args.options.teamId;
+        }
+        const name = args.options.groupName || args.options.teamName;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving owners of the group with id ${groupId}`);
-        }
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        const users = await odata.getAllItems(endpoint);
-        // Currently there is a bug in the Microsoft Graph that returns Owners as
-        // userType 'member'. We therefore update all returned user as owner
-        users.forEach(user => {
-            user.userType = 'Owner';
-        });
-        return users;
+            await logger.logToStderr('Retrieving Group ID by display name...');
+        }
+        return entraGroup.getGroupIdByDisplayName(name);
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving user ID(s) by username(s)...');
+        }
+        return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
     }
-    async getMembersAndGuests(groupId, logger) {
+    async removeUsersFromRole(logger, groupId, userIds, role) {
+        const userIdsToRemove = [];
+        const currentRole = (role.toLowerCase() === 'member') ? 'owners' : 'members';
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving members of the group with id ${groupId}`);
+            await logger.logToStderr(`Removing users from the old role '${currentRole}'.`);
+        }
+        for (let i = 0; i < userIds.length; i += 20) {
+            const userIdsBatch = userIds.slice(i, i + 20);
+            const requestOptions = this.getRequestOptions();
+            userIdsBatch.map(userId => {
+                requestOptions.data.requests.push({
+                    id: userId,
+                    method: 'GET',
+                    url: `/groups/${groupId}/${currentRole}/$count?$filter=id eq '${userId}'`,
+                    headers: {
+                        'ConsistencyLevel': 'eventual'
+                    }
+                });
+            });
+            // send batch request
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status === 200) {
+                    if (response.body === 1) {
+                        // user can be removed from current role
+                        userIdsToRemove.push(response.id);
+                    }
+                }
+                else {
+                    throw response.body;
+                }
+            }
+        }
+        for (let i = 0; i < userIdsToRemove.length; i += 20) {
+            const userIdsBatch = userIds.slice(i, i + 20);
+            const requestOptions = this.getRequestOptions();
+            userIdsBatch.map(userId => {
+                requestOptions.data.requests.push({
+                    id: userId,
+                    method: 'DELETE',
+                    url: `/groups/${groupId}/${currentRole}/${userId}/$ref`
+                });
+            });
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+    }
+    async addUsers(groupId, userIds, role) {
+        for (let i = 0; i < userIds.length; i += 400) {
+            const userIdsBatch = userIds.slice(i, i + 400);
+            const requestOptions = this.getRequestOptions();
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                requestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role.toLowerCase() === 'member' ? 'members' : 'owners'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
         }
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return await odata.getAllItems(endpoint);
+    }
+    getRequestOptions() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/$batch`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                requests: []
+            }
+        };
+        return requestOptions;
     }
 }
 _EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetCommand_initTelemetry = function _EntraM365GroupUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
             groupId: typeof args.options.groupId !== 'undefined',
-            role: args.options.role
+            groupName: typeof args.options.groupName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined'
         });
     });
 }, _EntraM365GroupUserSetCommand_initOptions = function _EntraM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
-        option: "-i, --groupId [groupId]"
+        option: '-n, --userName [userName]'
+    }, {
+        option: '--ids [ids]'
+    }, {
+        option: '--userNames [userNames]'
+    }, {
+        option: '-i, --groupId [groupId]'
     }, {
-        option: "--teamId [teamId]"
+        option: '--groupName [groupName]'
     }, {
-        option: '-n, --userName <userName>'
+        option: '--teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
     }, {
         option: '-r, --role <role>',
-        autocomplete: ['Owner', 'Member']
+        autocomplete: this.allowedRoles
     });
 }, _EntraM365GroupUserSetCommand_initValidators = function _EntraM365GroupUserSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
+            return `'${args.options.teamId}' is not a valid GUID for option 'teamId'.`;
         }
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'.`;
+        }
+        if (args.options.ids) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if (args.options.userNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
+            }
         }
-        if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
-            return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
+        if (args.options.role && !this.allowedRoles.some(role => role.toLowerCase() === args.options.role.toLowerCase())) {
+            return `'${args.options.role}' is not a valid role. Allowed values are: ${this.allowedRoles.join(',')}`;
         }
         return true;
     });
 }, _EntraM365GroupUserSetCommand_initOptionSets = function _EntraM365GroupUserSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'teamId'] });
+    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
+    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+}, _EntraM365GroupUserSetCommand_initTypes = function _EntraM365GroupUserSetCommand_initTypes() {
+    this.types.string.push('userName', 'ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
 };
 export default new EntraM365GroupUserSetCommand();
 //# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/entra/commands.js

@@ -35,10 +35,12 @@ export default {
     ENTERPRISEAPP_ADD: `${prefix} enterpriseapp add`,
     ENTERPRISEAPP_GET: `${prefix} enterpriseapp get`,
     ENTERPRISEAPP_LIST: `${prefix} enterpriseapp list`,
+    ENTERPRISEAPP_REMOVE: `${prefix} enterpriseapp remove`,
     GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
+    GROUP_SET: `${prefix} group set`,
     GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
     GROUP_USER_SET: `${prefix} group user set`,
@@ -92,6 +94,7 @@ export default {
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     SP_LIST: `${prefix} sp list`,
+    SP_REMOVE: `${prefix} sp remove`,
     USER_ADD: `${prefix} user add`,
     USER_GET: `${prefix} user get`,
     USER_GUEST_ADD: `${prefix} user guest add`,

package/dist/m365/flow/commands/flow-get.js

@@ -29,7 +29,7 @@ class FlowGetCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/onenote/commands/notebook/notebook-add.js

@@ -0,0 +1,132 @@
+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 _OneNoteNotebookAddCommand_instances, _OneNoteNotebookAddCommand_initTelemetry, _OneNoteNotebookAddCommand_initOptions, _OneNoteNotebookAddCommand_initValidators, _OneNoteNotebookAddCommand_initOptionSets;
+import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { spo } from '../../../../utils/spo.js';
+class OneNoteNotebookAddCommand extends GraphCommand {
+    get name() {
+        return commands.NOTEBOOK_ADD;
+    }
+    get description() {
+        return 'Create a new OneNote notebook';
+    }
+    constructor() {
+        super();
+        _OneNoteNotebookAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookAddCommand_instances, "m", _OneNoteNotebookAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Creating OneNote notebook ${args.options.name}`);
+            }
+            const requestUrl = await this.getRequestUrl(args);
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': "application/json"
+                },
+                responseType: 'json',
+                data: {
+                    displayName: args.options.name
+                }
+            };
+            const response = await request.post(requestOptions);
+            await logger.log(response);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getRequestUrl(args) {
+        let endpoint = `${this.resource}/v1.0/`;
+        if (args.options.userId) {
+            endpoint += `users/${args.options.userId}`;
+        }
+        else if (args.options.userName) {
+            endpoint += `users/${args.options.userName}`;
+        }
+        else if (args.options.groupId) {
+            endpoint += `groups/${args.options.groupId}`;
+        }
+        else if (args.options.groupName) {
+            const groupId = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
+            endpoint += `groups/${groupId}`;
+        }
+        else if (args.options.webUrl) {
+            const siteId = await spo.getSpoGraphSiteId(args.options.webUrl);
+            endpoint += `sites/${siteId}`;
+        }
+        else {
+            endpoint += 'me';
+        }
+        endpoint += '/onenote/notebooks';
+        return endpoint;
+    }
+}
+_OneNoteNotebookAddCommand_instances = new WeakSet(), _OneNoteNotebookAddCommand_initTelemetry = function _OneNoteNotebookAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
+        });
+    });
+}, _OneNoteNotebookAddCommand_initOptions = function _OneNoteNotebookAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '-u, --webUrl [webUrl]'
+    });
+}, _OneNoteNotebookAddCommand_initValidators = function _OneNoteNotebookAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        // check name for invalid characters
+        if (args.options.name.length > 128) {
+            return 'The specified name is too long. It should be less than 128 characters';
+        }
+        if (/[?*/:<>|'"]/.test(args.options.name)) {
+            return `The specified name contains invalid characters. It cannot contain ?*/:<>|'". Please remove them and try again.`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.webUrl) {
+            return validation.isValidSharePointUrl(args.options.webUrl);
+        }
+        return true;
+    });
+}, _OneNoteNotebookAddCommand_initOptionSets = function _OneNoteNotebookAddCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
+        runsWhen: (args) => {
+            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
+            return options.some(item => item !== undefined);
+        }
+    });
+};
+export default new OneNoteNotebookAddCommand();
+//# sourceMappingURL=notebook-add.js.map

package/dist/m365/onenote/commands.js

@@ -1,5 +1,6 @@
 const prefix = 'onenote';
 export default {
+    NOTEBOOK_ADD: `${prefix} notebook add`,
     NOTEBOOK_LIST: `${prefix} notebook list`,
     PAGE_LIST: `${prefix} page list`
 };

package/dist/m365/pa/commands/app/app-export.js

@@ -3,7 +3,7 @@ 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 _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators;
+var _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators, _PaAppExportCommand_initTypes;
 import fs from 'fs';
 import path from 'path';
 import { setTimeout } from 'timers/promises';
@@ -26,14 +26,18 @@ class PaAppExportCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             const location = await this.exportPackage(args, logger);
-            const packageLink = await this.getPackageLink(args, logger, location);
-            //Replace all illegal characters from the file name
-            const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
-            const filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+            const packageLink = await this.getPackageLink(logger, location);
+            let filename = args.options.name;
+            if (args.options.packageDisplayName) {
+                //Replace all illegal characters from the file name
+                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+            }
             const requestOptions = {
                 url: packageLink,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
@@ -98,7 +102,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
                 details: {
                     creator: args.options.packageCreatedBy,
                     description: args.options.packageDescription,
-                    displayName: args.options.packageDisplayName,
+                    displayName: args.options.packageDisplayName || args.options.name,
                     sourceEnvironment: args.options.packageSourceEnvironment
                 },
                 resources: resources
@@ -108,7 +112,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
         const response = await request.post(requestOptions);
         return response.headers.location;
     }
-    async getPackageLink(args, logger, location) {
+    async getPackageLink(logger, location) {
         if (this.verbose) {
             await logger.logToStderr('Retrieving the package link and waiting on the exported package.');
         }
@@ -172,6 +176,8 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
         }
         return true;
     });
+}, _PaAppExportCommand_initTypes = function _PaAppExportCommand_initTypes() {
+    this.types.string.push('name', 'environmentName', 'packageDisplayName', 'packageDescription', 'packageCreatedBy', 'packageSourceEnvironment', 'path');
 };
 export default new PaAppExportCommand();
 //# sourceMappingURL=app-export.js.map

package/dist/m365/spo/commands/folder/folder-sharinglink-get.js

@@ -0,0 +1,86 @@
+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 _SpoFolderSharingLinkGetCommand_instances, _SpoFolderSharingLinkGetCommand_initTelemetry, _SpoFolderSharingLinkGetCommand_initOptions, _SpoFolderSharingLinkGetCommand_initOptionSets, _SpoFolderSharingLinkGetCommand_initValidators, _SpoFolderSharingLinkGetCommand_initTypes;
+import request from '../../../../request.js';
+import { spo } from '../../../../utils/spo.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+import { drive as driveItem } from '../../../../utils/drive.js';
+class SpoFolderSharingLinkGetCommand extends SpoCommand {
+    get name() {
+        return commands.FOLDER_SHARINGLINK_GET;
+    }
+    get description() {
+        return 'Gets details about a specific sharing link on a folder';
+    }
+    constructor() {
+        super();
+        _SpoFolderSharingLinkGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkGetCommand_instances, "m", _SpoFolderSharingLinkGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkGetCommand_instances, "m", _SpoFolderSharingLinkGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkGetCommand_instances, "m", _SpoFolderSharingLinkGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkGetCommand_instances, "m", _SpoFolderSharingLinkGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkGetCommand_instances, "m", _SpoFolderSharingLinkGetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving sharing link on folder ${args.options.folderId || args.options.folderUrl}...`);
+        }
+        try {
+            const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId);
+            const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
+            const folderUrl = new URL(absoluteFolderUrl);
+            const siteId = await spo.getSiteId(args.options.webUrl);
+            const drive = await driveItem.getDriveByUrl(siteId, folderUrl);
+            const itemId = await driveItem.getDriveItemId(drive, folderUrl);
+            const requestUrl = `https://graph.microsoft.com/v1.0/drives/${drive.id}/items/${itemId}/permissions/${args.options.id}`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const permission = await request.get(requestOptions);
+            await logger.log(permission);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_SpoFolderSharingLinkGetCommand_instances = new WeakSet(), _SpoFolderSharingLinkGetCommand_initTelemetry = function _SpoFolderSharingLinkGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            folderId: typeof args.options.folderId !== 'undefined'
+        });
+    });
+}, _SpoFolderSharingLinkGetCommand_initOptions = function _SpoFolderSharingLinkGetCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '--folderUrl [folderUrl]' }, { option: '--folderId [folderId]' }, { option: '-i, --id <id>' });
+}, _SpoFolderSharingLinkGetCommand_initOptionSets = function _SpoFolderSharingLinkGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderUrl', 'folderId'] });
+}, _SpoFolderSharingLinkGetCommand_initValidators = function _SpoFolderSharingLinkGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId && !validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID for option 'folderId'.`;
+        }
+        if (!validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option 'id'.`;
+        }
+        return true;
+    });
+}, _SpoFolderSharingLinkGetCommand_initTypes = function _SpoFolderSharingLinkGetCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderUrl', 'folderId', 'id');
+};
+export default new SpoFolderSharingLinkGetCommand();
+//# sourceMappingURL=folder-sharinglink-get.js.map