fix(creds): get first credential to operate

src/creds.test.ts

@@ -1,5 +1,6 @@
 import { addCredentials, getCredentials, removeCredentials } from './creds';
 import { vol } from 'memfs';
+import type { StoryblokCredentials } from './types';
 // tell vitest to use fs mock from __mocks__ folder
 // this can be done in a setup file if fs should always be mocked
 vi.mock('node:fs');
@@ -23,7 +24,7 @@ describe('creds', async () => {
         }),
       }, '/temp');
 
-      const credentials = await getCredentials('/temp/test/credentials.json');
+      const credentials = await getCredentials('/temp/test/credentials.json') as StoryblokCredentials;
 
       expect(credentials['api.storyblok.com']).toEqual({
         login: 'julio.iglesias@storyblok.com',
@@ -33,7 +34,7 @@ describe('creds', async () => {
     });
     it('should create a credentials.json file if it does not exist', async () => {
       const credentials = await getCredentials('/temp/test/nonexistent.json');
-      expect(credentials).toEqual({});
+      expect(credentials).toEqual(null);
     });
   });
 

src/creds.ts

@@ -5,21 +5,29 @@ import chalk from 'chalk';
 import type { RegionCode } from './constants';
 import { colorPalette, regionsDomain } from './constants';
 import { getStoryblokGlobalPath, readFile, saveToFile } from './utils/filesystem';
+import type { StoryblokCredentials } from './types';
 
-export const getCredentials = async (filePath = join(getStoryblokGlobalPath(), 'credentials.json')) => {
+export const getCredentials = async (filePath = join(getStoryblokGlobalPath(), 'credentials.json')): Promise<StoryblokCredentials | null> => {
   try {
     await access(filePath);
     const content = await readFile(filePath);
-    return JSON.parse(content);
+    const parsedContent = JSON.parse(content);
+
+    // Return null if the parsed content is an empty object
+    if (Object.keys(parsedContent).length === 0) {
+      return null;
+    }
+
+    return parsedContent;
   }
   catch (error) {
     if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
       // File doesn't exist, create it with empty credentials
       await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 0o600 });
-      return {};
+      return null;
     }
     handleFileSystemError('read', error as NodeJS.ErrnoException);
-    return {};
+    return null;
   }
 };
 

src/session.ts

@@ -17,7 +17,7 @@ function createSession() {
     isLoggedIn: false,
   };
 
-  async function initializeSession(region = 'eu' as RegionCode) {
+  async function initializeSession() {
     // First, check for environment variables
     const envCredentials = getEnvCredentials();
     if (envCredentials) {
@@ -30,9 +30,10 @@ function createSession() {
     }
 
     // If no environment variables, fall back to .storyblok/credentials.json
-    const machines = await getCredentials();
-    const creds = machines[regionsDomain[region] || 'api.storyblok.com'];
-    if (creds) {
+    const credentials = await getCredentials();
+    if (credentials) {
+      // Todo: evaluate this in future when we want to support multiple regions
+      const creds = Object.values(credentials)[0];
       state.isLoggedIn = true;
       state.login = creds.login;
       state.password = creds.password;

src/types/index.ts

@@ -1,3 +1,5 @@
+import type { RegionCode } from '../constants';
+
 /**
  * Interface representing the default options for a CLI command.
  */
@@ -54,3 +56,9 @@ export interface FileReaderResult<T> {
   data: T[];
   error?: Error;
 }
+
+export interface StoryblokCredentials {
+  login: string;
+  password: string;
+  region: RegionCode;
+}

src/utils/index.ts

@@ -14,4 +14,8 @@ export function isRegion(value: RegionCode): value is RegionCode {
   return Object.values(regions).includes(value);
 }
 
+export function isEmptyObject(obj: object): boolean {
+  return Object.keys(obj).length === 0;
+}
+
 export const isVitest = process.env.VITEST === 'true';