Fix partners url replacement issue (#357)

* Fix partners url * set version to 6.0.0 * ID: FPCO-41454; Add test cases * ID: FPCO-41454; Add mock for new test cases * 6.1.1 * ID: FPCO-41454; Update package-lock * ID: FPCO-41454; Remove package-lock
gofynd · Sep 3, 2024 · 14da80d · 14da80d
1 parent d81cd24
commit 14da80d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -136,9 +136,9 @@ This command allows user to login via partner panel.
 fdk login [options]
 ```
 #### **Command Options**
-| Option        | Description           |
-| ------------- |-------------|
-| --host    | API host |
+| Option        | Description           | 
+| ------------- |-------------| 
+| --host    | URL of the partners panel host or API host |
 | --help    | Show help |
 | --verbose, -v | enable debug mode |
 
@@ -147,6 +147,9 @@ fdk login [options]
 fdk login
 ```
 ```sh
+fdk login --host partners.fynd.com
+```
+```sh
 fdk login --host api.fynd.com
 ```
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gofynd/fdk-cli",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "main": "index.js",
   "license": "MIT",
   "bin": {

diff --git a/src/__tests__/auth.spec.ts b/src/__tests__/auth.spec.ts
@@ -61,10 +61,20 @@ describe('Auth Commands', () => {
         configStore.set(CONFIG_KEYS.ORGANIZATION, organizationData._id);
         mock.onGet('https://api.fyndx1.de/service/application/content/_healthz').reply(200);
         mock.onGet('https://api.fynd.com/service/application/content/_healthz').reply(200);
+        mock.onGet('https://api.jiomartpartners.com/service/application/content/_healthz').reply(200);
+        mock.onGet('https://api-invoice.sandbox3.fynd.engineering/service/application/content/_healthz').reply(200);
         mock.onGet(`${URLS.GET_ORGANIZATION_DETAILS()}`).reply(
             200,
             organizationData,
         );
+        mock.onGet('https://api.jiomartpartners.com/service/partner/partners/v1.0/organization/60afe92972b7a964de57a1d4').reply(
+            200,
+            organizationData,
+        );
+        mock.onGet('https://api-invoice.sandbox3.fynd.engineering/service/partner/partners/v1.0/organization/60afe92972b7a964de57a1d4').reply(
+            200,
+            organizationData,
+        );
         setEnv('api.fynd.com');
         configStore.set(CONFIG_KEYS.ORGANIZATION, organizationData._id);
         mock.onGet(`${URLS.GET_ORGANIZATION_DETAILS()}`).reply(
@@ -93,6 +103,21 @@ describe('Auth Commands', () => {
             'pr-4fb094006ed3a6d749b69875be0418b83238d078',
         );
     });
+    it('Passing partners URL should set api host in env', async () => {
+        configStore.delete(CONFIG_KEYS.AUTH_TOKEN);
+        await login('partners.fynd.com');
+        expect(configStore.get(CONFIG_KEYS.CURRENT_ENV_VALUE)).toBe('api.fynd.com');
+    });
+    it('Passing partners URL with partners in domain should set proper api host in env', async () => {
+        configStore.delete(CONFIG_KEYS.AUTH_TOKEN);
+        await login('partners.jiomartpartners.com');
+        expect(configStore.get(CONFIG_KEYS.CURRENT_ENV_VALUE)).toBe('api.jiomartpartners.com');
+    });
+    it('Passing partners sandbox URL should set partners api host in env', async () => {
+        configStore.delete(CONFIG_KEYS.AUTH_TOKEN);
+        await login('partners-invoice.sandbox3.fynd.engineering');
+        expect(configStore.get(CONFIG_KEYS.CURRENT_ENV_VALUE)).toBe('api-invoice.sandbox3.fynd.engineering');
+    });
     it('Should exit when user selects no for organization change', async () => {
         const inquirerMock = mockFunction(inquirer.prompt);
         inquirerMock.mockResolvedValue({ confirmChangeOrg: 'No' });

diff --git a/src/lib/Env.ts b/src/lib/Env.ts
@@ -66,13 +66,23 @@ export default class Env {
            );
         }
 
-        // replace parnters to api
-        if (finalDomain.includes('partners')) {
-            finalDomain = finalDomain.replace('partners', 'api');
+
+        function replaceSubdomain(url: string) {
+            let finalUrl = url;
+            if(url.startsWith("partners.")){
+                finalUrl = "api." + url.split(".").slice(1).join(".");
+            } else 
+            if(url.startsWith("partners-")){
+                finalUrl = "api-" + url.split("-").slice(1).join("-");
+            }
+            return finalUrl;
         }
 
+        // replace parnters to api
+        finalDomain = replaceSubdomain(finalDomain);
+
         // validate domain if it is api domain or not
-        if(!(finalDomain.includes('api.') || finalDomain.includes('api-'))){
+        if(!(finalDomain.startsWith('api.') || finalDomain.startsWith('api-'))){
             throw new CommandError(
                 `Invalid host: Please provide a valid Fynd Platform API domain. For example: 'api.fynd.com'.`,
                 ErrorCodes.INVALID_INPUT.code