@pnp/cli-microsoft365 11.0.0-beta.4be9237 → 11.0.0-beta.677f8d3

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -1,20 +1,25 @@
-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 _SpfxProjectUpgradeCommand_instances, _a, _SpfxProjectUpgradeCommand_initTelemetry, _SpfxProjectUpgradeCommand_initOptions, _SpfxProjectUpgradeCommand_initValidators;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 // uncomment to support upgrading to preview releases
 import { prerelease } from 'semver';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { packageManager } from '../../../../utils/packageManager.js';
+import { zod } from '../../../../utils/zod.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
 import { FN017001_MISC_npm_dedupe } from './project-upgrade/rules/FN017001_MISC_npm_dedupe.js';
+const options = globalOptionsZod
+    .extend({
+    packageManager: z.enum(['npm', 'pnpm', 'yarn']).default('npm'),
+    preview: z.boolean().optional(),
+    toVersion: zod.alias('v', z.string().optional()),
+    shell: z.enum(['bash', 'powershell', 'cmd']).default('powershell'),
+    output: z.enum(['json', 'text', 'md', 'tour', 'csv', 'none']).optional()
+})
+    .strict();
 class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_UPGRADE;
@@ -25,12 +30,14 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get allowedOutputs() {
         return ['json', 'text', 'md', 'tour'];
     }
+    get schema() {
+        return options;
+    }
     constructor() {
         super();
-        _SpfxProjectUpgradeCommand_instances.add(this);
         this.toVersion = '';
-        this.packageManager = 'npm';
-        this.shell = 'bash';
+        this.packageManager = '';
+        this.shell = '';
         this.allFindings = [];
         this.supportedVersions = [
             '1.0.0',
@@ -80,14 +87,11 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.21.1',
             '1.22.0-beta.1'
         ];
-        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
-            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
@@ -101,21 +105,21 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
         }
         this.packageManager = args.options.packageManager || 'npm';
-        this.shell = args.options.shell || 'bash';
+        this.shell = args.options.shell || 'powershell';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, _a.ERROR_UNSUPPORTED_TO_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading SharePoint Framework projects to version ${this.toVersion}. Supported versions are ${this.supportedVersions.join(', ')}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION);
         }
         this.projectVersion = this.getProjectVersion();
         if (!this.projectVersion) {
-            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, _a.ERROR_NO_VERSION);
+            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectUpgradeCommand.ERROR_NO_VERSION);
         }
         const pos = this.supportedVersions.indexOf(this.projectVersion);
         if (pos < 0) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, _a.ERROR_UNSUPPORTED_FROM_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support upgrading projects built using SharePoint Framework v${this.projectVersion}`, SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_FROM_VERSION);
         }
         const posTo = this.supportedVersions.indexOf(this.toVersion);
         if (pos > posTo) {
-            throw new CommandError('You cannot downgrade a project', _a.ERROR_NO_DOWNGRADE);
+            throw new CommandError('You cannot downgrade a project', SpfxProjectUpgradeCommand.ERROR_NO_DOWNGRADE);
         }
         if (pos === posTo) {
             await logger.log(`Project doesn't need to be upgraded`);
@@ -479,53 +483,6 @@ ${f.resolution}
         };
     }
 }
-_a = SpfxProjectUpgradeCommand, _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand_initTelemetry = function _SpfxProjectUpgradeCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            toVersion: args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1],
-            packageManager: args.options.packageManager || 'npm',
-            shell: args.options.shell || 'bash',
-            preview: args.options.preview
-        });
-        // uncomment to support upgrading to preview releases
-        if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
-    });
-}, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
-    this.options.unshift({
-        option: '-v, --toVersion [toVersion]'
-    }, {
-        option: '--packageManager [packageManager]',
-        autocomplete: _a.packageManagers
-    }, {
-        option: '--shell [shell]',
-        autocomplete: _a.shells
-    }, {
-        option: '--preview'
-    });
-    this.options.forEach(o => {
-        if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = this.allowedOutputs;
-        }
-    });
-}, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.packageManager) {
-            if (_a.packageManagers.indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${_a.packageManagers.join(', ')}`;
-            }
-        }
-        if (args.options.shell) {
-            if (_a.shells.indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are ${_a.shells.join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
-SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
-SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectUpgradeCommand.ERROR_UNSUPPORTED_TO_VERSION = 2;
 SpfxProjectUpgradeCommand.ERROR_NO_VERSION = 3;

package/dist/m365/spo/commands/file/file-version-keep.js

@@ -0,0 +1,78 @@
+import commands from '../../commands.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 from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.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()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional()),
+    label: z.string()
+})
+    .strict();
+class SpoFileVersionKeepCommand extends SpoCommand {
+    get name() {
+        return commands.FILE_VERSION_KEEP;
+    }
+    get description() {
+        return 'Ensure that a specific file version will never expire';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.fileUrl, options.fileId].filter(o => o !== undefined).length === 1, {
+            message: `Specify 'fileUrl' or 'fileId', but not both.`
+        });
+    }
+    async commandAction(logger, args) {
+        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 baseApiUrl = this.getBaseApiUrl(args.options.webUrl, args.options.fileUrl, args.options.fileId);
+            const response = await odata.getAllItems(`${baseApiUrl}/versions?$filter=VersionLabel eq '${formatting.encodeQueryParameter(args.options.label)}'&$select=ID`);
+            if (response.length === 0) {
+                throw `Version with label '${args.options.label}' not found.`;
+            }
+            const requestExpirationOptions = {
+                url: `${baseApiUrl}/versions(${response[0].ID})/SetExpirationDate()`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestExpirationOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getBaseApiUrl(webUrl, fileUrl, fileId) {
+        let requestUrl;
+        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();
+//# sourceMappingURL=file-version-keep.js.map

package/dist/m365/spo/commands/homesite/homesite-get.js

@@ -1,28 +1,42 @@
-import request from '../../../../request.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { validation } from '../../../../utils/validation.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+const options = globalOptionsZod
+    .extend({
+    url: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    })))
+})
+    .strict();
 class SpoHomeSiteGetCommand extends SpoCommand {
     get name() {
         return commands.HOMESITE_GET;
     }
     get description() {
-        return 'Gets information about the Home Site';
+        return 'Gets information about a home site';
     }
-    async commandAction(logger) {
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
         try {
-            const spoUrl = await spo.getSpoUrl(logger, this.debug);
-            const requestOptions = {
-                url: `${spoUrl}/_api/SP.SPHSite/Details`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (!res["odata.null"]) {
-                await logger.log(res);
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+            if (this.verbose) {
+                await logger.log(`Retrieving home sites...`);
+            }
+            const homeSites = await odata.getAllItems(`${spoAdminUrl}/_api/SPO.Tenant/GetTargetedSitesDetails`);
+            const homeSite = homeSites.find(hs => urlUtil.removeTrailingSlashes(hs.Url).toLowerCase() === urlUtil.removeTrailingSlashes(args.options.url).toLowerCase());
+            if (homeSite === undefined) {
+                throw `Home site with URL '${args.options.url}' not found.`;
             }
+            await logger.log(homeSite);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -9,27 +9,16 @@ class SpoHomeSiteListCommand extends SpoCommand {
     get description() {
         return 'Lists all home sites';
     }
-    alias() {
-        return [commands.TENANT_HOMESITE_LIST];
-    }
     defaultProperties() {
         return ['Url', 'Title'];
     }
     async commandAction(logger) {
-        await this.showDeprecationWarning(logger, commands.TENANT_HOMESITE_LIST, commands.HOMESITE_LIST);
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
-            const requestOptions = {
-                url: `${spoAdminUrl}/_api/SPO.Tenant/GetTargetedSitesDetails`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
             if (this.verbose) {
                 await logger.logToStderr(`Retrieving all home sites...`);
             }
-            const res = await odata.getAllItems(requestOptions);
+            const res = await odata.getAllItems(`${spoAdminUrl}/_api/SPO.Tenant/GetTargetedSitesDetails`);
             await logger.log(res);
         }
         catch (err) {

package/dist/m365/spo/commands/homesite/homesite-remove.js

@@ -3,7 +3,6 @@ import { zod } from '../../../../utils/zod.js';
 import { globalOptionsZod } from '../../../../Command.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
-import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -13,7 +12,7 @@ const options = globalOptionsZod
     url: zod.alias('u', z.string()
         .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
         message: `'${url}' is not a valid SharePoint Online site URL.`
-    })).optional()),
+    }))),
     force: zod.alias('f', z.boolean().optional())
 })
     .strict();
@@ -30,34 +29,8 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
     async commandAction(logger, args) {
         const removeHomeSite = async () => {
             try {
-                if (this.verbose) {
-                    await logger.logToStderr(`Removing ${args.options.url ? `'${args.options.url}' as home site` : 'the current home site'}...`);
-                }
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = await spo.getRequestDigest(spoAdminUrl);
-                if (args.options.url) {
-                    await this.removeHomeSiteByUrl(args.options.url, spoAdminUrl, logger);
-                    await logger.log(`${args.options.url} has been removed as a Home Site. It may take some time for the change to apply. Check aka.ms/homesites for details.`);
-                }
-                else {
-                    await this.warn(logger, `The current way this command works is deprecated and will change in the next major release. The '--url' option will become required.`);
-                    const requestOptions = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                        headers: {
-                            'X-RequestDigest': reqDigest.FormDigestValue
-                        },
-                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="28" ObjectPathId="27" /><Method Name="RemoveSPHSite" Id="29" ObjectPathId="27" /></Actions><ObjectPaths><Constructor Id="27" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                    };
-                    const res = await request.post(requestOptions);
-                    const json = JSON.parse(res);
-                    const response = json[0];
-                    if (response.ErrorInfo) {
-                        throw response.ErrorInfo.ErrorMessage;
-                    }
-                    else {
-                        await logger.log(json[json.length - 1]);
-                    }
-                }
+                await this.removeHomeSiteByUrl(args.options.url, spoAdminUrl, logger);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -67,11 +40,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
             await removeHomeSite();
         }
         else {
-            const result = await cli.promptForConfirmation({
-                message: args.options.url
-                    ? `Are you sure you want to remove '${args.options.url}' as home site?`
-                    : `Are you sure you want to remove the current home site?`
-            });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove '${args.options.url}' as home site?` });
             if (result) {
                 await removeHomeSite();
             }
@@ -79,6 +48,9 @@ class SpoHomeSiteRemoveCommand extends SpoCommand {
     }
     async removeHomeSiteByUrl(siteUrl, spoAdminUrl, logger) {
         const siteAdminProperties = await spo.getSiteAdminPropertiesByUrl(siteUrl, false, logger, this.verbose);
+        if (this.verbose) {
+            await logger.logToStderr(`Removing '${siteUrl}' as home site...`);
+        }
         const requestOptions = {
             url: `${spoAdminUrl}/_api/SPO.Tenant/RemoveTargetedSite`,
             headers: {

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

@@ -114,7 +114,7 @@ class SpoListViewAddCommand extends SpoCommand {
                         Query: args.options.viewQuery,
                         PersonalView: !!args.options.personal,
                         SetAsDefaultView: !!args.options.default,
-                        Paged: !!args.options.paged,
+                        Paged: args.options.paged ?? true,
                         RowLimit: args.options.rowLimit ?? 30,
                         CustomFormatter: args.options.customFormatter
                     }

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-grant-list.js

@@ -1,9 +1,11 @@
-import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
-import SpoCommand from '../../../base/SpoCommand.js';
+import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class SpoServicePrincipalGrantListCommand extends SpoCommand {
+class SpoServicePrincipalGrantListCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.spoServicePrincipalDisplayName = 'SharePoint Online Web Client Extensibility';
+    }
     get name() {
         return commands.SERVICEPRINCIPAL_GRANT_LIST;
     }
@@ -15,36 +17,26 @@ class SpoServicePrincipalGrantListCommand extends SpoCommand {
     }
     async commandAction(logger) {
         try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             if (this.verbose) {
-                await logger.logToStderr(`Retrieving request digest...`);
+                await logger.logToStderr(`Retrieving permissions granted to the service principal '${this.spoServicePrincipalDisplayName}'...`);
             }
-            const reqDigest = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${this.resource}/v1.0/servicePrincipals?$filter=displayName eq '${this.spoServicePrincipalDisplayName}'&$select=id`,
                 headers: {
-                    'X-RequestDigest': reqDigest.FormDigestValue
+                    accept: 'application/json;odata.metadata=none'
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /><Property Id="5" ParentId="3" Name="PermissionGrants" /></ObjectPaths></Request>`
+                responseType: 'json'
             };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                const result = json[json.length - 1]._Child_Items_;
-                await logger.log(result.map(r => {
-                    delete r._ObjectType_;
-                    delete r.ClientId;
-                    delete r.ConsentType;
-                    return r;
-                }));
+            const response = await request.get(requestOptions);
+            if (response.value.length === 0) {
+                throw `Service principal '${this.spoServicePrincipalDisplayName}' not found`;
             }
+            requestOptions.url = `${this.resource}/v1.0/servicePrincipals/${response.value[0].id}/oauth2PermissionGrants`;
+            const result = await request.get(requestOptions);
+            await logger.log(result.value);
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/spo/commands.js

@@ -83,6 +83,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`,
@@ -324,7 +325,6 @@ export default {
     TENANT_COMMANDSET_LIST: `${prefix} tenant commandset list`,
     TENANT_COMMANDSET_REMOVE: `${prefix} tenant commandset remove`,
     TENANT_COMMANDSET_SET: `${prefix} tenant commandset set`,
-    TENANT_HOMESITE_LIST: `${prefix} tenant homesite list`,
     TENANT_RECYCLEBINITEM_LIST: `${prefix} tenant recyclebinitem list`,
     TENANT_RECYCLEBINITEM_REMOVE: `${prefix} tenant recyclebinitem remove`,
     TENANT_RECYCLEBINITEM_RESTORE: `${prefix} tenant recyclebinitem restore`,

package/dist/utils/entraAdministrativeUnit.js

@@ -19,7 +19,7 @@ export const entraAdministrativeUnit = {
             }
         }
         const queryString = queryParameters.length > 0
-            ? `?${queryParameters.join('&')}`
+            ? `&${queryParameters.join('&')}`
             : '';
         const graphResource = 'https://graph.microsoft.com';
         const administrativeUnits = await odata.getAllItems(`${graphResource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'${queryString}`);

package/dist/utils/entraApp.js

@@ -143,6 +143,21 @@ export const entraApp = {
                 redirectUris: options.redirectUris.split(',').map(u => u.trim())
             };
         }
+        if (options.platform === 'android') {
+            applicationInfo['publicClient'] = {
+                redirectUris: [
+                    `msauth://${options.bundleId}/${formatting.encodeQueryParameter(options.signatureHash)}`
+                ]
+            };
+        }
+        if (options.platform === 'apple') {
+            applicationInfo['publicClient'] = {
+                redirectUris: [
+                    `msauth://code/msauth.${options.bundleId}%3A%2F%2Fauth`,
+                    `msauth.${options.bundleId}://auth`
+                ]
+            };
+        }
         if (options.implicitFlow) {
             if (!applicationInfo.web) {
                 applicationInfo.web = {};

package/docs/docs/cmd/entra/app/app-add.mdx

@@ -31,7 +31,7 @@ m365 entra appregistration add [options]
 : Comma-separated list of redirect URIs. Requires `platform` to be specified.
 
 `-p, --platform [platform]`
-: Platform for which the `redirectUris` should be configured. Allowed values `spa`, `web`, `publicClient`. Requires `redirectUris` to be specified.
+: Platform for which the app should be configured. Allowed values `spa`, `web`, `publicClient`, `apple`, `android`.
 
 `--implicitFlow`
 : Specify, to indicate that the authorization endpoint should return ID and access tokens.
@@ -75,6 +75,12 @@ m365 entra appregistration add [options]
 `--manifest [manifest]`
 : App manifest as retrieved from Entra ID to create the app registration from. Specify either `name` or `manifest` but not both.
 
+`--bundleId [bundleId]`
+: Specify a bundle Id to add the iOS / macOS or Android platform to the application. Required when platform is `apple` or `android`.
+
+`--signatureHash [signatureHash]`
+: A required hash when specifying a bundle Id and platform `android`.
+
 `--save`
 : Use to store the information about the created app in a local file.