@webiny/cli 5.25.0 → 5.26.0-beta.0

package/CHANGELOG.md

@@ -3,6 +3,39 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [5.26.0-beta.0](https://github.com/webiny/webiny-js/compare/v5.25.1-beta.1...v5.26.0-beta.0) (2022-05-11)
+
+**Note:** Version bump only for package @webiny/cli
+
+
+
+
+
+## [5.25.1-beta.1](https://github.com/webiny/webiny-js/compare/v5.25.1-beta.0...v5.25.1-beta.1) (2022-05-11)
+
+**Note:** Version bump only for package @webiny/cli
+
+
+
+
+
+## [5.25.1-beta.0](https://github.com/webiny/webiny-js/compare/v5.25.0...v5.25.1-beta.0) (2022-05-10)
+
+
+### Bug Fixes
+
+* improve DX in WCP-related Webiny CLI commands ([15fe881](https://github.com/webiny/webiny-js/commit/15fe881374e5199f002a37ce1b8aab805651882a))
+* improve telemetry client ([a036766](https://github.com/webiny/webiny-js/commit/a036766272a71b5fc9d355ce2ec1607d2e670020))
+
+
+### Features
+
+* **wcp:** improve WCP-related Webiny CLI commands ([5664d5e](https://github.com/webiny/webiny-js/commit/5664d5ebd915c739707d4bcde4d3e0005ee5fe30))
+
+
+
+
+
 # [5.25.0](https://github.com/webiny/webiny-js/compare/v5.25.0-beta.6...v5.25.0) (2022-04-04)
 
 **Note:** Version bump only for package @webiny/cli

package/commands/wcp/hooks.js

@@ -1,4 +1,4 @@
-const { getUser, getProjectEnvironmentBySlug, updateUserLastActiveOn } = require("./api");
+const { getUser, getProjectEnvironmentBySlug, updateUserLastActiveOn } = require("./utils");
 
 module.exports = () => [
     // Within this hook, we're setting the `WCP_ENVIRONMENT_API_KEY` env variable, which can then be used in

package/commands/wcp/index.js

@@ -1,5 +1,8 @@
-const login = require("./login");
-const project = require("./project");
+const { command: login } = require("./login");
+const { command: logout } = require("./logout");
+const { command: whoami } = require("./whoami");
+const { command: project } = require("./project");
+
 const hooks = require("./hooks");
 
-module.exports = [login(), project(), hooks()];
+module.exports = [login(), logout(), whoami(), project(), hooks()];

package/commands/wcp/login.js

@@ -1,12 +1,25 @@
 const open = require("open");
 const { GraphQLClient } = require("graphql-request");
-const { WCP_API_URL, WCP_APP_URL } = require("./api");
+const { WCP_GRAPHQL_API_URL, WCP_APP_URL, setProjectId, setWcpPat, sleep } = require("./utils");
+const chalk = require("chalk");
 
 // 120 retries * 2000ms interval = 4 minutes until the command returns an error.
 const LOGIN_RETRIES_COUNT = 30;
 const LOGIN_RETRIES_INTERVAL = 2000;
 
-const GENERATE_USER_PAT = /* GraphQL*/ `
+const USER_PAT_FIELDS = /* GraphQL */ `
+    fragment UserPatFields on UserPat {
+        name
+        meta
+        token
+        expiresOn
+        user {
+            email
+        }
+    }
+`;
+
+const GENERATE_USER_PAT = /* GraphQL */ `
     mutation GenerateUserPat {
         users {
             generateUserPat
@@ -14,28 +27,41 @@ const GENERATE_USER_PAT = /* GraphQL*/ `
     }
 `;
 
-const GET_USER_PAT = /* GraphQL*/ `
+const GET_USER_PAT = /* GraphQL */ `
+    ${USER_PAT_FIELDS}
     query GetUserPat($token: ID!) {
         users {
             getUserPat(token: $token) {
-                name
-                user {
-                    email
-                }
+                ...UserPatFields
+            }
+        }
+    }
+`;
+
+const CREATE_USER_PAT = /* GraphQL */ `
+    ${USER_PAT_FIELDS}
+    mutation CreateUserPat($expiresIn: Int, $token: ID, $data: CreateUserPatDataInput) {
+        users {
+            createUserPat(expiresIn: $expiresIn, token: $token, data: $data) {
+                ...UserPatFields
             }
         }
     }
 `;
 
-module.exports = () => ({
+module.exports.command = () => ({
     type: "cli-command",
     name: "cli-command-wcp-login",
     create({ yargs, context }) {
         yargs.command(
-            "login",
+            "login [pat]",
             `Log in to the Webiny Control Panel`,
             yargs => {
                 yargs.example("$0 login");
+                yargs.positional("pat", {
+                    describe: `Personal access token (PAT)`,
+                    type: "string"
+                });
                 yargs.option("debug", {
                     describe: `Turn on debug logs`,
                     type: "boolean"
@@ -46,142 +72,153 @@ module.exports = () => ({
                     type: "number"
                 });
             },
-            async ({ debug, debugLevel }) => {
-                const graphQLClient = new GraphQLClient(WCP_API_URL);
-                const token = await graphQLClient
-                    .request(GENERATE_USER_PAT)
-                    .then(({ users }) => users.generateUserPat);
-
-                const queryParams = `pat=${token}&pat_name=${encodeURIComponent(
-                    "Webiny CLI"
-                )}&ref=cli`;
-                const openUrl = `${WCP_APP_URL}/login/cli?${queryParams}`;
-
-                debug && context.debug(`Opening ${context.debug.hl(openUrl)}...`);
-                await open(openUrl);
-
-                const graphql = {
-                    variables: { token },
-                    headers: {
-                        Authorization: token
+            async ({ debug, debugLevel, pat: patFromParams }) => {
+                const graphQLClient = new GraphQLClient(WCP_GRAPHQL_API_URL);
+
+                let pat;
+
+                if (patFromParams) {
+                    try {
+                        graphQLClient.setHeaders({ authorization: patFromParams });
+                        pat = await graphQLClient
+                            .request(GET_USER_PAT, { token: patFromParams })
+                            .then(({ users }) => users.getUserPat);
+
+                        // If we've received a PAT that has expiration, let's create a long-lived PAT.
+                        // We don't want to have our users interrupted because of an expired PAT.
+                        if (pat.expiresOn) {
+                            pat = await graphQLClient
+                                .request(CREATE_USER_PAT, { data: { meta: pat.meta } })
+                                .then(({ users }) => users.createUserPat);
+                        }
+                    } catch (e) {
+                        if (debug) {
+                            context.debug(
+                                `Could not use the provided ${context.debug.hl(
+                                    patFromParams
+                                )} PAT because of the following error:`
+                            );
+                            console.debug(e);
+                        }
+
+                        throw new Error(
+                            `Invalid PAT received. Please try again or login manually via the ${context.error.hl(
+                                "yarn webiny login"
+                            )} command.`
+                        );
                     }
-                };
+                } else {
+                    const generatedPat = await graphQLClient
+                        .request(GENERATE_USER_PAT)
+                        .then(({ users }) => users.generateUserPat);
+
+                    const queryParams = `pat=${generatedPat}&pat_name=${encodeURIComponent(
+                        "Webiny CLI"
+                    )}&ref=cli`;
+                    const openUrl = `${WCP_APP_URL}/login/cli?${queryParams}`;
+
+                    debug && context.debug(`Opening ${context.debug.hl(openUrl)}...`);
+                    await open(openUrl);
+
+                    const graphql = {
+                        variables: { token: generatedPat },
+                        headers: {
+                            Authorization: generatedPat
+                        }
+                    };
 
-                graphQLClient.setHeaders(graphql.headers);
+                    graphQLClient.setHeaders(graphql.headers);
 
-                let retries = 0;
-                const result = await new Promise(resolve => {
-                    const interval = setInterval(async () => {
-                        retries++;
-                        if (retries > LOGIN_RETRIES_COUNT) {
-                            clearInterval(interval);
-                            resolve(false);
-                        }
+                    let retries = 0;
+                    const result = await new Promise(resolve => {
+                        const interval = setInterval(async () => {
+                            retries++;
+                            if (retries > LOGIN_RETRIES_COUNT) {
+                                clearInterval(interval);
+                                resolve(null);
+                            }
 
-                        try {
-                            await graphQLClient.request(GET_USER_PAT, graphql.variables);
-                            clearInterval(interval);
-                            resolve(true);
-                        } catch (e) {
-                            // Do nothing.
-                            if (debug) {
-                                context.debug(
-                                    `Could not login. Will try again in ${LOGIN_RETRIES_INTERVAL}ms.`
-                                );
-                                if (debugLevel > 1) {
-                                    context.debug("GraphQL Request: ");
-                                    console.log(JSON.stringify(graphql, null, 2));
-                                }
-                                if (debugLevel > 2) {
-                                    context.debug(e.message);
+                            try {
+                                const pat = await graphQLClient
+                                    .request(GET_USER_PAT, graphql.variables)
+                                    .then(({ users }) => users.getUserPat);
+
+                                clearInterval(interval);
+                                resolve(pat);
+                            } catch (e) {
+                                // Do nothing.
+                                if (debug) {
+                                    context.debug(
+                                        `Could not login. Will try again in ${LOGIN_RETRIES_INTERVAL}ms.`
+                                    );
+                                    if (debugLevel > 1) {
+                                        context.debug("GraphQL Request: ");
+                                        console.log(JSON.stringify(graphql, null, 2));
+                                    }
+                                    if (debugLevel > 2) {
+                                        context.debug(e.message);
+                                    }
                                 }
                             }
-                        }
-                    }, LOGIN_RETRIES_INTERVAL);
-                });
+                        }, LOGIN_RETRIES_INTERVAL);
+                    });
 
-                if (!result) {
-                    throw new Error(
-                        `Could not login. Did you complete the sign in / sign up process at ${WCP_APP_URL}?`
-                    );
+                    if (!result) {
+                        throw new Error(
+                            `Could not login. Did you complete the sign in / sign up process at ${WCP_APP_URL}?`
+                        );
+                    }
+
+                    pat = result;
                 }
 
-                context.localStorage.set("wcpPat", token);
+                setWcpPat(pat.token);
 
-                context.success(`You've successfully logged in to Webiny Control Panel!`);
-            }
-        );
+                console.log(
+                    `${chalk.green("✔")} You've successfully logged in to Webiny Control Panel.`
+                );
 
-        yargs.command(
-            "logout",
-            `Log out from the Webiny Control Panel`,
-            yargs => {
-                yargs.example("$0 login");
-                yargs.option("debug", {
-                    describe: `Turn on debug logs`,
-                    type: "boolean"
-                });
-                yargs.option("debug-level", {
-                    default: 1,
-                    describe: `Set the debug logs verbosity level`,
-                    type: "number"
-                });
-            },
-            async () => {
-                context.info(`You've successfully logged out from Webiny Control Panel.`);
+                let projectInitialized = Boolean(context.project.config.id);
 
-                context.localStorage.set("wcpPat", null);
-            }
-        );
+                // If we have `orgId` and `projectId` in PAT's meta data, let's immediately activate the project.
+                if (pat.meta && pat.meta.orgId && pat.meta.projectId) {
+                    await sleep();
 
-        yargs.command(
-            "whoami",
-            `Display the current logged-in user`,
-            yargs => {
-                yargs.example("$0 login");
-                yargs.option("debug", {
-                    describe: `Turn on debug logs`,
-                    type: "boolean"
-                });
-                yargs.option("debug-level", {
-                    default: 1,
-                    describe: `Set the debug logs verbosity level`,
-                    type: "number"
-                });
-            },
-            async ({ debug }) => {
-                const pat = context.localStorage.get("wcpPat");
-                if (!pat) {
-                    throw new Error(
-                        `It seems you are not logged in. Please login using the ${context.error.hl(
-                            "webiny login"
-                        )} command.`
-                    );
+                    console.log();
+
+                    const { orgId, projectId } = pat.meta;
+
+                    const id = `${orgId}/${projectId}`;
+                    console.log(`Project ${chalk.green(id)} detected. Initializing...`);
+
+                    await sleep();
+
+                    await setProjectId({
+                        project: context.project,
+                        orgId,
+                        projectId
+                    });
+
+                    console.log(`Project ${context.success.hl(id)} initialized successfully.`);
+                    projectInitialized = true;
                 }
 
-                const graphQLClient = new GraphQLClient(WCP_API_URL);
-                graphQLClient.setHeaders({ authorization: pat });
+                await sleep();
 
-                try {
-                    const user = await graphQLClient
-                        .request(GET_USER_PAT, { token: pat })
-                        .then(({ users }) => users.getUserPat.user);
+                console.log();
+                console.log(chalk.bold("Next Steps"));
 
-                    context.info(
-                        `You are logged in to Webiny Control Panel as ${context.info.hl(
-                            user.email
-                        )}.`
-                    );
-                } catch (e) {
-                    if (debug) {
-                        context.debug(e);
-                    }
-                    throw new Error(
-                        `It seems you are not logged in. Please login using the ${context.error.hl(
-                            "webiny login"
-                        )} command.`
+                if (!projectInitialized) {
+                    console.log(
+                        `‣ initialize your project via the ${chalk.green(
+                            "yarn webiny project init"
+                        )} command`
                     );
                 }
+
+                console.log(
+                    `‣ deploy your project via the ${chalk.green("yarn webiny deploy")} command`
+                );
             }
         );
     }

package/commands/wcp/logout.js

@@ -0,0 +1,28 @@
+const { setWcpPat } = require("./utils");
+
+module.exports.command = () => ({
+    type: "cli-command",
+    name: "cli-command-wcp-logout",
+    create({ yargs }) {
+        yargs.command(
+            "logout",
+            `Log out from the Webiny Control Panel`,
+            yargs => {
+                yargs.example("$0 logout");
+                yargs.option("debug", {
+                    describe: `Turn on debug logs`,
+                    type: "boolean"
+                });
+                yargs.option("debug-level", {
+                    default: 1,
+                    describe: `Set the debug logs verbosity level`,
+                    type: "number"
+                });
+            },
+            async () => {
+                setWcpPat(null);
+                console.log(`You've successfully logged out from Webiny Control Panel.`);
+            }
+        );
+    }
+});

package/commands/wcp/project.js

@@ -1,11 +1,9 @@
-const { getUser } = require("./api");
-const { WCP_APP_URL } = require("./api");
 const open = require("open");
 const inquirer = require("inquirer");
-const path = require("path");
-const tsMorph = require("ts-morph");
+const chalk = require("chalk");
+const { getUser, WCP_APP_URL, setProjectId, sleep } = require("./utils");
 
-module.exports = () => [
+module.exports.command = () => [
     {
         type: "cli-command",
         name: "cli-command-wcp-project",
@@ -29,179 +27,158 @@ module.exports = () => [
                             });
                             command.example("$0 project init");
                         },
-                        async () => {
-                            // Check login.
-                            const user = await getUser();
-
-                            // User already initialized a project?
-                            const { id } = context.project.config;
-                            if (id) {
-                                const project = user.projects.find(item => item.id === id);
-                                if (project) {
-                                    context.info(
-                                        `It seems this project was already initialized (project name: ${context.info.hl(
-                                            project.name
-                                        )}).`
-                                    );
-
-                                    const prompt = inquirer.createPromptModule();
-                                    const { proceed } = await prompt({
-                                        name: "proceed",
-                                        message: "Would you like to re-initialize it?",
-                                        type: "confirm",
-                                        default: false
-                                    });
-
-                                    if (!proceed) {
-                                        return;
-                                    }
-                                }
-                            }
-
-                            // Get user's organizations.
-                            if (!user.orgs.length) {
-                                context.info(
-                                    "It seems you're not part of any organization. Please log in to Webiny Control Panel and create one."
-                                );
-
-                                const prompt = inquirer.createPromptModule();
-                                const { proceed } = await prompt({
-                                    name: "proceed",
-                                    message: "Would you like to do that now?",
-                                    type: "confirm",
-                                    default: false
-                                });
-
-                                if (proceed) {
-                                    await open(WCP_APP_URL);
-                                }
-                                return;
-                            }
-
-                            let selectedOrg;
-                            if (user.orgs.length === 1) {
-                                selectedOrg = user.orgs[0];
-                            } else {
-                                context.info("It seems you're part of multiple organizations. ");
-                                const choices = user.orgs.map(item => ({
-                                    name: item.name,
-                                    value: item
-                                }));
-
-                                const prompt = inquirer.createPromptModule();
-                                selectedOrg = await prompt({
-                                    name: "org",
-                                    message: "Select organization:",
-                                    type: "list",
-                                    choices,
-                                    default: choices[0].value
-                                }).then(result => result.org);
-                            }
-
-                            const orgProjects = user.projects.filter(
-                                item => item.org.id === selectedOrg.id
-                            );
-
-                            // Get user's projects.
-                            if (!orgProjects.length) {
-                                context.info(
-                                    `It seems there are no projects created within the ${context.info.hl(
-                                        selectedOrg.name
-                                    )} organization.`
-                                );
-
-                                const prompt = inquirer.createPromptModule();
-                                const { proceed } = await prompt({
-                                    name: "proceed",
-                                    message: "Would you like to create one now?",
-                                    type: "confirm",
-                                    default: false
-                                });
-
-                                if (proceed) {
-                                    await open(WCP_APP_URL);
-                                }
-                                return;
-                            }
-
-                            let selectedProject;
-                            if (orgProjects.length === 1) {
-                                selectedProject = user.projects[0];
-                            } else {
-                                context.info(
-                                    `It seems there are multiple projects created within the ${context.info.hl(
-                                        selectedOrg.name
-                                    )} organization.`
-                                );
-                                const choices = orgProjects.map(item => ({
-                                    name: item.name,
-                                    value: item
-                                }));
-                                const prompt = inquirer.createPromptModule();
-                                selectedProject = await prompt({
-                                    name: "project",
-                                    message: "Select project:",
-                                    type: "list",
-                                    choices,
-                                    default: choices[0].value
-                                }).then(result => result.project);
-                            }
-
-                            // Assign the necessary IDs into root `webiny.project.ts` project file.
-                            const webinyProjectPath = path.join(
-                                context.project.root,
-                                "webiny.project.ts"
-                            );
-
-                            const tsMorphProject = new tsMorph.Project();
-                            tsMorphProject.addSourceFileAtPath(webinyProjectPath);
-
-                            const source = tsMorphProject.getSourceFile(webinyProjectPath);
-
-                            const defaultExport = source.getFirstDescendant(node => {
-                                if (tsMorph.Node.isExportAssignment(node) === false) {
-                                    return false;
-                                }
-                                return node.getText().startsWith("export default ");
-                            });
-
-                            if (!defaultExport) {
-                                throw new Error(
-                                    `Could not find the default export in ${context.error.hl(
-                                        "webiny.project.ts"
-                                    )}.`
-                                );
-                            }
-
-                            // Get ObjectLiteralExpression within the default export and assign the `id` property to it.
-                            const exportedObjectLiteral = defaultExport.getFirstDescendant(
-                                node => tsMorph.Node.isObjectLiteralExpression(node) === true
-                            );
-
-                            const existingIdProperty = exportedObjectLiteral.getProperty(node => {
-                                return (
-                                    tsMorph.Node.isPropertyAssignment(node) &&
-                                    node.getName() === "id"
-                                );
-                            });
-
-                            if (tsMorph.Node.isPropertyAssignment(existingIdProperty)) {
-                                existingIdProperty.setInitializer(`"${selectedProject.id}"`);
-                            } else {
-                                exportedObjectLiteral.insertProperty(
-                                    0,
-                                    `id: "${selectedOrg.id}/${selectedProject.id}"`
-                                );
-                            }
-
-                            await tsMorphProject.save();
-                        }
+                        () => handler({ context })
                     );
                 }
             );
         }
-    },
-    {
-        type: "cli-plugi"
     }
 ];
+
+const handler = async ({ context }) => {
+    // Check login.
+    const user = await getUser();
+
+    // User already initialized a project?
+    const { id: orgProjectId } = context.project.config;
+    if (orgProjectId) {
+        const [, projectId] = orgProjectId.split("/");
+        const project = user.projects.find(item => item.id === projectId);
+        if (project) {
+            console.log(`Your ${chalk.green(orgProjectId)} project has already been initialized.`);
+
+            const prompt = inquirer.createPromptModule();
+            const { proceed } = await prompt({
+                name: "proceed",
+                message: "Would you like to re-initialize it?",
+                type: "confirm",
+                default: false
+            });
+
+            if (!proceed) {
+                return;
+            }
+
+            console.log();
+        }
+    }
+
+    // Get user's organizations.
+    if (!user.orgs.length) {
+        console.log(
+            "It seems you're not part of any organization. Please log in to Webiny Control Panel and create one."
+        );
+
+        const prompt = inquirer.createPromptModule();
+        const { proceed } = await prompt({
+            name: "proceed",
+            message: "Would you like to do that now?",
+            type: "confirm",
+            default: false
+        });
+
+        if (proceed) {
+            await open(WCP_APP_URL);
+        }
+        return;
+    }
+
+    let selectedOrg;
+    if (user.orgs.length === 1) {
+        selectedOrg = user.orgs[0];
+    } else {
+        console.log("It seems you're part of multiple organizations. ");
+        const choices = user.orgs.map(item => ({
+            name: item.name,
+            value: item
+        }));
+
+        const prompt = inquirer.createPromptModule();
+        selectedOrg = await prompt({
+            name: "org",
+            message: "Select organization:",
+            type: "list",
+            choices,
+            default: choices[0].value
+        }).then(result => result.org);
+    }
+
+    const orgProjects = user.projects.filter(item => item.org.id === selectedOrg.id);
+
+    // Get user's projects.
+    if (!orgProjects.length) {
+        console.log(
+            `It seems there are no projects created within the ${chalk.green(
+                selectedOrg.name
+            )} organization.`
+        );
+
+        const prompt = inquirer.createPromptModule();
+        const { proceed } = await prompt({
+            name: "proceed",
+            message: "Would you like to create one now?",
+            type: "confirm",
+            default: false
+        });
+
+        if (proceed) {
+            await open(WCP_APP_URL);
+        }
+        return;
+    }
+
+    let selectedProject;
+    if (orgProjects.length === 1) {
+        selectedProject = user.projects[0];
+    } else {
+        console.log(
+            `It seems there are multiple projects created within the ${chalk.green(
+                selectedOrg.name
+            )} organization.`
+        );
+        const choices = orgProjects.map(item => ({
+            name: item.name,
+            value: item
+        }));
+        const prompt = inquirer.createPromptModule();
+        selectedProject = await prompt({
+            name: "project",
+            message: "Select project:",
+            type: "list",
+            choices,
+            default: choices[0].value
+        }).then(result => result.project);
+    }
+
+    const orgId = selectedOrg.id,
+        projectId = selectedProject.id;
+
+    await sleep();
+    console.log();
+
+    console.log(`Initializing ${context.success.hl(selectedProject.name)} project...`);
+
+    await sleep();
+
+    // Assign the necessary IDs into root `webiny.project.ts` project file.
+    await setProjectId({
+        project: context.project,
+        orgId,
+        projectId
+    });
+
+    console.log(
+        `${chalk.green("✔")} Project ${context.success.hl(
+            selectedProject.name
+        )} initialized successfully.`
+    );
+
+    await sleep();
+
+    console.log();
+    console.log(chalk.bold("Next Steps"));
+
+    console.log(`‣ deploy your project via the ${chalk.green("yarn webiny deploy")} command`);
+};
+
+module.exports.handler = handler;

package/commands/wcp/{api → utils}/getProjectEnvironmentBySlug.js

@@ -76,10 +76,10 @@ module.exports.getProjectEnvironmentBySlug = async ({
         );
     }
 
-    const { WCP_API_URL } = require(".");
+    const { WCP_GRAPHQL_API_URL } = require(".");
     const headers = { authorization: pat };
     return request(
-        WCP_API_URL,
+        WCP_GRAPHQL_API_URL,
         GET_ENVIRONMENT,
         {
             orgId,
@@ -92,7 +92,7 @@ module.exports.getProjectEnvironmentBySlug = async ({
         .then(async response => response.projects.getEnvironment)
         .catch(() => {
             return request(
-                WCP_API_URL,
+                WCP_GRAPHQL_API_URL,
                 CREATE_ENVIRONMENT,
                 {
                     orgId,

package/commands/wcp/{api → utils}/getUser.js

@@ -1,11 +1,13 @@
-const { localStorage, log } = require("@webiny/cli/utils");
+const { log } = require("@webiny/cli/utils");
 const { request } = require("graphql-request");
+const { getWcpPat } = require("./getWcpPat");
 
 const GET_CURRENT_USER = /* GraphQL */ `
     query GetUser {
         users {
             getCurrentUser {
                 id
+                email
                 firstName
                 lastName
             }
@@ -49,39 +51,43 @@ module.exports.getUser = async () => {
         return user;
     }
 
-    const pat = localStorage().get("wcpPat");
+    const pat = getWcpPat();
     if (!pat) {
         throw new Error(
             `It seems you are not logged in. Please login using the ${log.error.hl(
-                "webiny login"
+                "yarn webiny login"
             )} command.`
         );
     }
 
     try {
-        const { WCP_API_URL } = require(".");
+        const { WCP_GRAPHQL_API_URL } = require(".");
         const headers = { authorization: pat };
-        user = await request(WCP_API_URL, GET_CURRENT_USER, {}, headers).then(async response => {
-            const user = response.users.getCurrentUser;
+        user = await request(WCP_GRAPHQL_API_URL, GET_CURRENT_USER, {}, headers).then(
+            async response => {
+                const user = response.users.getCurrentUser;
 
-            const orgs = await request(WCP_API_URL, LIST_ORGS, {}, headers).then(async response => {
-                const orgs = response.orgs.listOrgs.data;
-                for (let i = 0; i < orgs.length; i++) {
-                    const org = orgs[i];
-                    org.projects = await request(
-                        WCP_API_URL,
-                        LIST_PROJECTS,
-                        { orgId: org.id },
-                        headers
-                    ).then(response => response.projects.listProjects.data);
-                }
-                return orgs;
-            });
+                const orgs = await request(WCP_GRAPHQL_API_URL, LIST_ORGS, {}, headers).then(
+                    async response => {
+                        const orgs = response.orgs.listOrgs.data;
+                        for (let i = 0; i < orgs.length; i++) {
+                            const org = orgs[i];
+                            org.projects = await request(
+                                WCP_GRAPHQL_API_URL,
+                                LIST_PROJECTS,
+                                { orgId: org.id },
+                                headers
+                            ).then(response => response.projects.listProjects.data);
+                        }
+                        return orgs;
+                    }
+                );
 
-            const projects = orgs.map(org => org.projects).flat();
+                const projects = orgs.map(org => org.projects).flat();
 
-            return { ...user, orgs, projects };
-        });
+                return { ...user, orgs, projects };
+            }
+        );
     } catch {
         throw new Error(
             `It seems the personal access token is incorrect or does not exist. Please log out and again log in using the ${log.error.hl(

package/commands/wcp/utils/getWcpPat.js

@@ -0,0 +1,5 @@
+const { localStorage } = require("@webiny/cli/utils");
+
+module.exports.getWcpPat = wcpPat => {
+    return localStorage().get("wcpPat", wcpPat);
+};

package/commands/wcp/{api → utils}/index.js

@@ -1,14 +1,24 @@
 const WCP_APP_URL = process.env.WCP_APP_URL || "https://wcp.webiny.com";
 const WCP_API_URL = process.env.WCP_API_URL || "https://api.wcp.webiny.com/graphql";
+const WCP_GRAPHQL_API_URL = WCP_API_URL + "/graphql";
 
 const { getUser } = require("./getUser");
 const { getProjectEnvironmentBySlug } = require("./getProjectEnvironmentBySlug");
 const { updateUserLastActiveOn } = require("./updateUserLastActiveOn");
+const { setProjectId } = require("./setProjectId");
+const { setWcpPat } = require("./setWcpPat");
+const { getWcpPat } = require("./getWcpPat");
+const { sleep } = require("./sleep");
 
 module.exports = {
     getUser,
     getProjectEnvironmentBySlug,
     updateUserLastActiveOn,
+    setProjectId,
+    setWcpPat,
+    getWcpPat,
+    sleep,
     WCP_APP_URL,
-    WCP_API_URL
+    WCP_API_URL,
+    WCP_GRAPHQL_API_URL
 };

package/commands/wcp/utils/setProjectId.js

@@ -0,0 +1,44 @@
+const path = require("path");
+const tsMorph = require("ts-morph");
+const { log } = require("@webiny/cli/utils");
+
+module.exports.setProjectId = async ({ project, orgId, projectId }) => {
+    // Assign the necessary IDs into root `webiny.project.ts` project file.
+    const webinyProjectPath = path.join(project.root, "webiny.project.ts");
+
+    const tsMorphProject = new tsMorph.Project();
+    tsMorphProject.addSourceFileAtPath(webinyProjectPath);
+
+    const source = tsMorphProject.getSourceFile(webinyProjectPath);
+
+    const defaultExport = source.getFirstDescendant(node => {
+        if (tsMorph.Node.isExportAssignment(node) === false) {
+            return false;
+        }
+        return node.getText().startsWith("export default ");
+    });
+
+    if (!defaultExport) {
+        throw new Error(
+            `Could not find the default export in ${log.error.hl("webiny.project.ts")}.`
+        );
+    }
+
+    // Get ObjectLiteralExpression within the default export and assign the `id` property to it.
+    const exportedObjectLiteral = defaultExport.getFirstDescendant(
+        node => tsMorph.Node.isObjectLiteralExpression(node) === true
+    );
+
+    const existingIdProperty = exportedObjectLiteral.getProperty(node => {
+        return tsMorph.Node.isPropertyAssignment(node) && node.getName() === "id";
+    });
+
+    const fullId = `${orgId}/${projectId}`;
+    if (tsMorph.Node.isPropertyAssignment(existingIdProperty)) {
+        existingIdProperty.setInitializer(`"${fullId}"`);
+    } else {
+        exportedObjectLiteral.insertProperty(0, `id: "${fullId}"`);
+    }
+
+    await tsMorphProject.save();
+};

package/commands/wcp/utils/setWcpPat.js

@@ -0,0 +1,5 @@
+const { localStorage } = require("@webiny/cli/utils");
+
+module.exports.setWcpPat = wcpPat => {
+    localStorage().set("wcpPat", wcpPat);
+};

package/commands/wcp/utils/sleep.js

@@ -0,0 +1 @@
+module.exports.sleep = () => new Promise(resolve => setTimeout(resolve, 1500));

package/commands/wcp/{api → utils}/updateUserLastActiveOn.js

@@ -22,7 +22,7 @@ module.exports.updateUserLastActiveOn = async () => {
         );
     }
 
-    const { WCP_API_URL } = require(".");
+    const { WCP_GRAPHQL_API_URL } = require(".");
     const headers = { authorization: pat };
-    return request(WCP_API_URL, UPDATE_LAST_ACTIVE_TO_NOW, {}, headers);
+    return request(WCP_GRAPHQL_API_URL, UPDATE_LAST_ACTIVE_TO_NOW, {}, headers);
 };

package/commands/wcp/whoami.js

@@ -0,0 +1,43 @@
+const { getUser } = require("./utils");
+
+module.exports.command = () => ({
+    type: "cli-command",
+    name: "cli-command-wcp-whoami",
+    create({ yargs, context }) {
+        yargs.command(
+            "whoami",
+            `Display the current logged-in user`,
+            yargs => {
+                yargs.example("$0 whoami");
+                yargs.option("debug", {
+                    describe: `Turn on debug logs`,
+                    type: "boolean"
+                });
+                yargs.option("debug-level", {
+                    default: 1,
+                    describe: `Set the debug logs verbosity level`,
+                    type: "number"
+                });
+            },
+            async ({ debug }) => {
+                try {
+                    const user = await getUser();
+                    console.log(
+                        `You are logged in to Webiny Control Panel as ${context.info.hl(
+                            user.email
+                        )}.`
+                    );
+                } catch (e) {
+                    if (debug) {
+                        context.debug(e);
+                    }
+                    throw new Error(
+                        `It seems you are not logged in. Please login using the ${context.error.hl(
+                            "webiny login"
+                        )} command.`
+                    );
+                }
+            }
+        );
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "5.25.0",
+	"version": "5.26.0-beta.0",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,7 +13,7 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "5.25.0",
+		"@webiny/telemetry": "5.26.0-beta.0",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
@@ -29,7 +29,7 @@
 		"ts-morph": "11.0.3",
 		"typescript": "4.5.5",
 		"uniqid": "5.4.0",
-		"yargs": "14.2.3"
+		"yargs": "17.4.0"
 	},
 	"license": "MIT",
 	"publishConfig": {
@@ -63,5 +63,5 @@
 			]
 		}
 	},
-	"gitHead": "4622d2aafbbecea051ab404859ced09a0a97434e"
+	"gitHead": "4ce1afe0630101262047a016a4b00e4e01f47095"
 }