From 62080a91321c5f5371eb498cdafbe7c391da2ca3 Mon Sep 17 00:00:00 2001
From: Saurabh Tripathi <saurabh7019@gmail.com>
Date: Wed, 30 Jul 2025 22:36:02 +0200
Subject: [PATCH 1/2] New command: spo file version keep. Closes #6774

---
 docs/docs/cmd/spo/file/file-version-keep.mdx  |  47 +++++
 docs/src/config/sidebars.ts                   |   5 +
 src/m365/spo/commands.ts                      |   1 +
 .../commands/file/file-version-keep.spec.ts   | 185 ++++++++++++++++++
 .../spo/commands/file/file-version-keep.ts    | 109 +++++++++++
 5 files changed, 347 insertions(+)
 create mode 100644 docs/docs/cmd/spo/file/file-version-keep.mdx
 create mode 100644 src/m365/spo/commands/file/file-version-keep.spec.ts
 create mode 100644 src/m365/spo/commands/file/file-version-keep.ts

diff --git a/docs/docs/cmd/spo/file/file-version-keep.mdx b/docs/docs/cmd/spo/file/file-version-keep.mdx
new file mode 100644
index 00000000000..b2fbce1a034
--- /dev/null
+++ b/docs/docs/cmd/spo/file/file-version-keep.mdx
@@ -0,0 +1,47 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# spo file version keep
+
+Ensure that a specific file version will never expire.
+
+## Usage
+
+```sh
+m365 spo file version keep [options]
+```
+
+## Options
+
+```md definition-list
+`-u, --webUrl <webUrl>`
+: The URL of the site where the file is located.
+
+`--fileUrl [fileUrl]`
+: The server- or site-relative decoded URL. Specify either `fileUrl` or `fileId` but not both.
+
+`-i, --fileId [fileId]`
+: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
+
+`--label <label>`
+: Label of the version.
+```
+
+<Global />
+
+## Examples
+
+Mark a file version as never expiring by webUrl and fileUrl.
+
+```sh
+m365 spo file version keep --webUrl "https://contoso.sharepoint.com/sites/marketing" --fileUrl "/sites/marketing/Documents/report.docx" --label "6.0"
+```
+
+Mark a file version as never expiring by webUrl and fileId.
+
+```sh
+m365 spo file version keep --webUrl "https://contoso.sharepoint.com/sites/marketing" --fileId "12345678-90ab-cdef-1234-567890abcdef" --label "6.0"
+```
+
+## Response
+
+The command won't return a response on success.
diff --git a/docs/src/config/sidebars.ts b/docs/src/config/sidebars.ts
index aa99673fe24..c7c0a5489a9 100644
--- a/docs/src/config/sidebars.ts
+++ b/docs/src/config/sidebars.ts
@@ -2758,6 +2758,11 @@ const sidebars: SidebarsConfig = {
               label: 'file version get',
               id: 'cmd/spo/file/file-version-get'
             },
+            {
+              type: 'doc',
+              label: 'file version keep',
+              id: 'cmd/spo/file/file-version-keep'
+            },
             {
               type: 'doc',
               label: 'file version list',
diff --git a/src/m365/spo/commands.ts b/src/m365/spo/commands.ts
index af9f2844b94..5c370016428 100644
--- a/src/m365/spo/commands.ts
+++ b/src/m365/spo/commands.ts
@@ -84,6 +84,7 @@ export default {
   FILE_SHARINGLINK_SET: `${prefix} file sharinglink set`,
   FILE_VERSION_CLEAR: `${prefix} file version clear`,
   FILE_VERSION_GET: `${prefix} file version get`,
+  FILE_VERSION_KEEP: `${prefix} file version keep`,
   FILE_VERSION_LIST: `${prefix} file version list`,
   FILE_VERSION_REMOVE: `${prefix} file version remove`,
   FILE_VERSION_RESTORE: `${prefix} file version restore`,
diff --git a/src/m365/spo/commands/file/file-version-keep.spec.ts b/src/m365/spo/commands/file/file-version-keep.spec.ts
new file mode 100644
index 00000000000..8b27304fa5b
--- /dev/null
+++ b/src/m365/spo/commands/file/file-version-keep.spec.ts
@@ -0,0 +1,185 @@
+import assert from 'assert';
+import sinon from 'sinon';
+import auth from '../../../../Auth.js';
+import { cli } from '../../../../cli/cli.js';
+import { CommandInfo } from '../../../../cli/CommandInfo.js';
+import { Logger } from '../../../../cli/Logger.js';
+import { CommandError } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { telemetry } from '../../../../telemetry.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { pid } from '../../../../utils/pid.js';
+import { session } from '../../../../utils/session.js';
+import { sinonUtil } from '../../../../utils/sinonUtil.js';
+import { z } from 'zod';
+import commands from '../../commands.js';
+import command from './file-version-keep.js';
+
+describe(commands.FILE_VERSION_KEEP, () => {
+  let log: any[];
+  let logger: Logger;
+  let commandInfo: CommandInfo;
+  let commandOptionsSchema: z.ZodTypeAny;
+  const validWebUrl = "https://contoso.sharepoint.com";
+  const validFileUrl = "/Shared Documents/Document.docx";
+  const validFileId = "7a9b8bb6-d5c4-4de9-ab76-5210a7879e89";
+  const validLabel = "1.0";
+
+  before(() => {
+    sinon.stub(auth, 'restoreAuth').resolves();
+    sinon.stub(telemetry, 'trackEvent').resolves();
+    sinon.stub(pid, 'getProcessName').returns('');
+    sinon.stub(session, 'getId').returns('');
+    commandInfo = cli.getCommandInfo(command);
+    commandOptionsSchema = commandInfo.command.getSchemaToParse()!;
+    auth.connection.active = true;
+  });
+
+  beforeEach(() => {
+    log = [];
+    logger = {
+      log: async (msg: string) => {
+        log.push(msg);
+      },
+      logRaw: async (msg: string) => {
+        log.push(msg);
+      },
+      logToStderr: async (msg: string) => {
+        log.push(msg);
+      }
+    };
+  });
+
+  afterEach(() => {
+    sinonUtil.restore([
+      request.get,
+      request.post
+    ]);
+  });
+
+  after(() => {
+    sinon.restore();
+    auth.connection.active = false;
+  });
+
+  it('has correct name', () => {
+    assert.strictEqual(command.name, commands.FILE_VERSION_KEEP);
+  });
+
+  it('has a description', () => {
+    assert.notStrictEqual(command.description, null);
+  });
+
+  it('fails validation if webUrl is not a valid URL', async () => {
+    const actual = commandOptionsSchema.safeParse({ webUrl: 'foo', label: validLabel, fileUrl: validFileUrl });
+    assert.strictEqual(actual.success, false);
+  });
+
+  it('fails validation if fileId is not a valid GUID', async () => {
+    const actual = commandOptionsSchema.safeParse({ webUrl: validWebUrl, fileId: 'invalid' });
+    assert.strictEqual(actual.success, false);
+  });
+
+  it('fails validation if fileUrl and fileId are specified', async () => {
+    const actual = commandOptionsSchema.safeParse({ webUrl: validWebUrl, fileUrl: validFileUrl, fileId: validFileId });
+    assert.strictEqual(actual.success, false);
+  });
+
+  it('passes validation if fileUrl is specified', async () => {
+    const actual = await command.validate({ options: { webUrl: validWebUrl, label: validLabel, fileUrl: validFileUrl } }, commandInfo);
+    assert.strictEqual(actual, true);
+  });
+
+  it('passes validation if fileId is specified', async () => {
+    const actual = await command.validate({ options: { webUrl: validWebUrl, label: validLabel, fileId: validFileId } }, commandInfo);
+    assert.strictEqual(actual, true);
+  });
+
+  it('ensures that a specific file version will never expire (fileUrl)', async () => {
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+        return {
+          value: [
+            {
+              ID: 1,
+              VersionLabel: validLabel
+            }
+          ]
+        };
+      }
+
+      throw 'Invalid request';
+    });
+
+    sinon.stub(request, 'post').callsFake(async (opts) => {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions(1)/SetExpirationDate()`) {
+        return;
+      }
+
+      throw 'Invalid request';
+    });
+
+    await command.action(logger, { options: { webUrl: validWebUrl, fileUrl: validFileUrl, label: validLabel, verbose: true } });
+  });
+
+  it('ensures that a specific file version will never expire (fileId)', async () => {
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+        return {
+          value: [
+            {
+              ID: 1,
+              VersionLabel: validLabel
+            }
+          ]
+        };
+      }
+
+      throw 'Invalid request';
+    });
+
+    sinon.stub(request, 'post').callsFake(async (opts) => {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions(1)/SetExpirationDate()`) {
+        return;
+      }
+
+      throw 'Invalid request';
+    });
+
+    await command.action(logger, { options: { webUrl: validWebUrl, fileId: validFileId, label: validLabel, verbose: true } });
+  });
+
+  it('correctly handles error when the specified version does not exist', async () => {
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+        return { value: [] };
+      }
+
+      throw 'Invalid request';
+    });
+    await assert.rejects(command.action(logger, { options: { webUrl: validWebUrl, fileUrl: validFileUrl, label: validLabel } }),
+      new CommandError(`Version with label '${validLabel}' not found.`));
+  });
+
+  it('correctly handles API OData error', async () => {
+    sinon.stub(request, 'get').callsFake(async (opts) => {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+        throw {
+          error: {
+            'odata.error': {
+              code: '-1, Microsoft.SharePoint.Client.InvalidOperationException',
+              message: {
+                value: 'Invalid version request'
+              }
+            }
+          }
+        };
+      }
+
+      throw 'Invalid request';
+    });
+
+    await assert.rejects(command.action(logger, { options: { webUrl: validWebUrl, fileId: validFileId, label: validLabel } }),
+      new CommandError('Invalid version request'));
+  });
+});
\ No newline at end of file
diff --git a/src/m365/spo/commands/file/file-version-keep.ts b/src/m365/spo/commands/file/file-version-keep.ts
new file mode 100644
index 00000000000..560641d414b
--- /dev/null
+++ b/src/m365/spo/commands/file/file-version-keep.ts
@@ -0,0 +1,109 @@
+import commands from '../../commands.js';
+import { Logger } from '../../../../cli/Logger.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { validation } from '../../../../utils/validation.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import request, { CliRequestOptions } from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+
+export const options = globalOptionsZod
+  .extend({
+    webUrl: zod.alias('u', z.string()
+      .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+      }))
+    ),
+    fileUrl: z.string().optional(),
+    fileId: zod.alias('i', z.string().optional()
+      .refine(id => id === undefined || validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+      }))
+    ),
+    label: z.string()
+  })
+  .strict();
+
+declare type Options = z.infer<typeof options>;
+
+interface CommandArgs {
+  options: Options;
+}
+
+class SpoFileVersionKeepCommand extends SpoCommand {
+  public get name(): string {
+    return commands.FILE_VERSION_KEEP;
+  }
+
+  public get description(): string {
+    return 'Ensure that a specific file version will never expire';
+  }
+
+  public get schema(): z.ZodTypeAny | undefined {
+    return options;
+  }
+
+  public getRefinedSchema(schema: z.ZodTypeAny): z.ZodEffects<any> | undefined {
+    return schema
+      .refine(options => (options.fileUrl !== undefined) !== (options.fileId !== undefined), {
+        message: `Specify 'fileUrl' or 'fileId', but not both.`
+      });
+  }
+
+  public async commandAction(logger: Logger, args: CommandArgs): Promise<void> {
+    if (this.verbose) {
+      await logger.logToStderr(`Ensuring version '${args.options.label}' of file '${args.options.fileUrl || args.options.fileId}' at site '${args.options.webUrl}' will never expire...`);
+    }
+
+    try {
+      const fileUrl = this.getFileUrl(args.options.webUrl, args.options.fileUrl, args.options.fileId);
+
+      const requestVersionOptions: CliRequestOptions = {
+        url: `${fileUrl}/versions/?$filter=VersionLabel eq '${args.options.label}'`,
+        headers: {
+          'accept': 'application/json;odata=nometadata'
+        },
+        responseType: 'json'
+      };
+
+      const response = await request.get<{ value: { ID: number }[] }>(requestVersionOptions);
+      const version: { ID: number; } | undefined = response.value[0];
+
+      if (version === undefined) {
+        throw `Version with label '${args.options.label}' not found.`;
+      }
+
+      const requestExpirationOptions: CliRequestOptions = {
+        url: `${fileUrl}/versions(${version.ID})/SetExpirationDate()`,
+        headers: {
+          'accept': 'application/json;odata=nometadata',
+          'content-type': 'application/json'
+        },
+        responseType: 'json'
+      };
+
+      await request.post(requestExpirationOptions);
+    }
+    catch (err: any) {
+      this.handleRejectedODataJsonPromise(err);
+    }
+  }
+
+  private getFileUrl(webUrl: string, fileUrl?: string, fileId?: string): string {
+    let requestUrl: string;
+
+    if (fileUrl) {
+      const serverRelUrl = urlUtil.getServerRelativePath(webUrl, fileUrl);
+      requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelUrl)}')`;
+    }
+    else {
+      requestUrl = `${webUrl}/_api/web/GetFileById('${fileId}')`;
+    }
+
+    return requestUrl;
+  }
+}
+
+export default new SpoFileVersionKeepCommand();
\ No newline at end of file

From 6f5d4b798bc1b0c40f8960c65318d08aed06d1c6 Mon Sep 17 00:00:00 2001
From: Saurabh Tripathi <saurabh7019@gmail.com>
Date: Sat, 9 Aug 2025 12:29:04 +0200
Subject: [PATCH 2/2] addressed code review feedback

---
 .devproxy/api-specs/sharepoint.yaml           | 41 +++++++++++++++++++
 docs/docs/cmd/spo/file/file-version-keep.mdx  | 25 ++++++++++-
 .../commands/file/file-version-keep.spec.ts   | 19 ++++++---
 .../spo/commands/file/file-version-keep.ts    | 18 ++++----
 4 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/.devproxy/api-specs/sharepoint.yaml b/.devproxy/api-specs/sharepoint.yaml
index 0733249d969..3898aca7638 100644
--- a/.devproxy/api-specs/sharepoint.yaml
+++ b/.devproxy/api-specs/sharepoint.yaml
@@ -104,6 +104,47 @@ paths:
       responses:
         200:
           description: OK
+  /_api/web/GetFileById({fileId})/versions/:
+    get:
+      parameters:
+        - name: fileId
+          in: path
+          required: true
+          schema:
+            type: string
+          example: "'19bbfec4-4425-4660-95cb-da1887baa7b9'"
+      security:
+        - delegated:
+            - AllSites.Read
+            - AllSites.Write
+            - AllSites.Manage
+            - AllSites.FullControl
+      responses:
+        200:
+          description: OK
+  /_api/web/GetFileById({fileId})/versions({versionId})/SetExpirationDate():
+    post:
+      parameters:
+        - name: fileId
+          in: path
+          required: true
+          schema:
+            type: string
+          example: "'19bbfec4-4425-4660-95cb-da1887baa7b9'"
+        - name: versionId
+          in: path
+          required: true
+          schema:
+            type: integer
+          example: 1030
+      security:
+        - delegated:
+            - AllSites.Write
+            - AllSites.Manage
+            - AllSites.FullControl
+      responses:
+        200:
+          description: OK
   /_api/web/GetFolderByServerRelativePath(DecodedUrl={folderPath}):
     get:
       parameters:
diff --git a/docs/docs/cmd/spo/file/file-version-keep.mdx b/docs/docs/cmd/spo/file/file-version-keep.mdx
index b2fbce1a034..ca1ae5cf1da 100644
--- a/docs/docs/cmd/spo/file/file-version-keep.mdx
+++ b/docs/docs/cmd/spo/file/file-version-keep.mdx
@@ -1,4 +1,6 @@
 import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
 
 # spo file version keep
 
@@ -28,15 +30,34 @@ m365 spo file version keep [options]
 
 <Global />
 
+## Permissions
+
+<Tabs>
+  <TabItem value="Delegated" label="Delegated">
+  
+  | Resource   | Permissions                                      |
+  |------------|--------------------------------------------------|
+  | SharePoint | AllSites.Write, AllSites.Manage, AllSites.FullControl |
+
+  </TabItem>
+  <TabItem value="Application" label="Application">
+  
+  | Resource   | Permissions                                         |
+  |------------|-----------------------------------------------------|
+  | SharePoint | Sites.ReadWrite.All, Sites.Manage.All, Sites.FullControl.All |
+
+  </TabItem>
+</Tabs>
+
 ## Examples
 
-Mark a file version as never expiring by webUrl and fileUrl.
+Mark a file version as never expiring by file URL.
 
 ```sh
 m365 spo file version keep --webUrl "https://contoso.sharepoint.com/sites/marketing" --fileUrl "/sites/marketing/Documents/report.docx" --label "6.0"
 ```
 
-Mark a file version as never expiring by webUrl and fileId.
+Mark a file version as never expiring by file ID.
 
 ```sh
 m365 spo file version keep --webUrl "https://contoso.sharepoint.com/sites/marketing" --fileId "12345678-90ab-cdef-1234-567890abcdef" --label "6.0"
diff --git a/src/m365/spo/commands/file/file-version-keep.spec.ts b/src/m365/spo/commands/file/file-version-keep.spec.ts
index 8b27304fa5b..6fdbd5e84c3 100644
--- a/src/m365/spo/commands/file/file-version-keep.spec.ts
+++ b/src/m365/spo/commands/file/file-version-keep.spec.ts
@@ -85,6 +85,11 @@ describe(commands.FILE_VERSION_KEEP, () => {
     assert.strictEqual(actual.success, false);
   });
 
+  it('fails validation if label is not specified', async () => {
+    const actual = commandOptionsSchema.safeParse({ webUrl: validWebUrl, fileUrl: validFileUrl });
+    assert.strictEqual(actual.success, false);
+  });
+
   it('passes validation if fileUrl is specified', async () => {
     const actual = await command.validate({ options: { webUrl: validWebUrl, label: validLabel, fileUrl: validFileUrl } }, commandInfo);
     assert.strictEqual(actual, true);
@@ -97,7 +102,7 @@ describe(commands.FILE_VERSION_KEEP, () => {
 
   it('ensures that a specific file version will never expire (fileUrl)', async () => {
     sinon.stub(request, 'get').callsFake(async (opts) => {
-      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions/?$filter=VersionLabel eq '${validLabel}'&$select=Id`) {
         return {
           value: [
             {
@@ -111,7 +116,7 @@ describe(commands.FILE_VERSION_KEEP, () => {
       throw 'Invalid request';
     });
 
-    sinon.stub(request, 'post').callsFake(async (opts) => {
+    const postStub: sinon.SinonStub = sinon.stub(request, 'post').callsFake(async (opts) => {
       if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions(1)/SetExpirationDate()`) {
         return;
       }
@@ -120,11 +125,12 @@ describe(commands.FILE_VERSION_KEEP, () => {
     });
 
     await command.action(logger, { options: { webUrl: validWebUrl, fileUrl: validFileUrl, label: validLabel, verbose: true } });
+    assert.strictEqual(postStub.lastCall.args[0].url, `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions(1)/SetExpirationDate()`);
   });
 
   it('ensures that a specific file version will never expire (fileId)', async () => {
     sinon.stub(request, 'get').callsFake(async (opts) => {
-      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions/?$filter=VersionLabel eq '${validLabel}'&$select=Id`) {
         return {
           value: [
             {
@@ -138,7 +144,7 @@ describe(commands.FILE_VERSION_KEEP, () => {
       throw 'Invalid request';
     });
 
-    sinon.stub(request, 'post').callsFake(async (opts) => {
+    const postStub: sinon.SinonStub = sinon.stub(request, 'post').callsFake(async (opts) => {
       if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions(1)/SetExpirationDate()`) {
         return;
       }
@@ -147,11 +153,12 @@ describe(commands.FILE_VERSION_KEEP, () => {
     });
 
     await command.action(logger, { options: { webUrl: validWebUrl, fileId: validFileId, label: validLabel, verbose: true } });
+    assert.strictEqual(postStub.lastCall.args[0].url, `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions(1)/SetExpirationDate()`);
   });
 
   it('correctly handles error when the specified version does not exist', async () => {
     sinon.stub(request, 'get').callsFake(async (opts) => {
-      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(validFileUrl)}')/versions/?$filter=VersionLabel eq '${validLabel}'&$select=Id`) {
         return { value: [] };
       }
 
@@ -163,7 +170,7 @@ describe(commands.FILE_VERSION_KEEP, () => {
 
   it('correctly handles API OData error', async () => {
     sinon.stub(request, 'get').callsFake(async (opts) => {
-      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions/?$filter=VersionLabel eq '${validLabel}'`) {
+      if (opts.url === `${validWebUrl}/_api/web/GetFileById('${validFileId}')/versions/?$filter=VersionLabel eq '${validLabel}'&$select=Id`) {
         throw {
           error: {
             'odata.error': {
diff --git a/src/m365/spo/commands/file/file-version-keep.ts b/src/m365/spo/commands/file/file-version-keep.ts
index 560641d414b..b030f02671e 100644
--- a/src/m365/spo/commands/file/file-version-keep.ts
+++ b/src/m365/spo/commands/file/file-version-keep.ts
@@ -17,10 +17,10 @@ export const options = globalOptionsZod
       }))
     ),
     fileUrl: z.string().optional(),
-    fileId: zod.alias('i', z.string().optional()
+    fileId: zod.alias('i', z.string()
       .refine(id => id === undefined || validation.isValidGuid(id), id => ({
         message: `'${id}' is not a valid GUID.`
-      }))
+      })).optional()
     ),
     label: z.string()
   })
@@ -47,7 +47,7 @@ class SpoFileVersionKeepCommand extends SpoCommand {
 
   public getRefinedSchema(schema: z.ZodTypeAny): z.ZodEffects<any> | undefined {
     return schema
-      .refine(options => (options.fileUrl !== undefined) !== (options.fileId !== undefined), {
+      .refine(options => [options.fileUrl, options.fileId].filter(o => o !== undefined).length === 1, {
         message: `Specify 'fileUrl' or 'fileId', but not both.`
       });
   }
@@ -58,12 +58,12 @@ class SpoFileVersionKeepCommand extends SpoCommand {
     }
 
     try {
-      const fileUrl = this.getFileUrl(args.options.webUrl, args.options.fileUrl, args.options.fileId);
+      const baseApiUrl = this.getBaseApiUrl(args.options.webUrl, args.options.fileUrl, args.options.fileId);
 
       const requestVersionOptions: CliRequestOptions = {
-        url: `${fileUrl}/versions/?$filter=VersionLabel eq '${args.options.label}'`,
+        url: `${baseApiUrl}/versions/?$filter=VersionLabel eq '${args.options.label}'&$select=Id`,
         headers: {
-          'accept': 'application/json;odata=nometadata'
+          accept: 'application/json;odata=nometadata'
         },
         responseType: 'json'
       };
@@ -76,9 +76,9 @@ class SpoFileVersionKeepCommand extends SpoCommand {
       }
 
       const requestExpirationOptions: CliRequestOptions = {
-        url: `${fileUrl}/versions(${version.ID})/SetExpirationDate()`,
+        url: `${baseApiUrl}/versions(${version.ID})/SetExpirationDate()`,
         headers: {
-          'accept': 'application/json;odata=nometadata',
+          accept: 'application/json;odata=nometadata',
           'content-type': 'application/json'
         },
         responseType: 'json'
@@ -91,7 +91,7 @@ class SpoFileVersionKeepCommand extends SpoCommand {
     }
   }
 
-  private getFileUrl(webUrl: string, fileUrl?: string, fileId?: string): string {
+  private getBaseApiUrl(webUrl: string, fileUrl?: string, fileId?: string): string {
     let requestUrl: string;
 
     if (fileUrl) {