fix: improve wgc auth login and router compatibility-version (#1636)

Author: Aenimus

cli/src/commands/auth/commands/login.ts

@@ -3,9 +3,12 @@ import open from 'open';
 import pc from 'picocolors';
 import jwtDecode from 'jwt-decode';
 import inquirer from 'inquirer';
+import { EnumStatusCode } from '@wundergraph/cosmo-connect/dist/common/common_pb';
+import ora from 'ora';
 import { BaseCommandOptions } from '../../../core/types/types.js';
 import { DecodedAccessToken, performDeviceAuth, startPollingForAccessToken } from '../utils.js';
 import { updateConfigFile } from '../../../utils.js';
+import { getBaseHeaders } from '../../../core/config.js';
 
 export default (opts: BaseCommandOptions) => {
   const loginCommand = new Command('login');
@@ -45,16 +48,51 @@ export default (opts: BaseCommandOptions) => {
       program.error('Could not perform authentication. Please try again');
     }
 
-    const organizations = new Set(decoded.groups.map((group) => group.split('/')[1]));
+    const organizationSlugs = new Set(decoded.groups.map((group) => group.split('/')[1]));
+
+    const organizationSlugByDisplayKey = new Map<string, string>();
+    const organizationKeys: Array<string> = [];
+    const spinner = ora('Fetching organizations...').start();
+    for (const organizationSlug of organizationSlugs) {
+      const headers = getBaseHeaders();
+      const response = await opts.client.platform.getOrganizationBySlug(
+        {
+          slug: organizationSlug,
+        },
+        {
+          headers: {
+            ...headers,
+            authorization: `Bearer ${accessTokenResp.response.accessToken}`,
+            'cosmo-org-slug': organizationSlug,
+          },
+        },
+      );
+      if (!response.response || response.response.code !== EnumStatusCode.OK || !response.organization) {
+        organizationKeys.push(organizationSlug);
+        organizationSlugByDisplayKey.set(organizationSlug, organizationSlug);
+        continue;
+      }
+      const organizationKey = `${response.organization.name} (${organizationSlug})`;
+      organizationKeys.push(organizationKey);
+      organizationSlugByDisplayKey.set(organizationKey, organizationSlug);
+    }
+
+    spinner.stop();
 
     const selectedOrganization = await inquirer.prompt({
-      name: 'organizationSlug',
+      name: 'organizationKey',
       type: 'list',
       message: 'Select Organization:',
-      choices: [...organizations],
+      choices: organizationKeys,
     });
 
-    updateConfigFile({ ...accessTokenResp.response, organizationSlug: selectedOrganization.organizationSlug });
+    const organizationSlug = organizationSlugByDisplayKey.get(selectedOrganization.organizationKey);
+
+    if (!organizationSlug) {
+      program.error('Unable to login.');
+    }
+
+    updateConfigFile({ ...accessTokenResp.response, organizationSlug });
 
     console.log(pc.green('Logged in Successfully!'));
   });

cli/src/commands/router/index.ts

@@ -31,7 +31,7 @@ export default (opts: BaseCommandOptions) => {
   );
 
   cmd.hook('preAction', async (thisCmd) => {
-    if (['compose', 'download-binary'].includes(thisCmd.args[0])) {
+    if (['compose', 'download-binary', 'compatibility-version'].includes(thisCmd.args[0])) {
       return;
     }
     await checkAuth();