fix(cli): credentials written in the wrong path (#745)

Author: HugoRCD

.changeset/jolly-turtles-allow.md

@@ -0,0 +1,5 @@
+---
+"@shelve/cli": patch
+---
+
+Fix `shelve -v` reporting the cwd project version instead of the CLI version. Fix `shelve login` storing credentials in the legacy `~/.shelve` path while API calls read from XDG/keyring storage.

packages/cli/src/index.ts

@@ -1,7 +1,9 @@
 #!/usr/bin/env node
 
+import { readFileSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { defineCommand, runMain } from 'citty'
-import { readPackageJSON } from 'pkg-types'
 import consola from 'consola'
 import push from './commands/push'
 import pull from './commands/pull'
@@ -15,13 +17,21 @@ import upgrade from './commands/upgrade'
 import run from './commands/run'
 import init from './commands/init'
 
-const pkg = await readPackageJSON().catch(() => ({ version: 'unknown' }))
+function getCliPackageVersion(): string {
+  try {
+    const here = dirname(fileURLToPath(import.meta.url))
+    const { version } = JSON.parse(readFileSync(join(here, '..', 'package.json'), 'utf-8'))
+    return version || 'unknown'
+  } catch {
+    return 'unknown'
+  }
+}
 
 const main = defineCommand({
   meta: {
     name: 'shelve',
     description: 'Shelve CLI',
-    version: pkg.version,
+    version: getCliPackageVersion(),
   },
   subCommands: {
     run,

packages/cli/src/services/base.ts

@@ -4,9 +4,9 @@ import { dirname, join } from 'node:path'
 import { ofetch, type $Fetch, type FetchOptions } from 'ofetch'
 import { spinner } from '@clack/prompts'
 import type { User } from '@types'
-import { writeUser } from 'rc9'
 import { askPassword, loadShelveConfig } from '../utils'
 import { ErrorService } from './error'
+import { CredentialsService } from './credentials'
 
 export abstract class BaseService {
 
@@ -45,7 +45,7 @@ export abstract class BaseService {
     const token = await askPassword(`Please provide a valid token (you can generate one on ${sanitizedUrl}/user/tokens)`)
     const user = await this.whoAmI(url, token)
 
-    writeUser({ token, email: user.email, username: user.username }, '.shelve')
+    await CredentialsService.writeToken(url, token, { email: user.email, username: user.username })
 
     if (returnUser) return {
       user,