CLI: Implement auth status command

cli/commands/auth/login.ts

@@ -1,5 +1,6 @@
-import { password } from '@inquirer/prompts';
+import { input } from '@inquirer/prompts';
 import { __, sprintf } from '@wordpress/i18n';
+import { DEFAULT_TOKEN_LIFETIME_MS } from 'common/constants';
 import { getAuthenticationUrl } from 'common/lib/oauth';
 import { AuthCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { getUserInfo } from 'cli/lib/api';
@@ -50,38 +51,40 @@ export async function runCommand(): Promise< void > {
 	);
 	console.log( '' );
 
-	try {
-		const accessToken = await password( { message: __( 'Authentication token:' ) } );
-		const user = await getUserInfo( accessToken );
+	let accessToken: Awaited< ReturnType< typeof input > >;
+	let user: Awaited< ReturnType< typeof getUserInfo > >;
 
+	try {
+		accessToken = await input( { message: __( 'Authentication token:' ) } );
+		user = await getUserInfo( accessToken );
 		logger.reportSuccess( __( 'Authentication completed successfully!' ) );
+	} catch ( error ) {
+		logger.reportError( new LoggerError( __( 'Authentication failed. Please try again.' ) ) );
+		return;
+	}
 
-		try {
-			await lockAppdata();
-			const userData = await readAppdata();
-
-			const now = new Date();
-			const twoWeeksInSeconds = 2 * 7 * 24 * 60 * 60;
+	try {
+		await lockAppdata();
+		const userData = await readAppdata();
 
-			userData.authToken = {
-				accessToken,
-				id: user.ID,
-				email: user.email,
-				displayName: user.display_name,
-				expiresIn: twoWeeksInSeconds,
-				expirationTime: now.getTime() + twoWeeksInSeconds * 1000,
-			};
+		userData.authToken = {
+			accessToken,
+			id: user.ID,
+			email: user.email,
+			displayName: user.display_name,
+			expiresIn: DEFAULT_TOKEN_LIFETIME_MS / 1000,
+			expirationTime: Date.now() + DEFAULT_TOKEN_LIFETIME_MS,
+		};
 
-			await saveAppdata( userData );
-		} finally {
-			await unlockAppdata();
-		}
+		await saveAppdata( userData );
 	} catch ( error ) {
 		if ( error instanceof LoggerError ) {
 			logger.reportError( error );
 		} else {
 			logger.reportError( new LoggerError( __( 'Authentication failed' ), error ) );
 		}
+	} finally {
+		await unlockAppdata();
 	}
 }
 

cli/commands/auth/tests/login.test.ts

@@ -1,4 +1,4 @@
-import { password } from '@inquirer/prompts';
+import { input } from '@inquirer/prompts';
 import { getAuthenticationUrl } from 'common/lib/oauth';
 import { getUserInfo } from 'cli/lib/api';
 import {
@@ -15,14 +15,7 @@ import { Logger, LoggerError } from 'cli/logger';
 jest.mock( '@inquirer/prompts' );
 jest.mock( 'common/lib/oauth' );
 jest.mock( 'cli/lib/api' );
-jest.mock( 'cli/lib/appdata', () => ( {
-	...jest.requireActual( 'cli/lib/appdata' ),
-	lockAppdata: jest.fn(),
-	readAppdata: jest.fn(),
-	saveAppdata: jest.fn(),
-	unlockAppdata: jest.fn(),
-	getAuthToken: jest.fn(),
-} ) );
+jest.mock( 'cli/lib/appdata' );
 jest.mock( 'cli/lib/browser' );
 jest.mock( 'cli/lib/i18n' );
 jest.mock( 'cli/logger' );
@@ -68,7 +61,7 @@ describe( 'Auth Login Command', () => {
 		( getAppLocale as jest.Mock ).mockResolvedValue( 'en' );
 		( getUserInfo as jest.Mock ).mockResolvedValue( mockUserData );
 		( openBrowser as jest.Mock ).mockResolvedValue( undefined );
-		( password as jest.Mock ).mockResolvedValue( mockAccessToken );
+		( input as jest.Mock ).mockResolvedValue( mockAccessToken );
 		( readAppdata as jest.Mock ).mockResolvedValue( mockAppdata );
 		( getAuthToken as jest.Mock ).mockRejectedValue( new Error( 'Mock error' ) );
 		( lockAppdata as jest.Mock ).mockResolvedValue( undefined );
@@ -87,7 +80,7 @@ describe( 'Auth Login Command', () => {
 		await runCommand();
 
 		expect( openBrowser ).not.toHaveBeenCalled();
-		expect( password ).not.toHaveBeenCalled();
+		expect( input ).not.toHaveBeenCalled();
 	} );
 
 	it( 'should complete the login process successfully', async () => {
@@ -99,7 +92,7 @@ describe( 'Auth Login Command', () => {
 			'https://developer.wordpress.com/copy-oauth-token'
 		);
 		expect( openBrowser ).toHaveBeenCalledWith( mockAuthUrl );
-		expect( password ).toHaveBeenCalledWith( {
+		expect( input ).toHaveBeenCalledWith( {
 			message: 'Authentication token:',
 		} );
 		expect( getUserInfo ).toHaveBeenCalledWith( mockAccessToken );
@@ -122,7 +115,7 @@ describe( 'Auth Login Command', () => {
 		await runCommand();
 
 		expect( openBrowser ).toHaveBeenCalled();
-		expect( password ).toHaveBeenCalled();
+		expect( input ).toHaveBeenCalled();
 	} );
 
 	it( 'should handle browser open failure', async () => {
@@ -132,7 +125,7 @@ describe( 'Auth Login Command', () => {
 		const { runCommand } = await import( '../login' );
 		await runCommand();
 
-		expect( password ).toHaveBeenCalled();
+		expect( input ).toHaveBeenCalled();
 	} );
 
 	it( 'should handle API error when fetching user info', async () => {

common/constants.ts

@@ -7,6 +7,7 @@ export const DAY_MS = HOUR_MS * 24;
 // OAuth constants
 export const CLIENT_ID = '95109';
 export const PROTOCOL_PREFIX = 'wpcom-local-dev';
+export const DEFAULT_TOKEN_LIFETIME_MS = DAY_MS * 14;
 
 export const LOCKFILE_NAME = 'appdata-v1.json.lock';
 export const LOCKFILE_STALE_TIME = 5000;

common/logger-actions.ts

@@ -3,7 +3,6 @@
 
 export enum AuthCommandLoggerAction {
 	LOGIN = 'login',
-	LOGOUT = 'logout',
 }
 
 export enum PreviewCommandLoggerAction {