@pnp/cli-microsoft365 6.0.0-beta.8352f49 → 6.0.0-beta.c32757e

package/dist/Command.js

@@ -14,6 +14,7 @@ const appInsights_1 = require("./appInsights");
 const Auth_1 = require("./Auth");
 const cli_1 = require("./cli");
 const request_1 = require("./request");
+const utils_1 = require("./utils");
 class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -81,6 +82,7 @@ class Command {
                 cb(new CommandError('Log in to Microsoft 365 first'));
                 return;
             }
+            this.loadValuesFromAccessToken(args);
             this.commandAction(logger, args, cb);
         }, (error) => {
             cb(new CommandError(error));
@@ -292,6 +294,26 @@ class Command {
             payload[o] = unknownOptions[o];
         });
     }
+    loadValuesFromAccessToken(args) {
+        if (!Auth_1.default.service.accessTokens[Auth_1.default.defaultResource]) {
+            return;
+        }
+        const token = Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken;
+        const optionNames = Object.getOwnPropertyNames(args.options);
+        optionNames.forEach(option => {
+            const value = args.options[option];
+            if (!value || typeof value !== 'string') {
+                return;
+            }
+            const lowerCaseValue = value.toLowerCase();
+            if (lowerCaseValue === '@meid') {
+                args.options[option] = utils_1.accessToken.getUserIdFromAccessToken(token);
+            }
+            if (lowerCaseValue === '@meusername') {
+                args.options[option] = utils_1.accessToken.getUserNameFromAccessToken(token);
+            }
+        });
+    }
 }
 exports.default = Command;
 //# sourceMappingURL=Command.js.map

package/dist/m365/planner/commands/task/task-add.js

@@ -96,13 +96,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         };
         return request_1.default
             .get(requestOptions)
-            .then((response) => {
-            const etag = response ? response['@odata.etag'] : undefined;
-            if (!etag) {
-                return Promise.reject(`Error fetching task details`);
-            }
-            return Promise.resolve(etag);
-        });
+            .then((response) => response['@odata.etag']);
     }
     generateAppliedCategories(options) {
         if (!options.appliedCategories) {

package/dist/m365/planner/commands/task/task-reference-add.js

@@ -46,13 +46,7 @@ class PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
         };
         return request_1.default
             .get(requestOptions)
-            .then((response) => {
-            const etag = response ? response['@odata.etag'] : undefined;
-            if (!etag) {
-                return Promise.reject(`Error fetching task details`);
-            }
-            return Promise.resolve(etag);
-        });
+            .then((response) => response['@odata.etag']);
     }
     options() {
         const options = [

package/dist/m365/planner/commands/task/task-reference-remove.js

@@ -74,21 +74,18 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
         let url = options.url;
         return request_1.default
             .get(requestOptions)
-            .then((response) => {
-            const etag = response ? response['@odata.etag'] : undefined;
-            if (!etag) {
-                return Promise.reject(`Error fetching task details`);
-            }
+            .then((taskDetails) => {
             if (options.alias) {
-                const alias = options.alias;
                 const urls = [];
-                Object.entries(response.references).forEach((ref) => {
-                    var _a;
-                    if (((_a = ref[1].alias) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === alias.toLocaleLowerCase()) {
-                        urls.push(decodeURIComponent(ref[0]));
-                    }
-                });
-                if (!urls.length) {
+                if (taskDetails.references) {
+                    Object.entries(taskDetails.references).forEach((ref) => {
+                        var _a;
+                        if (((_a = ref[1].alias) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === options.alias.toLocaleLowerCase()) {
+                            urls.push(decodeURIComponent(ref[0]));
+                        }
+                    });
+                }
+                if (urls.length === 0) {
                     return Promise.reject(`The specified reference with alias ${options.alias} does not exist`);
                 }
                 if (urls.length > 1) {
@@ -96,7 +93,7 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
                 }
                 url = urls[0];
             }
-            return Promise.resolve({ etag, url });
+            return Promise.resolve({ etag: taskDetails['@odata.etag'], url });
         });
     }
     options() {

package/dist/m365/planner/commands/task/task-set.js

@@ -112,13 +112,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         };
         return request_1.default
             .get(requestOptions)
-            .then((response) => {
-            const etag = response ? response['@odata.etag'] : undefined;
-            if (!etag) {
-                return Promise.reject(`Error fetching task details`);
-            }
-            return Promise.resolve(etag);
-        });
+            .then((response) => response['@odata.etag']);
     }
     getTaskEtag(taskId) {
         const requestOptions = {
@@ -130,13 +124,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
         };
         return request_1.default
             .get(requestOptions)
-            .then((response) => {
-            const etag = response ? response['@odata.etag'] : undefined;
-            if (!etag) {
-                return Promise.reject(`Error fetching task`);
-            }
-            return Promise.resolve(etag);
-        });
+            .then((response) => response['@odata.etag']);
     }
     generateAppliedCategories(options) {
         if (!options.appliedCategories) {

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FN015008_FILE_eslintrc_js = void 0;
+const utils_1 = require("../../../../../../utils");
 const FileAddRemoveRule_1 = require("./FileAddRemoveRule");
 class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
     constructor(add, contents) {
@@ -9,6 +10,12 @@ class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
     get id() {
         return 'FN015008';
     }
+    visit(project, notifications) {
+        if (utils_1.spfx.isReactProject(project)) {
+            this.contents = this.contents.replace('@microsoft/eslint-config-spfx/lib/profiles/default', '@microsoft/eslint-config-spfx/lib/profiles/react');
+        }
+        super.visit(project, notifications);
+    }
 }
 exports.FN015008_FILE_eslintrc_js = FN015008_FILE_eslintrc_js;
 //# sourceMappingURL=FN015008_FILE_eslintrc_js.js.map

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

@@ -27,6 +27,7 @@ const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
 const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
 const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
 const FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1 = require("./rules/FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9");
+const FN002019_DEVDEP_spfx_fast_serve_helpers_1 = require("./rules/FN002019_DEVDEP_spfx_fast_serve_helpers");
 const FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1 = require("./rules/FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5");
 const FN002021_DEVDEP_rushstack_eslint_config_1 = require("./rules/FN002021_DEVDEP_rushstack_eslint_config");
 const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
@@ -67,6 +68,7 @@ module.exports = [
     new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('', false),
     new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('1.15.2'),
     new FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1.FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9('', false),
+    new FN002019_DEVDEP_spfx_fast_serve_helpers_1.FN002019_DEVDEP_spfx_fast_serve_helpers('1.15.2'),
     new FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1.FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5('0.2.2'),
     new FN002021_DEVDEP_rushstack_eslint_config_1.FN002021_DEVDEP_rushstack_eslint_config('2.5.1'),
     new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.15.0'),
@@ -78,10 +80,10 @@ module.exports = [
     new FN012017_TSC_extends_1.FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-4.5/includes/tsconfig-web.json'),
     new FN015003_FILE_tslint_json_1.FN015003_FILE_tslint_json(false, ''),
     new FN015008_FILE_eslintrc_js_1.FN015008_FILE_eslintrc_js(true, `require('@rushstack/eslint-config/patch/modern-module-resolution');
-  module.exports = {
-    extends: ['@microsoft/eslint-config-spfx/lib/profiles/react'],
-    parserOptions: { tsconfigRootDir: __dirname }
-  };`),
+module.exports = {
+  extends: ['@microsoft/eslint-config-spfx/lib/profiles/default'],
+  parserOptions: { tsconfigRootDir: __dirname }
+};`),
     new FN023002_GITIGNORE_heft_1.FN023002_GITIGNORE_heft()
 ];
 //# sourceMappingURL=upgrade-1.15.0.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js

@@ -34,15 +34,7 @@ class TenantServiceAnnouncementHealthGetCommand extends GraphCommand_1.default {
             },
             responseType: 'json'
         };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const serviceHealth = response;
-            if (!serviceHealth) {
-                return Promise.reject(`Error fetching service health`);
-            }
-            return Promise.resolve(serviceHealth);
-        });
+        return request_1.default.get(requestOptions);
     }
     options() {
         const options = [

package/dist/utils/accessToken.js

@@ -57,6 +57,24 @@ exports.accessToken = {
         catch (_a) {
         }
         return userName;
+    },
+    getUserIdFromAccessToken(accessToken) {
+        let userId = '';
+        if (!accessToken || accessToken.length === 0) {
+            return userId;
+        }
+        const chunks = accessToken.split('.');
+        if (chunks.length !== 3) {
+            return userId;
+        }
+        const tokenString = Buffer.from(chunks[1], 'base64').toString();
+        try {
+            const token = JSON.parse(tokenString);
+            userId = token.oid;
+        }
+        catch (_a) {
+        }
+        return userId;
     }
 };
 //# sourceMappingURL=accessToken.js.map

package/dist/utils/validation.js

@@ -6,8 +6,12 @@ exports.validation = {
         return guids.every(guid => this.isValidGuid(guid));
     },
     isValidGuid(guid) {
+        if (!guid) {
+            return false;
+        }
         const guidRegEx = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
-        return guidRegEx.test(guid);
+        // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
+        return guidRegEx.test(guid) || guid.toLocaleLowerCase().trim() === "@meid";
     },
     isValidTeamsChannelId(guid) {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);

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

@@ -56,6 +56,18 @@ For the user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_ retrieve the user na
 m365 aad user get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --properties "userPrincipalName,mail,displayName"
 ```
 
+Get information about the currently logged user using the Id token
+
+```sh
+m365 aad user get --id "@meId"
+```
+
+Get information about the currently logged in user using the UserName token
+
+```sh
+m365 aad user get --userName "@meUserName"
+```
+
 ## More information
 
 - Microsoft Graph User properties: [https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/resources/user#properties](https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/resources/user#properties)

package/docs/docs/cmd/planner/plan/plan-remove.md

@@ -1,4 +1,4 @@
-## planner plan remove
+# planner plan remove
 
 Removes the Microsoft Planner plan
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.0.0-beta.8352f49",
+  "version": "6.0.0-beta.c32757e",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",