@pnp/cli-microsoft365 11.7.0 → 11.8.0-beta.ae98113

package/dist/m365/outlook/commands/calendargroup/calendargroup-remove.js

@@ -0,0 +1,98 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { cli } from '../../../../cli/cli.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { calendarGroup } from '../../../../utils/calendarGroup.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().optional(),
+    name: z.string().optional(),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
+class OutlookCalendarGroupRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDARGROUP_REMOVE;
+    }
+    get description() {
+        return 'Removes a calendar group';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.name, {
+            error: 'Specify either id or name.'
+        })
+            .refine(options => !(options.id && options.name), {
+            error: 'Specify either id or name, but not both.'
+        })
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        const removeCalendarGroup = async () => {
+            try {
+                const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+                const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+                if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required.';
+                }
+                let endpoint;
+                let graphUserId;
+                if (args.options.userId || args.options.userName) {
+                    graphUserId = (args.options.userId ?? args.options.userName);
+                }
+                else {
+                    graphUserId = accessToken.getUserIdFromAccessToken(token);
+                }
+                endpoint = `${this.resource}/v1.0/users('${formatting.encodeQueryParameter(graphUserId)}')`;
+                let calendarGroupId = args.options.id;
+                if (args.options.name) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving calendar group by name '${args.options.name}'...`);
+                    }
+                    const calendarGroupResult = await calendarGroup.getUserCalendarGroupByName(graphUserId, args.options.name);
+                    calendarGroupId = calendarGroupResult.id;
+                }
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing calendar group '${calendarGroupId}'...`);
+                }
+                const requestOptions = {
+                    url: `${endpoint}/calendarGroups/${calendarGroupId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeCalendarGroup();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove calendar group '${args.options.id || args.options.name}'?` });
+            if (result) {
+                await removeCalendarGroup();
+            }
+        }
+    }
+}
+export default new OutlookCalendarGroupRemoveCommand();
+//# sourceMappingURL=calendargroup-remove.js.map

package/dist/m365/outlook/commands.js

@@ -6,6 +6,7 @@ export default {
     CALENDAR_SET: `${prefix} calendar set`,
     CALENDARGROUP_GET: `${prefix} calendargroup get`,
     CALENDARGROUP_LIST: `${prefix} calendargroup list`,
+    CALENDARGROUP_REMOVE: `${prefix} calendargroup remove`,
     CALENDARGROUP_SET: `${prefix} calendargroup set`,
     EVENT_CANCEL: `${prefix} event cancel`,
     EVENT_LIST: `${prefix} event list`,

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -16,11 +16,11 @@ export const workflow = {
             steps: [
                 {
                     name: "Checkout",
-                    uses: "actions/checkout@v4"
+                    uses: "actions/checkout@v6"
                 },
                 {
                     name: "Use Node.js",
-                    uses: "actions/setup-node@v4",
+                    uses: "actions/setup-node@v6",
                     with: {
                         "node-version": "${{ env.NodeVersion }}"
                     }
@@ -35,7 +35,7 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Login",
-                    uses: "pnp/action-cli-login@v2.2.4",
+                    uses: "pnp/action-cli-login@v4",
                     with: {
                         "CERTIFICATE_ENCODED": "${{ secrets.CERTIFICATE_ENCODED }}",
                         "CERTIFICATE_PASSWORD": "${{ secrets.CERTIFICATE_PASSWORD }}",
@@ -45,9 +45,9 @@ export const workflow = {
                 },
                 {
                     name: "CLI for Microsoft 365 Deploy App",
-                    uses: "pnp/action-cli-deploy@v4.0.0",
+                    uses: "pnp/action-cli-deploy@v6",
                     with: {
-                        "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
+                        "APP_FILE_PATH": "sharepoint/{{ sppkgPath }}",
                         "SKIP_FEATURE_DEPLOYMENT": false,
                         "OVERWRITE": true
                     }
@@ -105,6 +105,10 @@ export const pipeline = {
             name: "PackageName",
             value: ""
         },
+        {
+            name: "SppkgPath",
+            value: ""
+        },
         {
             name: "SiteAppCatalogUrl",
             value: ""

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -34,14 +34,14 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
-        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
-        const solutionName = JSON.parse(packageJson).name;
         if (this.debug) {
             await logger.logToStderr(`Adding Azure DevOps pipeline in the current SPFx project`);
         }
         try {
-            this.updatePipeline(solutionName, pipeline, args.options);
+            const project = { path: this.projectRootPath };
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+            const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
+            this.updatePipeline(sppkgPath, pipeline, args.options);
             this.savePipeline(pipeline);
         }
         catch (error) {
@@ -56,7 +56,7 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         const pipelineFile = path.join(pipelinesPath, 'deploy-spfx-solution.yml');
         fs.writeFileSync(path.resolve(pipelineFile), yaml.stringify(pipeline), 'utf-8');
     }
-    updatePipeline(solutionName, pipeline, options) {
+    updatePipeline(sppkgPath, pipeline, options) {
         if (options.name) {
             pipeline.name = options.name;
         }
@@ -93,16 +93,17 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             }
             if (options.scope === 'sitecollection') {
                 script.script = script.script.replace(`{{deploy}}`, `m365 spo app deploy --name '$(PackageName)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)'`);
-                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/solution/$(PackageName)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)' --overwrite`);
+                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/$(SppkgPath)' --appCatalogScope sitecollection --appCatalogUrl '$(SiteAppCatalogUrl)' --overwrite`);
                 this.assignPipelineVariables(pipeline, 'SiteAppCatalogUrl', options.siteUrl);
             }
             else {
                 script.script = script.script.replace(`{{deploy}}`, `m365 spo app deploy --name '$(PackageName)' --appCatalogScope 'tenant'`);
-                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/solution/$(PackageName)' --overwrite`);
+                script.script = script.script.replace(`{{addApp}}`, `m365 spo app add --filePath '$(Build.SourcesDirectory)/sharepoint/$(SppkgPath)' --overwrite`);
                 pipeline.variables = pipeline.variables.filter(v => v.name !== 'SiteAppCatalogUrl');
             }
-            if (solutionName) {
-                this.assignPipelineVariables(pipeline, 'PackageName', `${solutionName}.sppkg`);
+            if (sppkgPath) {
+                this.assignPipelineVariables(pipeline, 'SppkgPath', sppkgPath);
+                this.assignPipelineVariables(pipeline, 'PackageName', path.basename(sppkgPath));
             }
             if (options.skipFeatureDeployment) {
                 script.script = script.script.replace(`m365 spo app deploy `, `m365 spo app deploy --skipFeatureDeployment `);

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -34,14 +34,16 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
-        const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
-        const solutionName = JSON.parse(packageJson).name;
-        if (this.debug) {
-            await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
-        }
         try {
-            this.updateWorkflow(solutionName, workflow, args.options);
+            const project = { path: this.projectRootPath };
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'package.json'), project, 'packageJson');
+            this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
+            const solutionName = project.packageJson.name;
+            const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
+            if (this.debug) {
+                await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
+            }
+            this.updateWorkflow(solutionName, sppkgPath, workflow, args.options);
             this.saveWorkflow(workflow);
         }
         catch (error) {
@@ -56,7 +58,7 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const workflowFile = path.join(workflowPath, 'deploy-spfx-solution.yml');
         fs.writeFileSync(path.resolve(workflowFile), yaml.stringify(workflow), 'utf-8');
     }
-    updateWorkflow(solutionName, workflow, options) {
+    updateWorkflow(solutionName, sppkgPath, workflow, options) {
         workflow.name = options.name ? options.name : workflow.name.replace('{{ name }}', solutionName);
         if (options.branchName) {
             workflow.on.push.branches[0] = options.branchName;
@@ -90,9 +92,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             deployAction.with.SCOPE = 'sitecollection';
             deployAction.with.SITE_COLLECTION_URL = options.siteUrl;
         }
-        if (solutionName) {
+        if (sppkgPath) {
             const deployAction = this.getDeployAction(workflow);
-            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ solutionName }}', solutionName);
+            deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ sppkgPath }}', sppkgPath);
         }
     }
     assignNodeVersion(workflow, nodeVersion) {

package/docs/docs/cmd/outlook/calendargroup/calendargroup-remove.mdx

@@ -0,0 +1,91 @@
+import Global from '../../_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# outlook calendargroup remove
+
+Removes a calendar group.
+
+## Usage
+
+```sh
+m365 outlook calendargroup remove [options]
+```
+
+## Options
+
+```md definition-list
+`--id [id]`
+: ID of the calendar group to remove. Specify either `id` or `name`, but not both.
+
+`--name [name]`
+: Name of the calendar group to remove. Specify either `id` or `name`, but not both.
+
+`--userId [userId]`
+: ID of the user. Specify either `userId` or `userName`, but not both. This option is required when using application permissions.
+
+`--userName [userName]`
+: UPN of the user. Specify either `userId` or `userName`, but not both. This option is required when using application permissions.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Permissions
+
+<Tabs>
+  <TabItem value="Delegated">
+
+  | Resource        | Permissions          |
+  |-----------------|----------------------|
+  | Microsoft Graph | Calendars.ReadWrite  |
+
+  </TabItem>
+  <TabItem value="Application">
+
+  | Resource        | Permissions          |
+  |-----------------|----------------------|
+  | Microsoft Graph | Calendars.ReadWrite  |
+
+  </TabItem>
+</Tabs>
+
+## Remarks
+
+:::warning
+
+The calendar group must be empty before it can be removed. Make sure to delete all calendars in the group first.
+
+:::
+
+## Examples
+
+Remove a calendar group specified by id for the signed-in user.
+
+```sh
+m365 outlook calendargroup remove --id "AAMkAGE0MGM1Y2M5LWEzMmUtNGVlNy05MjRlLTk0YmYyY2I5NTM3ZAAuAAAAAAC_0WfqSjt_SqLtNkuO-bj1AQAbfYq5lmBxQ6a4t1fGbeYAAAAAAEOAAA="
+```
+
+Remove a calendar group specified by name for the signed-in user.
+
+```sh
+m365 outlook calendargroup remove --name "Personal Events"
+```
+
+Remove a calendar group specified by id for a user specified by id.
+
+```sh
+m365 outlook calendargroup remove --id "AAMkADIxYjJiYm" --userId "44288f7d-7710-4293-8c8e-36f310ed2e6a"
+```
+
+Remove a calendar group specified by name for a user specified by UPN without prompting for confirmation.
+
+```sh
+m365 outlook calendargroup remove --name "Personal Events" --userName "john.doe@contoso.com" --force
+```
+
+## Response
+
+The command won't return a response on success.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "11.7.0",
+  "version": "11.8.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pnp/cli-microsoft365",
-      "version": "11.7.0",
+      "version": "11.8.0",
       "license": "MIT",
       "dependencies": {
         "@azure/msal-common": "^16.4.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "11.7.0",
+  "version": "11.8.0-beta.ae98113",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -341,4 +341,4 @@
     "source-map-support": "^0.5.21",
     "tsc-watch": "^7.2.0"
   }
-}
+}