Merge pull request #146 from storyblok/bugfix/replace-netrc-with-json

feat: replace netrc with json

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`)
         }
@@ -126,7 +126,7 @@ export const loginCommand = program
           else if (response?.access_token) {
             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/commands/user/index.ts

@@ -1,5 +1,4 @@
 import chalk from 'chalk'
-import type { NetrcMachine } from '../../creds'
 import { colorPalette, commands } from '../../constants'
 import { getProgram } from '../../program'
 import { CommandError, handleError, konsola } from '../../utils'
@@ -21,7 +20,10 @@ export const userCommand = program
       return
     }
     try {
-      const { password, region } = state as NetrcMachine
+      const { password, region } = state
+      if (!password || !region) {
+        throw new Error('No password or region found')
+      }
       const { user } = await getUser(password, region)
       konsola.ok(`Hi ${chalk.bold(user.friendly_name)}, you are currently logged in with ${chalk.hex(colorPalette.PRIMARY)(user.email)} on ${chalk.bold(region)} region`)
     }