feat: refactor credential management to handle non-existent files and…

… update session handling

- Updated `getCredentials` to create a credentials file if it does not exist, returning an empty object.
- Changed `removeCredentials` to accept a region code instead of a machine name, using the region to determine the machine name.
- Refactored `persistCredentials` to use region code directly.
- Updated tests to reflect changes in credential management and session handling.

src/commands/login/index.test.ts

@@ -14,10 +14,10 @@ vi.mock('./actions', () => ({
 }))
 
 vi.mock('../../creds', () => ({
-  addNetrcEntry: vi.fn(),
-  isAuthorized: vi.fn(),
-  getNetrcCredentials: vi.fn(),
-  getCredentialsForMachine: vi.fn(),
+  getCredentials: vi.fn(),
+  addCredentials: vi.fn(),
+  removeCredentials: vi.fn(),
+  removeAllCredentials: vi.fn(),
 }))
 
 // Mocking the session module

src/commands/login/index.ts

@@ -1,7 +1,7 @@
 import chalk from 'chalk'
 import { input, password, select } from '@inquirer/prompts'
 import type { RegionCode } from '../../constants'
-import { colorPalette, commands, regionNames, regions, regionsDomain } from '../../constants'
+import { colorPalette, commands, regionNames, regions } from '../../constants'
 import { getProgram } from '../../program'
 import { CommandError, handleError, isRegion, konsola } from '../../utils'
 import { loginWithEmailAndPassword, loginWithOtp, loginWithToken } from './actions'
@@ -63,7 +63,7 @@ export const loginCommand = program
       try {
         const { user } = await loginWithToken(token, region)
         updateSession(user.email, token, region)
-        await persistCredentials(regionsDomain[region])
+        await persistCredentials(region)
 
         konsola.ok(`Successfully logged in with token`)
       }
@@ -85,7 +85,7 @@ export const loginCommand = program
           const { user } = await loginWithToken(userToken, region)
 
           updateSession(user.email, userToken, region)
-          await persistCredentials(regionsDomain[region])
+          await persistCredentials(region)
 
           konsola.ok(`Successfully logged in with token`)
         }
@@ -124,7 +124,7 @@ export const loginCommand = program
           else {
             updateSession(userEmail, response.access_token, userRegion)
           }
-          await persistCredentials(regionsDomain[userRegion])
+          await persistCredentials(region)
           konsola.ok(`Successfully logged in with email ${chalk.hex(colorPalette.PRIMARY)(userEmail)}`)
         }
       }

src/commands/logout/index.test.ts

@@ -1,28 +1,60 @@
-import { isAuthorized, removeAllNetrcEntries } from '../../creds'
 import { logoutCommand } from './'
+import { session } from '../../session'
+
+import { removeAllCredentials } from '../../creds'
 
 vi.mock('../../creds', () => ({
-  isAuthorized: vi.fn(),
-  removeNetrcEntry: vi.fn(),
-  removeAllNetrcEntries: vi.fn(),
+  getCredentials: vi.fn(),
+  addCredentials: vi.fn(),
+  removeCredentials: vi.fn(),
+  removeAllCredentials: vi.fn(),
 }))
 
+// Mocking the session module
+vi.mock('../../session', () => {
+  let _cache: Record<string, any> | null = null
+  const session = () => {
+    if (!_cache) {
+      _cache = {
+        state: {
+          isLoggedIn: true,
+          password: 'valid-token',
+          region: 'eu',
+        },
+        updateSession: vi.fn(),
+        persistCredentials: vi.fn(),
+        initializeSession: vi.fn(),
+      }
+    }
+    return _cache
+  }
+
+  return {
+    session,
+  }
+})
+
 describe('logoutCommand', () => {
   beforeEach(() => {
     vi.resetAllMocks()
     vi.clearAllMocks()
   })
 
   it('should log out the user if has previously login', async () => {
-    vi.mocked(isAuthorized).mockResolvedValue(true)
-
+    session().state = {
+      isLoggedIn: true,
+      password: 'valid-token',
+      region: 'eu',
+    }
     await logoutCommand.parseAsync(['node', 'test'])
-    expect(removeAllNetrcEntries).toHaveBeenCalled()
+    expect(removeAllCredentials).toHaveBeenCalled()
   })
 
   it('should not log out the user if has not previously login', async () => {
-    vi.mocked(isAuthorized).mockResolvedValue(false)
+    session().state = {
+      isLoggedIn: false,
+    }
     await logoutCommand.parseAsync(['node', 'test'])
-    expect(removeAllNetrcEntries).not.toHaveBeenCalled()
+    expect(removeAllCredentials).not.toHaveBeenCalled()
   })
 })

src/commands/logout/index.ts

@@ -1,7 +1,8 @@
-import { isAuthorized, removeAllNetrcEntries } from '../../creds'
+import { removeAllCredentials } from '../../creds'
 import { commands } from '../../constants'
 import { getProgram } from '../../program'
 import { handleError, konsola } from '../../utils'
+import { session } from '../../session'
 
 const program = getProgram() // Get the shared singleton instance
 
@@ -11,12 +12,13 @@ export const logoutCommand = program
   .action(async () => {
     const verbose = program.opts().verbose
     try {
-      const isAuth = await isAuthorized()
-      if (!isAuth) {
+      const { state, initializeSession } = session()
+      await initializeSession()
+      if (!state.isLoggedIn || !state.password || !state.region) {
         konsola.ok(`You are already logged out. If you want to login, please use the login command.`)
         return
       }
-      await removeAllNetrcEntries()
+      await removeAllCredentials()
 
       konsola.ok(`Successfully logged out`)
     }

src/creds.test.ts

@@ -31,10 +31,9 @@ describe('creds', async () => {
         region: 'eu',
       })
     })
-    it('should throw an error if credentials file does not exist', async () => {
-      await expect(getCredentials('/temp/test/nonexistent.json')).rejects.toThrow(
-        new Error('The file requested was not found'),
-      )
+    it('should create a credentials.json file if it does not exist', async () => {
+      const credentials = await getCredentials('/temp/test/nonexistent.json')
+      expect(credentials).toEqual({})
     })
   })
 
@@ -69,7 +68,7 @@ describe('creds', async () => {
         }),
       }, '/temp')
 
-      await removeCredentials('api.storyblok.com', '/temp/test')
+      await removeCredentials('eu', '/temp/test')
 
       const content = vol.readFileSync('/temp/test/credentials.json', 'utf8')
       expect(content).toBe('{}')

src/creds.ts

@@ -2,7 +2,8 @@ import { access } from 'node:fs/promises'
 import { join } from 'node:path'
 import { FileSystemError, handleFileSystemError, konsola } from './utils'
 import chalk from 'chalk'
-import { colorPalette } from './constants'
+import type { RegionCode } from './constants'
+import { colorPalette, regionsDomain } from './constants'
 import { getStoryblokGlobalPath, readFile, saveToFile } from './utils/filesystem'
 
 export const getCredentials = async (filePath = join(getStoryblokGlobalPath(), 'credentials.json')) => {
@@ -12,6 +13,11 @@ export const getCredentials = async (filePath = join(getStoryblokGlobalPath(), '
     return JSON.parse(content)
   }
   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 {}
+    }
     handleFileSystemError('read', error as NodeJS.ErrnoException)
     return {}
   }
@@ -43,9 +49,10 @@ export const addCredentials = async ({
   }
 }
 
-export const removeCredentials = async (machineName: string, filepath: string = getStoryblokGlobalPath()) => {
+export const removeCredentials = async (region: RegionCode, filepath: string = getStoryblokGlobalPath()) => {
   const filePath = join(filepath, 'credentials.json')
   const credentials = await getCredentials(filePath)
+  const machineName = regionsDomain[region] || 'api.storyblok.com'
 
   if (credentials[machineName]) {
     delete credentials[machineName]
@@ -63,3 +70,8 @@ export const removeCredentials = async (machineName: string, filepath: string =
     konsola.warn(`No entry found for machine ${machineName} in ${chalk.hex(colorPalette.PRIMARY)(filePath)}`, true)
   }
 }
+
+export const removeAllCredentials = async (filepath: string = getStoryblokGlobalPath()) => {
+  const filePath = join(filepath, 'credentials.json')
+  await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 0o600 })
+}

src/session.ts

@@ -63,10 +63,10 @@ function createSession() {
     return null
   }
 
-  async function persistCredentials(machineName: string) {
+  async function persistCredentials(region: RegionCode) {
     if (state.isLoggedIn && state.login && state.password && state.region) {
       await addCredentials({
-        machineName,
+        machineName: regionsDomain[region] || 'api.storyblok.com',
         login: state.login,
         password: state.password,
         region: state.region,