ID:FPCO-25735;HOURS:2;DONE:90; Add timer in login command

.gitignore

@@ -141,4 +141,6 @@ csv/
 *venv/*
 
 # Sentry Auth Token
-.sentryclirc
+.sentryclirc
+
+/temp-theme

README.md

@@ -136,10 +136,14 @@ fdk env set [options]
 ```sh
 fdk env set -u api.fynd.com
 ```
+```sh
+fdk env set -p partners.fynd.com
+```
 #### **Command Options**
 | Option        | Description | Required |
 | ------------- |-------------|----------|
 | --url, -u   | Platform API domain | Yes |
+| --partners, -p   | Partners domain | Yes |
 | --help    | Show help | No |
 | --verbose, -v | enable debug mode | No |
 
@@ -363,6 +367,9 @@ Set the active environment before running extension commands
 ```sh
 fdk env set -u api.fynd.com
 ```
+```sh
+fdk env set -p partners.fynd.com
+```
 
 
 <div id="extension-init"></div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gofynd/fdk-cli",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "main": "index.js",
   "license": "MIT",
   "bin": {

src/__tests__/env.spec.ts

@@ -50,4 +50,18 @@ describe('Env Commands', () => {
         await new Promise((r) => setTimeout(r, 2000));
         expect(currentEnv).toMatch('api.fyndx1.de');
     });
+
+    it('should console current set env by partners domain', async () => {
+        await program.parseAsync([
+            'ts-node',
+            './src/fdk.ts',
+            'env',
+            'set',
+            '-p',
+            'partners.fyndx1.de',
+        ]);
+        const currentEnv = configStore.get(CONFIG_KEYS.CURRENT_ENV_VALUE);
+        await new Promise((r) => setTimeout(r, 2000));
+        expect(currentEnv).toMatch('api.fyndx1.de');
+    });
 });

src/commands/environment/environment-builder.ts

@@ -20,7 +20,9 @@ export default function environmentCommandBuilder() {
     env.command('set')
         // todo: remove -n option in future version
         .option('-n, --name [env-name]', 'Environment name')
+        // todo: remove -u option in future version
         .option('-u, --url [api-domain]', 'API domain')
+        .option('-p, --partners [partners-domain]', 'Partners domain')
         .description('Set new environment')
         .asyncAction(Env.setNewEnvs);
 

src/fdk.ts

@@ -241,14 +241,14 @@ export async function init(programName: string) {
     // set default environment
     const current_env = configStore.get(CONFIG_KEYS.CURRENT_ENV_VALUE);
 
-    if (!current_env || !current_env.includes('api.'))
+    if (!current_env || (!current_env.includes('api.') && !current_env.includes('api-')))
         configStore.set(CONFIG_KEYS.CURRENT_ENV_VALUE, 'api.fynd.com');
 
     // todo: remove this warning in future version of fdk cli, when everybody get used to set env by url.
-    if (current_env && !current_env.includes('api.')) {
+    if (current_env && !current_env.includes('api.') && !current_env.includes('api-')) {
         console.warn(
             chalk.yellow(
-                `Warning: Reseting active environment to api.fynd.com. Please use \`fdk env set -u <env-api-url>\` to change active environment. Ref: ${
+                `Warning: Reseting active environment to api.fynd.com. Please use \`fdk env set -p <partners-domain>\` to change active environment. Ref: ${
                     getPlatformUrls().partners
                 }/help/docs/partners/themes/vuejs/command-reference#environment-commands-1`,
             ),

src/lib/Auth.ts

@@ -2,14 +2,16 @@ import CommandError from './CommandError';
 import Logger from './Logger';
 import inquirer from 'inquirer';
 import ConfigStore, { CONFIG_KEYS } from './Config';
-import { ALLOWD_ENV } from '../helper/constants';
 import open from 'open';
 import express from 'express';
 var cors = require('cors');
 const port = 7071;
 import chalk from 'chalk';
 import ThemeService from './api/services/theme.service';
 import { getLocalBaseUrl } from '../helper/serve.utils';
+import Debug from './Debug';
+
+const SERVER_TIMER = 1000 * 60 * 2; // 2 min
 
 async function checkTokenExpired(auth_token) {
     const { expiry_time } = auth_token;
@@ -29,15 +31,15 @@ export const getApp = async () => {
 
     app.post('/token', async (req, res) => {
         try {
-            if (Auth.isOrganizationChange)
+            if (Auth.wantToChangeOrganization)
                 ConfigStore.delete(CONFIG_KEYS.AUTH_TOKEN);
             const expiryTimestamp =
                 Math.floor(Date.now() / 1000) + req.body.auth_token.expires_in;
             req.body.auth_token.expiry_time = expiryTimestamp;
             ConfigStore.set(CONFIG_KEYS.AUTH_TOKEN, req.body.auth_token);
             ConfigStore.set(CONFIG_KEYS.ORGANIZATION, req.body.organization);
             Auth.stopSever();
-            if (Auth.isOrganizationChange)
+            if (Auth.wantToChangeOrganization)
                 Logger.info('Organization changed successfully');
             else Logger.info('User logged in successfully');
             res.status(200).json({ message: 'success' });
@@ -49,16 +51,53 @@ export const getApp = async () => {
     return { app };
 };
 
+function startTimer(){
+    Debug("Server timer starts")
+    Auth.timer_id = setTimeout(() => {
+        Auth.stopSever(() => {
+            console.log(chalk.red('Server timeout: Please run fdk login command again.'));
+            process.exit(1);
+        })
+    }, SERVER_TIMER)
+}
+
+function resetTimer(){
+    if (Auth.timer_id) { 
+        Debug("Server timer stoped")
+        clearTimeout(Auth.timer_id)
+        Auth.timer_id = null;
+    }
+}
 export const startServer = async () => {
     if (Auth.server) return Auth.server;
 
     const { app } = await getApp();
     const serverIn = require('http').createServer(app);
-    Auth.server = serverIn.listen(port, (err) => {
-        if (err) console.log(err);
+
+    // handle errors thrown while start listening
+    serverIn.on('error', (error) => {
+        if (error.code === 'EADDRINUSE') {
+            console.error(chalk.red(`Port ${port} is already in use.`));
+        } else {
+            console.error(chalk.red('An unexpected error occurred:'), error);
+        }
+        process.exit(1);
     });
 
-    return Auth.server;
+    Auth.server = serverIn.listen(port);
+
+    // resolve promise only if server starts listening
+    // we will open partner panel only if server is listening
+    return new Promise(resolve => {
+        serverIn.on('listening', () => {
+            Debug(`Server started listening on ${port}`);
+            resolve(Auth.server);
+        });
+    }).then(server => {
+        // once server start listening, start server timer
+        startTimer();
+        return server
+    })
 };
 
 async function checkVersionCompatibility() {
@@ -67,7 +106,8 @@ async function checkVersionCompatibility() {
 
 export default class Auth {
     static server = null;
-    static isOrganizationChange = false;
+    static timer_id;
+    static wantToChangeOrganization = false;
     constructor() {}
     public static async login() {
         await checkVersionCompatibility();
@@ -78,7 +118,6 @@ export default class Auth {
             ),
         );
         const isLoggedIn = await Auth.isAlreadyLoggedIn();
-        await startServer();
         if (isLoggedIn) {
             const questions = [
                 {
@@ -91,21 +130,22 @@ export default class Auth {
             ];
             await inquirer.prompt(questions).then(async (answers) => {
                 if (answers.confirmChangeOrg === 'No') {
-                    Auth.isOrganizationChange = false;
-                    await Auth.stopSever();
+                    Auth.wantToChangeOrganization = false;
                     return;
                 } else {
-                    Auth.isOrganizationChange = true;
+                    Auth.wantToChangeOrganization = true;
+                    await startServer();
                 }
             });
-        }
+        } else 
+            await startServer();
         const env = ConfigStore.get(CONFIG_KEYS.CURRENT_ENV_VALUE);
         try {
             let domain = null;
             let partnerDomain = env.replace('api', 'partners');
             domain = `https://${partnerDomain}`;
             try {
-                if (Auth.isOrganizationChange || !isLoggedIn) {
+                if (Auth.wantToChangeOrganization || !isLoggedIn) {
                     await open(
                         `${domain}/organizations/?fdk-cli=true&callback=${encodeURIComponent(
                             `${getLocalBaseUrl()}:${port}`,
@@ -169,7 +209,11 @@ export default class Auth {
             else return false;
         } else return false;
     };
-    static stopSever = async () => {
-        Auth.server.close(() => {});
+    static stopSever = async (cb = null) => {
+        resetTimer();
+        Auth.server?.close?.(() => {
+            Debug("Server closed");
+            cb?.();
+        });
     };
 }

src/lib/Env.ts

@@ -8,7 +8,6 @@ import { isValidDomain } from '../helper/utils';
 import Debug from './Debug';
 import { getPlatformUrls } from './api/services/url';
 
-
 export default class Env {
     constructor() {}
 
@@ -31,39 +30,67 @@ export default class Env {
         try {
             // todo: remove name warning in future version
             if (options.name) {
-                console.warn(chalk.yellow(`Warning: The -n/--name option is deprecated. Please use -u/--url option instead. Ref: ${getPlatformUrls().partners}/help/docs/partners/themes/vuejs/command-reference#environment-commands-1`));
-                throw new Error('Please use -u/--url option.');
+                console.warn(
+                    chalk.yellow(
+                        `Warning: The -n/--name option is deprecated. Please use -u/--url or -p/--partners option instead. Ref: ${
+                            getPlatformUrls().partners
+                        }/help/docs/partners/themes/vuejs/command-reference#environment-commands-1`,
+                    ),
+                );
+                throw new Error(
+                    'Please use -u/--url or -p/--partners  option.',
+                );
             }
-            if (!options.url) {
-                throw new Error('Please provide -u/--url option.');
+
+            if (!options.url && !options.partners) {
+                throw new Error(
+                    'Please provide -u/--url or -p/--partners option.',
+                );
             }
 
-            if (!isValidDomain(options.url)) {
-                throw new Error('Please provide valid URL.');
+            let finalUrl = options.url || options.partners;
+
+            if (finalUrl.includes('https://')) {
+                finalUrl = finalUrl.replace('https://', '');
             }
+
+            // todo: in future, when url support will be removed, update isValidDomain to get only partners domain, as of now -u and -p can accept both url(api & partners).
+            if (!isValidDomain(finalUrl)) {
+                throw new Error(
+                    `Please provide valid domain, Example:${
+                        options.partners ? ' partners.fynd.com' : ''
+                    }${options.url ? ' api.fynd.com' : ''}`,
+                );
+            }
+
+            if (finalUrl.includes('partners')) {
+                finalUrl = finalUrl.replace('partners', 'api');
+            }
+
             try {
                 const url = urljoin(
                     'https://',
-                    options.url,
+                    finalUrl,
                     '/service/application/content/_healthz',
                 );
                 const response = await axios.get(url);
 
                 if (response?.status === 200) {
-                    Env.setEnv(options.url);
+                    Env.setEnv(finalUrl);
                     Logger.info(
-                        `CLI will start using: ${chalk.bold(options.url)}`,
+                        `CLI will start using: ${chalk.bold(finalUrl)}`,
                     );
                 } else {
                     throw new Error(
-                        'Provided url is not valid platform URL.',
+                        'Provided domain is not valid partners panel domain.',
                     );
                 }
             } catch (err) {
-                Debug(err)
-                throw new Error('Provided url is not valid platform URL.');
+                Debug(err);
+                throw new Error(
+                    'Provided domain is not valid partners panel domain.',
+                );
             }
-
         } catch (e) {
             throw new CommandError(e.message);
         }

src/lib/Logger.ts

@@ -100,7 +100,7 @@ export const COMMON_LOG_MESSAGES = {
         'Use fdk login --help to know more',
     )}`,
     contextMismatch: `Active Environment and Active Context Environment doesn't match.\n${chalk.yellow(
-        'Use `fdk theme context-list` to switch context OR `fdk env set -u <env-api-url>` to change active environment.',
+        'Use `fdk theme context-list` to switch context OR `fdk env set -p <partners-domain>` to change active environment.',
     )}`,
     invalidThemeType: `${chalk.yellow(`Theme Type can be react or vue2 only`)}`,
     ThemeTypeNotAvailableInContext: `${chalk.yellow(