feat: replace netrc with json

src/creds.ts

@@ -1,10 +1,49 @@
-import { access, readFile, writeFile } from 'node:fs/promises'
+import { access } from 'node:fs/promises'
 import { join } from 'node:path'
 import { FileSystemError, handleFileSystemError, konsola } from './utils'
 import chalk from 'chalk'
-import { colorPalette, regionCodes } from './constants'
+import { colorPalette } from './constants'
+import { getStoryblokGlobalPath, readFile, saveToFile } from './utils/filesystem'
 
-export interface NetrcMachine {
+export const getCredentials = async (filePath = join(getStoryblokGlobalPath(), 'credentials.json')) => {
+  try {
+    await access(filePath)
+    const content = await readFile(filePath)
+    return JSON.parse(content)
+  }
+  catch (error) {
+    handleFileSystemError('read', error as NodeJS.ErrnoException)
+    return {}
+  }
+}
+
+export const addCredentials = async ({
+  filePath = join(getStoryblokGlobalPath(), 'credentials.json'),
+  machineName,
+  login,
+  password,
+  region,
+}: Record<string, string>) => {
+  const credentials = {
+    ...await getCredentials(filePath),
+    [machineName]: {
+      login,
+      password,
+      region,
+    },
+  }
+
+  try {
+    await saveToFile(filePath, JSON.stringify(credentials, null, 2), { mode: 0o600 })
+
+    konsola.ok(`Successfully added/updated entry for machine ${machineName} in ${chalk.hex(colorPalette.PRIMARY)(filePath)}`, true)
+  }
+  catch (error) {
+    throw new FileSystemError('invalid_argument', 'write', error as NodeJS.ErrnoException, `Error adding/updating entry for machine ${machineName} in .netrc file`)
+  }
+}
+
+/* export interface NetrcMachine {
   login: string
   password: string
   region: string
@@ -15,7 +54,7 @@ export const getNetrcFilePath = () => {
     process.platform.startsWith('win') ? 'USERPROFILE' : 'HOME'
   ] || process.cwd()
 
-  return join(homeDirectory, '.netrc')
+  return join(homeDirectory, '.storyblok')
 }
 
 const readNetrcFileAsync = async (filePath: string) => {
@@ -257,4 +296,4 @@ export async function isAuthorized() {
     handleFileSystemError('authorization_check', error as NodeJS.ErrnoException)
     return false
   }
-}
+} */

src/index.ts

@@ -10,6 +10,7 @@ import './commands/user'
 import './commands/pull-languages'
 
 import { loginWithToken } from './commands/login/actions'
+import { session } from './session'
 
 dotenv.config() // This will load variables from .env into process.env
 const program = getProgram()
@@ -31,8 +32,11 @@ program.command('test').action(async () => {
   konsola.title(`Test`, '#8556D3', 'Attempting a test...')
   const verbose = program.opts().verbose
   try {
-    // await loginWithEmailAndPassword('aw', 'passwrod', 'eu')
-    await loginWithToken('WYSYDHYASDHSYD', 'eu')
+    const { state, updateSession, persistCredentials, initializeSession } = session()
+
+    await initializeSession()
+
+    console.log(state)
   }
   catch (error) {
     handleError(error as Error, verbose)

src/session.ts

@@ -1,6 +1,6 @@
 // session.ts
 import type { RegionCode } from './constants'
-import { addNetrcEntry, getCredentialsForMachine, getNetrcCredentials } from './creds'
+import { addCredentials, getCredentials } from './creds'
 
 interface SessionState {
   isLoggedIn: boolean
@@ -29,9 +29,9 @@ function createSession() {
       return
     }
 
-    // If no environment variables, fall back to netrc
-    const machines = await getNetrcCredentials()
-    const creds = getCredentialsForMachine(machines, machineName)
+    // If no environment variables, fall back to .storyblok/credentials.json
+    const machines = await getCredentials()
+    const creds = machines[machineName || 'api.storyblok.com']
     if (creds) {
       state.isLoggedIn = true
       state.login = creds.login
@@ -65,7 +65,7 @@ function createSession() {
 
   async function persistCredentials(machineName: string) {
     if (state.isLoggedIn && state.login && state.password && state.region) {
-      await addNetrcEntry({
+      await addCredentials({
         machineName,
         login: state.login,
         password: state.password,

src/utils/filesystem.ts

@@ -1,8 +1,20 @@
-import { parse, resolve } from 'node:path'
-import { mkdir, writeFile } from 'node:fs/promises'
+import { join, parse, resolve } from 'node:path'
+import { mkdir, readFile as readFileImpl, writeFile } from 'node:fs/promises'
 import { handleFileSystemError } from './error/filesystem-error'
 
-export const saveToFile = async (filePath: string, data: string) => {
+export interface FileOptions {
+  mode?: number
+}
+
+export const getStoryblokGlobalPath = () => {
+  const homeDirectory = process.env[
+    process.platform.startsWith('win') ? 'USERPROFILE' : 'HOME'
+  ] || process.cwd()
+
+  return join(homeDirectory, '.storyblok')
+}
+
+export const saveToFile = async (filePath: string, data: string, options: FileOptions) => {
   // Get the directory path
   const resolvedPath = parse(filePath).dir
 
@@ -17,11 +29,21 @@ export const saveToFile = async (filePath: string, data: string) => {
 
   // Write the file
   try {
-    await writeFile(filePath, data)
+    await writeFile(filePath, data, options)
   }
   catch (writeError) {
     handleFileSystemError('write', writeError as Error)
   }
 }
 
+export const readFile = async (filePath: string) => {
+  try {
+    return await readFileImpl(filePath, 'utf8')
+  }
+  catch (error) {
+    handleFileSystemError('read', error as Error)
+    return ''
+  }
+}
+
 export const resolvePath = (path: string | undefined, folder: string) => path ? resolve(process.cwd(), path) : resolve(resolve(process.cwd(), '.storyblok'), folder)