puter-cli 1.8.1 → 1.8.2

package/.github/workflows/npm-build.yml

@@ -15,14 +15,14 @@ jobs:
     - name: Install pnpm
       uses: pnpm/action-setup@v4
       with:
-        version: 10
+        version: 8
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
     - name: Install dependencies
-      run: pnpm install
+      run: pnpm install --frozen-lockfile
     - name: Run tests & coverage
       run: pnpm run coverage
     - name: Upload coverage reports to Codecov

package/.github/workflows/npm-publish.yml

@@ -3,29 +3,48 @@
 
 name: Publish package
 
-on: push
+on:
+  push:
+    tags:
+      - 'v*.*.*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 8
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
         with:
           node-version: 20
-      - run: npm ci
-      - run: npm test
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Run tests
+        run: pnpm test
 
   publish-npm:
     needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 8
+      - name: Use Node.js 20
+        uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: https://registry.npmjs.org/
-      - run: npm ci
-      - run: npm publish
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Publish to npm
+        run: pnpm publish --no-git-checks
         env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/CHANGELOG.md

@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.8.2](https://github.com/HeyPuter/puter-cli/compare/v1.8.1...v1.8.2)
+
+- feat: support multiple user profiles and hosts [`#12`](https://github.com/HeyPuter/puter-cli/pull/12)
+- feat: merge profile feature and fix tests [`f234bc2`](https://github.com/HeyPuter/puter-cli/commit/f234bc2704047f39d2899962cd2aaa63df8331ce)
+- ci(publish): trigger publish workflow on version tags [`61138c8`](https://github.com/HeyPuter/puter-cli/commit/61138c828be3856cd60e7561496f963e9f0ca1be)
+
 #### [v1.8.1](https://github.com/HeyPuter/puter-cli/compare/v1.8.0...v1.8.1)
 
+> 16 April 2025
+
 - fix: better version status handling and error resilience [`ab467e8`](https://github.com/HeyPuter/puter-cli/commit/ab467e8e57cb4f82619424b12136724904df0302)
 
 #### [v1.8.0](https://github.com/HeyPuter/puter-cli/compare/v1.7.3...v1.8.0)

package/bin/index.js

@@ -20,7 +20,9 @@ async function main() {
     .command('login')
     .description('Login to Puter account')
     .option('-s, --save', 'Save authentication token in .env file', '')
-    .action(login);
+    .action(() => {
+      startShell('login');
+    });
 
   program
     .command('logout')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puter-cli",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "Command line interface for Puter cloud platform",
   "main": "index.js",
   "bin": {

package/src/commands/auth.js

@@ -5,109 +5,17 @@ import Conf from 'conf';
 import ora from 'ora';
 import fetch from 'node-fetch';
 import { PROJECT_NAME, API_BASE, getHeaders, BASE_URL } from '../commons.js'
+import { ProfileAPI } from '../modules/ProfileModule.js';
+import { get_context } from '../temporary/context_helpers.js';
 const config = new Conf({ projectName: PROJECT_NAME });
 
 /**
  * Login user
  * @returns void
  */
-export async function login(args = {}) {
-  const answers = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'username',
-      message: 'Username:',
-      validate: input => input.length >= 1 || 'Username is required'
-    },
-    {
-      type: 'password',
-      name: 'password',
-      message: 'Password:',
-      mask: '*',
-      validate: input => input.length >= 1 || 'Password is required'
-    }
-  ]);
-
-  let spinner;
-  try {
-    spinner = ora('Logging in to Puter...').start();
-    
-    const response = await fetch(`${BASE_URL}/login`, {
-      method: 'POST',
-      headers: getHeaders(),
-      body: JSON.stringify({
-        username: answers.username,
-        password: answers.password
-      })
-    });
-
-    let data = await response.json();
-
-    while ( data.proceed && data.next_step ) {
-      if ( data.next_step === 'otp') {
-        spinner.succeed(chalk.green('2FA is enabled'));
-        const answers = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'otp',
-            message: 'Authenticator Code:',
-            validate: input => input.length === 6 || 'OTP must be 6 digits'
-          }
-        ]);
-        spinner = ora('Logging in to Puter...').start();
-        const response = await fetch(`${BASE_URL}/login/otp`, {
-          method: 'POST',
-          headers: getHeaders(),
-          body: JSON.stringify({
-            token: data.otp_jwt_token,
-            code: answers.otp,
-          }),
-        });
-        data = await response.json();
-        continue;
-      }
-
-      if ( data.next_step === 'complete' ) break;
-
-      spinner.fail(chalk.red(`Unrecognized login step "${data.next_step}"; you might need to update puter-cli.`));
-      return;
-    }
-
-    if (data.proceed && data.token) {
-      config.set('auth_token', data.token);
-      config.set('username', answers.username);
-      config.set('cwd', `/${answers.username}`);
-      if (spinner){
-        spinner.succeed(chalk.green('Successfully logged in to Puter!'));
-      }
-      console.log(chalk.dim(`Token: ${data.token.slice(0, 5)}...${data.token.slice(-5)}`));
-      // Save token
-      if (args.save){
-        const localEnvFile = '.env';
-        try {
-            // Check if the file exists, if so then delete it before writing.
-            if (fs.existsSync(localEnvFile)) {
-              console.log(chalk.yellow(`File "${localEnvFile}" already exists... Adding token.`));
-              fs.appendFileSync(localEnvFile, `\nPUTER_API_KEY="${data.token}"`, 'utf8');
-            } else {
-              console.log(chalk.cyan(`Saving token to ${chalk.green(localEnvFile)} file.`));
-              fs.writeFileSync(localEnvFile, `PUTER_API_KEY="${data.token}"`, 'utf8');
-            }
-        } catch (error) {
-          console.error(chalk.red(`Cannot save token to .env file. Error: ${error.message}`));
-          console.log(chalk.cyan(`PUTER_API_KEY="${data.token}"`));
-        }
-      }
-    } else {
-      spinner.fail(chalk.red('Login failed. Please check your credentials.'));
-    }
-  } catch (error) {
-    if (spinner) {
-      spinner.fail(chalk.red('Failed to login'));
-    } else {
-      console.error(chalk.red(`Failed to login: ${error.message}`));
-    }
-  }
+export async function login(args = {}, context) {
+  const profileAPI = context[ProfileAPI];
+  await profileAPI.switchProfileWizard();
 }
 
 /**
@@ -164,6 +72,7 @@ export async function getUserInfo() {
     }
   } catch (error) {
     console.error(chalk.red(`Failed to get user info.\nError: ${error.message}`));
+    console.log(error);
   }
 }
 export function isAuthenticated() {
@@ -171,11 +80,15 @@ export function isAuthenticated() {
 }
 
 export function getAuthToken() {
-  return config.get('auth_token');
+  const context = get_context();
+  const profileAPI = context[ProfileAPI];
+  return profileAPI.getAuthToken();
 }
 
 export function getCurrentUserName() {
-  return config.get('username');
+  const context = get_context();
+  const profileAPI = context[ProfileAPI];
+  return profileAPI.getCurrentProfile()?.username;
 }
 
 export function getCurrentDirectory() {

package/src/commands/files.js

@@ -588,6 +588,7 @@ export async function pathExists(filePath) {
         return statResponse.ok;
     } catch (error){
         console.error(chalk.red('Failed to check if file exists.'));
+        console.error('ERROR', error);
             return false;
     }    
 }

package/src/commands/shell.js

@@ -2,9 +2,10 @@ import readline from 'node:readline';
 import chalk from 'chalk';
 import Conf from 'conf';
 import { execCommand, getPrompt } from '../executor.js';
-import { getAuthToken, login } from './auth.js';
 import { PROJECT_NAME } from '../commons.js';
+import SetContextModule from '../modules/SetContextModule.js';
 import ErrorModule from '../modules/ErrorModule.js';
+import ProfileModule from '../modules/ProfileModule.js';
 import putility from '@heyputer/putility';
 
 const config = new Conf({ projectName: PROJECT_NAME });
@@ -26,16 +27,11 @@ export function updatePrompt(currentPath) {
 /**
  * Start the interactive shell
  */
-export async function startShell() {
-  if (!getAuthToken()) {
-    console.log(chalk.cyan('Please login first (or use CTRL+C to exit):'));
-    await login();
-    console.log(chalk.green(`Now just type: ${chalk.cyan('puter')} to begin.`));
-    process.exit(0);
-  }
-
+export async function startShell(command) {
   const modules = [
+    SetContextModule,
     ErrorModule,
+    ProfileModule,
   ];
 
   const context = new putility.libs.context.Context({
@@ -44,6 +40,14 @@ export async function startShell() {
 
   for ( const module of modules ) module({ context });
 
+  await context.events.emit('check-login', {});
+  
+  // This argument enables the `puter <subcommand>` commands
+  if ( command ) {
+    await execCommand(context, command);
+    process.exit(0);
+  }
+
   try {
     console.log(chalk.green('Welcome to Puter-CLI! Type "help" for available commands.'));
     rl.setPrompt(getPrompt());
@@ -66,4 +70,4 @@ export async function startShell() {
   } catch (error) {
     console.error(chalk.red('Error starting shell:', error));
   }
-}
+}

package/src/commons.js

@@ -10,8 +10,14 @@ dotenv.config();
 
 export const PROJECT_NAME = 'puter-cli';
 // If you haven't defined your own values in .env file, we'll assume you're running Puter on a local instance:
-export const API_BASE = process.env.PUTER_API_BASE || 'https://api.puter.com';
-export const BASE_URL = process.env.PUTER_BASE_URL || 'https://puter.com';
+export let API_BASE = process.env.PUTER_API_BASE || 'https://api.puter.com';
+export let BASE_URL = process.env.PUTER_BASE_URL || 'https://puter.com';
+export const NULL_UUID = '00000000-0000-0000-0000-000000000000';
+
+export const reconfigureURLs = ({ api, base }) => {
+    API_BASE = api;
+    BASE_URL = base;
+};
 
 /**
  * Get headers with the correct Content-Type for multipart form data.

package/src/executor.js

@@ -6,7 +6,7 @@ import { listFiles, makeDirectory, renameFileOrDirectory,
   removeFileOrDirectory, emptyTrash, changeDirectory, showCwd, 
   getInfo, getDiskUsage, createFile, readFile, uploadFile, 
   downloadFile, copyFile, syncDirectory, editFile } from './commands/files.js';
-import { getUserInfo, getUsageInfo } from './commands/auth.js';
+import { getUserInfo, getUsageInfo, login } from './commands/auth.js';
 import { PROJECT_NAME, API_BASE, getHeaders } from './commons.js';
 import inquirer from 'inquirer';
 import { exec } from 'node:child_process';
@@ -34,6 +34,7 @@ const commands = {
     await import('./commands/auth.js').then(m => m.logout());
     process.exit(0);
   },
+  login: login,
   whoami: getUserInfo,
   stat: getInfo,
   apps: async (args) => {

package/src/modules/ProfileModule.js

@@ -0,0 +1,274 @@
+// external
+import inquirer from 'inquirer';
+import Conf from 'conf';
+import chalk from 'chalk';
+import ora from 'ora';
+
+// project
+import { API_BASE, BASE_URL, NULL_UUID, PROJECT_NAME, getHeaders, reconfigureURLs } from '../commons.js'
+import { getAuthToken, login } from '../commands/auth.js';
+
+// builtin
+import fs from 'node:fs';
+import crypto from 'node:crypto';
+
+// initializations
+const config = new Conf({ projectName: PROJECT_NAME });
+
+export const ProfileAPI = Symbol('ProfileAPI');
+
+function toApiSubdomain(inputUrl) {
+    const url = new URL(inputUrl);
+    const hostParts = url.hostname.split('.');
+    
+    // Insert 'api' before the domain
+    hostParts.splice(-2, 0, 'api');
+    url.hostname = hostParts.join('.');
+
+    let output = url.toString();
+    if ( output.endsWith('/') ) {
+        output = output.slice(0, -1);
+    }
+    return output;
+}
+
+class ProfileModule {
+    constructor({ context }) {
+        this.context = context;
+
+        context.events.on('check-login', async () => {
+            if ( config.get('auth_token') ) {
+                await this.migrateLegacyConfig();
+            }
+            if ( ! config.get('selected_profile') ) {
+                console.log(chalk.cyan('Please login first (or use CTRL+C to exit):'));
+                await this.switchProfileWizard();
+                console.log(chalk.red('Please run "puter" command again (issue #11)'));
+                process.exit(0);
+            }
+            this.applyProfileToGlobals();
+        });
+
+    }
+    migrateLegacyConfig () {
+        const auth_token = config.get('auth_token');
+        const username = config.get('username');
+        
+        this.addProfile({
+            host: BASE_URL,
+            username,
+            cwd: `/${username}`,
+            token: auth_token,
+            uuid: NULL_UUID,
+        });
+        
+        config.delete('auth_token');
+        config.delete('username');
+    }
+    getDefaultProfile() {
+        const auth_token = config.get('auth_token');
+        if ( ! auth_token ) return;
+        return {
+            host: 'puter.com',
+            username: config.get('username'),
+            token: auth_token,
+        };
+    }
+    getProfiles() {
+        const profiles = config.get('profiles') ?? [];
+        return profiles;
+    }
+    addProfile(newProfile) {
+        const profiles = [
+            ...this.getProfiles().filter(p => ! p.transient),
+            newProfile,
+        ];
+        config.set('profiles', profiles);
+    }
+    selectProfile(profile) {
+        config.set('selected_profile', profile.uuid);
+        config.set('username', `${profile.username}`);
+        config.set('cwd', `/${profile.username}`);
+        this.applyProfileToGlobals(profile);
+    }
+    getCurrentProfile() {
+        const profiles = this.getProfiles();
+        const uuid = config.get('selected_profile');
+        return profiles.find(p => p.uuid === uuid);
+    }
+    applyProfileToGlobals(profile) {
+        if ( ! profile ) profile = this.getCurrentProfile();
+        reconfigureURLs({
+            base: profile.host,
+            api: toApiSubdomain(profile.host),
+        });
+    }
+    getAuthToken () {
+        const uuid = config.get('selected_profile');
+        const profiles = this.getProfiles();
+        const profile = profiles.find(v => v.uuid === uuid);
+        return profile?.token;
+    }
+    
+    async switchProfileWizard (args = {}) {
+        const profiles = this.getProfiles();
+        if ( profiles.length < 1 ) {
+            return this.addProfileWizard();
+        }
+        
+        console.log('doing this branch');
+        const answer = await inquirer.prompt([
+            {
+                name: 'profile',
+                type: 'list',
+                message: 'Select a Profile',
+                choices: [
+                    ...profiles.map((v, i) => {
+                        return {
+                            name: v.name ?? `${v.username}@${v.host}`,
+                            value: v,
+                        };
+                    }),
+                    {
+                        name: 'Create New Profile',
+                        value: 'new',
+                    }
+                ]
+            }
+        ]);
+        
+        if ( answer.profile === 'new' ) {
+            return await this.addProfileWizard();
+        }
+        
+        this.selectProfile(answer.profile);
+    }
+
+    async addProfileWizard (args = {}) {
+        const answers = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'host',
+                message: 'Host (leave blank for puter.com):',
+                default: 'https://puter.com',
+                validate: input => input.length >= 1 || 'Host is required'
+            },
+            {
+                type: 'input',
+                name: 'username',
+                message: 'Username:',
+                validate: input => input.length >= 1 || 'Username is required'
+            },
+            {
+                type: 'password',
+                name: 'password',
+                message: 'Password:',
+                mask: '*',
+                validate: input => input.length >= 1 || 'Password is required'
+            }
+        ]);
+
+        let spinner;
+        try {
+            spinner = ora('Logging in to Puter...').start();
+
+            const response = await fetch(`${answers.host}/login`, {
+                method: 'POST',
+                headers: getHeaders(),
+                body: JSON.stringify({
+                    username: answers.username,
+                    password: answers.password
+                })
+            });
+
+
+            const contentType = response.headers.get('content-type');
+            console.log('content type?', '|' + contentType + '|');
+
+            // TODO: proper content type parsing
+            if ( ! contentType.trim().startsWith('application/json') ) {
+                throw new Error(await response.text());
+            }
+
+            let data = await response.json();
+
+            while (data.proceed && data.next_step) {
+                if (data.next_step === 'otp') {
+                    spinner.succeed(chalk.green('2FA is enabled'));
+                    const answers2FA = await inquirer.prompt([
+                        {
+                            type: 'input',
+                            name: 'otp',
+                            message: 'Authenticator Code:',
+                            validate: input => input.length === 6 || 'OTP must be 6 digits'
+                        }
+                    ]);
+                    spinner = ora('Logging in to Puter...').start();
+                    const response = await fetch(`${answers.host}/login/otp`, {
+                        method: 'POST',
+                        headers: getHeaders(),
+                        body: JSON.stringify({
+                            token: data.otp_jwt_token,
+                            code: answers2FA.otp,
+                        }),
+                    });
+                    data = await response.json();
+                    continue;
+                }
+
+                if (data.next_step === 'complete') break;
+
+                spinner.fail(chalk.red(`Unrecognized login step "${data.next_step}"; you might need to update puter-cli.`));
+                return;
+            }
+
+            if (data.proceed && data.token) {
+                const profileUUID = crypto.randomUUID();
+                const profile = {
+                    host: answers.host,
+                    username: answers.username,
+                    cwd: `/${answers.username}`,
+                    token: data.token,
+                    uuid: profileUUID,
+                };
+                this.addProfile(profile);
+                this.selectProfile(profile);
+                if (spinner) {
+                    spinner.succeed(chalk.green('Successfully logged in to Puter!'));
+                }
+                console.log(chalk.dim(`Token: ${data.token.slice(0, 5)}...${data.token.slice(-5)}`));
+                // Save token
+                if (args.save) {
+                    const localEnvFile = '.env';
+                    try {
+                        // Check if the file exists, if so then delete it before writing.
+                        if (fs.existsSync(localEnvFile)) {
+                            console.log(chalk.yellow(`File "${localEnvFile}" already exists... Adding token.`));
+                            fs.appendFileSync(localEnvFile, `\nPUTER_API_KEY="${data.token}"`, 'utf8');
+                        } else {
+                            console.log(chalk.cyan(`Saving token to ${chalk.green(localEnvFile)} file.`));
+                            fs.writeFileSync(localEnvFile, `PUTER_API_KEY="${data.token}"`, 'utf8');
+                        }
+                    } catch (error) {
+                        console.error(chalk.red(`Cannot save token to .env file. Error: ${error.message}`));
+                        console.log(chalk.cyan(`PUTER_API_KEY="${data.token}"`));
+                    }
+                }
+            } else {
+                spinner.fail(chalk.red('Login failed. Please check your credentials.'));
+            }
+        } catch (error) {
+            if (spinner) {
+                spinner.fail(chalk.red(`Failed to login: ${error.message}`));
+                console.log(error);
+            } else {
+                console.error(chalk.red(`Failed to login: ${error.message}`));
+            }
+        }
+    }
+}
+
+export default ({ context }) => {
+    const module = new ProfileModule({ context });
+    context[ProfileAPI] = module;
+};

package/src/modules/SetContextModule.js

@@ -0,0 +1,5 @@
+import { set_context } from "../temporary/context_helpers.js";
+
+export default ({ context }) => {
+    set_context(context);
+};

package/src/temporary/context_helpers.js

@@ -0,0 +1,17 @@
+/**
+ * Ideally we would always get a context from the caller, but in some places
+ * this is not possible without creating a large number of changes
+ * (and therefore also a large number of new bugs). This temporary file
+ * provides a way to get the context that modules get.
+ */
+
+let context;
+
+// This is called by (list all callers so we can keep track):
+// - auth.js:getAuthToken
+export const get_context = () => {
+    return context;
+};
+
+// This is called by SetContextModule
+export const set_context = ctx => context = ctx;

package/tests/login.test.js

@@ -7,6 +7,8 @@ import chalk from 'chalk';
 import fetch from 'node-fetch';
 import Conf from 'conf';
 import { BASE_URL, PROJECT_NAME, API_BASE } from '../src/commons.js';
+import { ProfileAPI } from '../src/modules/ProfileModule.js';
+import * as contextHelpers from '../src/temporary/context_helpers.js';
 
 // Mock console to prevent actual logging
 vi.spyOn(console, 'log').mockImplementation(() => {});
@@ -49,68 +51,38 @@ vi.mock('conf', () => {
   };
 });
 
-describe('auth.js', () => {
-  // let config;
+const mockProfileModule = {
+  switchProfileWizard: vi.fn(),
+  getAuthToken: vi.fn(),
+  getCurrentProfile: vi.fn(),
+};
+
+const mockContext = {
+  [ProfileAPI]: mockProfileModule,
+};
 
+vi.spyOn(contextHelpers, 'get_context').mockReturnValue(mockContext);
+
+
+describe('auth.js', () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    // config = new Conf({ projectName: PROJECT_NAME });
   });
 
   describe('login', () => {
     it('should login successfully with valid credentials', async () => {
-      // Mock inquirer response
-      inquirer.prompt.mockResolvedValue({ 
-        username: 'testuser', 
-        password: 'testpass' 
-      });
-
-      // Mock fetch response
-      fetch.mockResolvedValue({
-        json: () => Promise.resolve({ 
-          proceed: true, 
-          token: 'testtoken' 
-        })
-      });
-      
-      await login();
-
-      // Verify inquirer was called
-      expect(inquirer.prompt).toHaveBeenCalled();
-
-      // Verify fetch was called with correct parameters
-      expect(fetch).toHaveBeenCalledWith(`${BASE_URL}/login`, {
-        method: 'POST',
-        headers: expect.any(Object),
-        body: JSON.stringify({ 
-          username: 'testuser', 
-          password: 'testpass' 
-        }),
-      });
-
-      // Verify spinner methods were called
-      expect(mockSpinner.start).toHaveBeenCalled();
-      expect(mockSpinner.succeed).toHaveBeenCalled();
+      await login({}, mockContext);
+      expect(mockProfileModule.switchProfileWizard).toHaveBeenCalled();
     });
 
     it('should fail login with invalid credentials', async () => {
-      inquirer.prompt.mockResolvedValue({ username: 'testuser', password: 'testpass' });
-      fetch.mockResolvedValue({
-        json: vi.fn().mockResolvedValue({ proceed: false }),
-        ok: true,
-      });
-
-      await login();
-      expect(mockSpinner.fail).toHaveBeenCalledWith(chalk.red('Login failed. Please check your credentials.'));
+      mockProfileModule.switchProfileWizard.mockRejectedValue(new Error('Invalid credentials'));
+      await expect(login({}, mockContext)).rejects.toThrow('Invalid credentials');
+      expect(mockProfileModule.switchProfileWizard).toHaveBeenCalled();
     });
 
     it.skip('should handle login error', async () => {
-      inquirer.prompt.mockResolvedValue({ username: 'testuser', password: 'testpass' });
-      fetch.mockRejectedValue(new Error('Network error'));
-
-      // await expect(login()).rejects.toThrow('Network error');
-      expect(mockSpinner.fail).toHaveBeenCalledWith(chalk.red('Failed to login'));
-      // expect(console.error).toHaveBeenCalledWith(chalk.red('Error: Network error'));
+      // This test needs to be updated to reflect the new login flow
     });
   });
 
@@ -121,34 +93,20 @@ describe('auth.js', () => {
     beforeEach(() => {
       vi.clearAllMocks();
       config = new Conf({ projectName: PROJECT_NAME });
-      // config.clear = vi.fn();      
     });
 
     it.skip('should logout successfully', async () => {
-      // Mock config.get to return a token
-      config.get = vi.fn().mockReturnValue('testtoken');
-      await logout();
-      // Verify config.clear was called
-      expect(config.clear).toHaveBeenCalled();
-      expect(mockSpinner.succeed).toHaveBeenCalledWith(chalk.green('Successfully logged out from Puter!'));
+      // This test needs to be updated to reflect the new login flow
     });
 
     it('should handle already logged out', async () => {
       config.get = vi.fn().mockReturnValue(null);
-
       await logout();
-
       expect(mockSpinner.info).toHaveBeenCalledWith(chalk.yellow('Already logged out'));
     });
 
     it.skip('should handle logout error', async () => {
-      config.get = vi.fn().mockReturnValue('testtoken');
-      config.clear = vi.fn().mockImplementation(() => { throw new Error('Config error'); });
-
-      await logout();
-
-      expect(mockSpinner.fail).toHaveBeenCalled();
-      expect(mockSpinner.fail).toHaveBeenCalledWith(chalk.red('Failed to logout'));
+      // This test needs to be updated to reflect the new login flow
     });
     
   });
@@ -156,23 +114,16 @@ describe('auth.js', () => {
 
   describe('getUserInfo', () => {
     it('should fetch user info successfully', async () => {
-      // Mock fetch response
+      mockProfileModule.getAuthToken.mockReturnValue('testtoken');
       fetch.mockResolvedValue({
         json: () => Promise.resolve({
           username: 'testuser',
-          uuid: 'testuuid',
-          email: 'test@example.com',
-          email_confirmed: true,
-          is_temp: false,
-          human_readable_age: '1 year',
-          feature_flags: { flag1: true, flag2: false },
         }),
         ok: true,
       });
 
       await getUserInfo();
 
-      // Verify fetch was called with correct parameters
       expect(fetch).toHaveBeenCalledWith(`${API_BASE}/whoami`, {
         method: 'GET',
         headers: expect.any(Object),
@@ -180,86 +131,40 @@ describe('auth.js', () => {
     });
 
     it('should handle fetch user info error', async () => {
-      // Mock fetch to throw an error
+      mockProfileModule.getAuthToken.mockReturnValue('testtoken');
       fetch.mockRejectedValue(new Error('Network error'));
-
       await getUserInfo();
-
-      // Verify console.error was called
-      expect(console.error).toHaveBeenCalledWith(chalk.red('Failed to get user info.\nError: Network error'));
+      expect(console.error).toHaveBeenCalledWith(expect.stringContaining('Failed to get user info.'));
     });
   });
 
 
   describe('Authentication', () => {
-    let config;
-
-    beforeEach(() => {
-      vi.clearAllMocks();
-      config = new Conf({ projectName: PROJECT_NAME });
-    });
-
     it('should return false if auth token does not exist', () => {
-      config.get.mockReturnValue(null);
-
+      mockProfileModule.getAuthToken.mockReturnValue(null);
       const result = isAuthenticated();
-
       expect(result).toBe(false);
     });
 
     it('should return null if the auth_token is not defined', () => {
-      config.get.mockReturnValue(null);
-
+      mockProfileModule.getAuthToken.mockReturnValue(null);
       const result = getAuthToken();
-
-      expect(result).toBeUndefined();
+      expect(result).toBe(null);
     });
 
     it('should return the current username if it is defined', () => {
-      config.get.mockReturnValue(null);
-
+      mockProfileModule.getCurrentProfile.mockReturnValue({ username: 'testuser' });
       const result = getCurrentUserName();
-
-      expect(result).toBeUndefined();
+      expect(result).toBe('testuser');
     });
 
   });
 
-  // describe('getCurrentDirectory', () => {
-  //   let config;
-
-  //   beforeEach(() => {
-  //     vi.clearAllMocks();
-  //     config = new Conf({ projectName: PROJECT_NAME });
-  //     // config.get = vi.fn().mockReturnValue('testtoken')
-  //   });
-
-  //   it('should return the current directory', () => {
-  //     config.get.mockReturnValue('/testuser');
-
-  //     const result = getCurrentDirectory();
-
-  //     expect(result).toBe('/testuser');
-  //   });
-  // });
-
   describe('getUsageInfo', () => {
     it('should fetch usage info successfully', async () => {
+      mockProfileModule.getAuthToken.mockReturnValue('testtoken');
       fetch.mockResolvedValue({
-        json: vi.fn().mockResolvedValue({
-          user: [
-            {
-              service: { 'driver.interface': 'interface1', 'driver.method': 'method1', 'driver.implementation': 'impl1' },
-              month: 1,
-              year: 2023,
-              monthly_usage: 10,
-              monthly_limit: 100,
-              policy: { 'rate-limit': { max: 5, period: 30000 } },
-            },
-          ],
-          apps: { app1: { used: 5, available: 50 } },
-          usages: [{ name: 'usage1', used: 10, available: 100, refill: 'monthly' }],
-        }),
+        json: vi.fn().mockResolvedValue({}),
         ok: true,
       });
 
@@ -272,11 +177,10 @@ describe('auth.js', () => {
     });
 
     it('should handle fetch usage info error', async () => {
+      mockProfileModule.getAuthToken.mockReturnValue('testtoken');
       fetch.mockRejectedValue(new Error('Network error'));
-
       await getUsageInfo();
-
-      expect(console.error).toHaveBeenCalledWith(chalk.red('Failed to fetch usage information.\nError: Network error'));
+      expect(console.error).toHaveBeenCalledWith(expect.stringContaining('Failed to fetch usage information.'));
     });
   });