@pnp/cli-microsoft365 4.1.0-beta.7fbe6cd → 4.1.0-beta.85537cc

package/README.md

@@ -82,6 +82,7 @@
 - Supported authentication methods
   - Azure Managed Identity
   - Certificate
+  - Client Secret
   - Device Code
   - Username and Password
 - Manage your SharePoint Framework projects
@@ -156,22 +157,22 @@ Get command information and example usage using the global `--help` option.
 m365 spo site get --help
 ```
 
-Execute a command and output response as text.
+Execute a command and output response as JSON.
 
 ```sh
 m365 spo site get --url https://contoso.sharepoint.com
 ```
 
-Execute a command and output response as JSON using the global `--output` option.
+Filter responses and return custom objects using [JMESPath](https://jmespath.org/) queries using the global `--query`  option.
 
 ```sh
-m365 spo site get --url https://contoso.sharepoint.com --output json
+m365 spo site list --query '[?Template==`GROUP#0`].{Title:Title, Url:Url}'
 ```
 
-Filter responses and return custom objects using [JMESPath](https://jmespath.org/) queries using the global `--query`  option.
+Execute a command and output response as text using the global `--output` option.
 
 ```sh
-m365 spo site list --output json --query '[?Template==`GROUP#0`].{Title:Title, Url:Url}'
+m365 spo site get --url https://contoso.sharepoint.com --output text
 ```
 
 > For more examples and usage, refer to the [command](https://pnp.github.io/cli-microsoft365/cmd/login/) and  [sample scripts](https://pnp.github.io/cli-microsoft365/sample-scripts/) documentation.

package/dist/cli/Cli.js

@@ -369,7 +369,7 @@ class Cli {
         // know this in order to decide if we should use default command's
         // properties or custom ones from JMESPath
         const originalObject = Array.isArray(logStatement) ? Cli.getFirstNonUndefinedArrayItem(logStatement) : logStatement;
-        const originalProperties = originalObject ? Object.getOwnPropertyNames(originalObject) : [];
+        const originalProperties = originalObject && typeof originalObject !== 'string' ? Object.getOwnPropertyNames(originalObject) : [];
         if (options.query &&
             !options.help) {
             const jmespath = require('jmespath');

package/dist/m365/aad/commands.js

@@ -42,7 +42,6 @@ exports.default = {
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,
     OAUTH2GRANT_SET: `${prefix} oauth2grant set`,
     POLICY_LIST: `${prefix} policy list`,
-    SERVICEPRINCIPAL_GET: `${prefix} serviceprincipal get`,
     SITECLASSIFICATION_DISABLE: `${prefix} siteclassification disable`,
     SITECLASSIFICATION_ENABLE: `${prefix} siteclassification enable`,
     SITECLASSIFICATION_GET: `${prefix} siteclassification get`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "4.1.0-beta.7fbe6cd",
+  "version": "4.1.0-beta.85537cc",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/index.js",

package/dist/m365/aad/commands/serviceprincipal/serviceprincipal-get.js

@@ -1,116 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphCommand_1 = require("../../../base/GraphCommand");
-const commands_1 = require("../../commands");
-class AadServicePrincipalGetCommand extends GraphCommand_1.default {
-    get name() {
-        return commands_1.default.SERVICEPRINCIPAL_GET;
-    }
-    get description() {
-        return 'Retrieves a service principal from Azure AD directory';
-    }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        return telemetryProps;
-    }
-    getServicePrincipalId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        let requestURL = '';
-        if (args.options.appId) {
-            requestURL = `${this.resource}/v1.0/serviceprincipals?$filter=appId eq '${encodeURIComponent(args.options.appId)}'&$select=id`;
-        }
-        else {
-            requestURL = `${this.resource}/v1.0/serviceprincipals?$filter=displayName eq '${encodeURIComponent(args.options.name)}'&$select=id`;
-        }
-        const requestOptions = {
-            url: requestURL,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                ConsistencyLevel: 'eventual'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const servicePrincipalItem = response.value[0];
-            if (!servicePrincipalItem) {
-                return Promise.reject(`The specified service principal doesn't exist in Azure AD`);
-            }
-            if (response.value.length > 1 && args.options.name) {
-                return Promise.reject(`Multiple service principals with name ${args.options.name} found: ${response.value.map(x => x.id)}`);
-            }
-            if (response.value.length > 1 && args.options.appId) {
-                return Promise.reject(`Multiple service principals with appId ${args.options.appId} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(servicePrincipalItem.id);
-        });
-    }
-    commandAction(logger, args, cb) {
-        this
-            .getServicePrincipalId(args)
-            .then((servicePrincipalId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/serviceprincipals/${encodeURIComponent(servicePrincipalId)}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    ConsistencyLevel: 'eventual'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '--appId [appId]'
-            },
-            {
-                option: '--n, --name [name]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (args.options.id && args.options.appId && args.options.name) {
-            return 'Specify either id, appId or name, but not all.';
-        }
-        if (args.options.id && args.options.appId) {
-            return 'Specify either id or appId, but not both.';
-        }
-        if (args.options.appId && args.options.name) {
-            return 'Specify either appId or name, but not both.';
-        }
-        if (args.options.name && args.options.id) {
-            return 'Specify either id or name, but not both.';
-        }
-        if (!args.options.id && !args.options.appId && !args.options.name) {
-            return 'Specify id, appId or name, one is required';
-        }
-        if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        return true;
-    }
-}
-module.exports = new AadServicePrincipalGetCommand();
-//# sourceMappingURL=serviceprincipal-get.js.map

package/docs/docs/cmd/aad/serviceprincipal/serviceprincipal-get.md

@@ -1,42 +0,0 @@
-# aad serviceprincipal get
-
-Retrieves a service principal from Azure AD directory
-
-## Usage
-
-```sh
-m365 aad serviceprincipal get
-```
-
-## Options
-
-`-i, --id [id]`
-: The ID of the service principal to retrieve information for. Specify either `id`, `appId` or `name`
-
-`-n, --name [name]`
-: The display name of the service principal to retrieve information for. Specify either `id`, `appId` or `name`
-
-`--appId [appId]`
-: The appId of the service principal to retrieve information for. Specify either `id` or `appId` or `name`
-
---8<-- "docs/cmd/_global.md"
-
-## Examples
-
-Get information about the service principal with id _1caf7dcd-7e83-4c3a-94f7-932a1299c843_
-
-```sh
-m365 aad serviceprincipal get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c843
-```
-
-Get information about service principal with name _ServicePrincipal App_
-
-```sh
-m365 aad serviceprincipal get --name "ServicePrincipal App"
-```
-
-Get information about service principal with appId _8a2a376d-5f57-4c14-9639-692f841c00bc_
-
-```sh
-m365 aad serviceprincipal get --appId "8a2a376d-5f57-4c14-9639-692f841c00bc"
-```