Show token expiration date in options (#8847)

Copilot · fregante · web-flow · commit e20eff542da0 · 2026-01-05T16:00:24.000+07:00
Co-authored-by: Federico &lt;me@fregante.com&gt;
diff --git a/source/github-helpers/github-token.ts b/source/github-helpers/github-token.ts
@@ -94,9 +94,17 @@ function parseTokenScopes(headers: Headers): string[] {
 	return scopes;
 }
 
-export async function getTokenScopes(apiBase: string, personalToken: string): Promise<string[]> {
+type TokenInfo = {
+	scopes: string[];
+	expiration?: string;
+};
+
+export async function getTokenInfo(apiBase: string, personalToken: string): Promise<TokenInfo> {
 	const response = await baseApiFetch({apiBase, token: personalToken, path: ''});
-	return parseTokenScopes(response.headers);
+	return {
+		scopes: parseTokenScopes(response.headers),
+		expiration: response.headers.get('GitHub-Authentication-Token-Expiration') ?? undefined,
+	};
 }
 
 export async function expectTokenScope(scope: string): Promise<void> {
@@ -105,7 +113,7 @@ export async function expectTokenScope(scope: string): Promise<void> {
 		? `${location.origin}/api/v3/`
 		: 'https://api.github.com/';
 
-	const tokenScopes = await getTokenScopes(api, token);
+	const {scopes: tokenScopes} = await getTokenInfo(api, token);
 	if (!tokenScopes.includes(scope)) {
 		throw new Error('The token you provided does not have ' + (tokenScopes.length > 0 ? `the \`${scope}\` scope. It only includes \`${tokenScopes.join(', ')}\`.` : 'any scope. You can change the scope of your token at https://github.com/settings/tokens'));
 	}
diff --git a/source/options/token-validation.tsx b/source/options/token-validation.tsx
@@ -4,9 +4,11 @@ import {$} from 'select-dom/strict.js';
 import {assertError} from 'ts-extras';
 import type {SyncedForm} from 'webext-options-sync-per-domain';
 
-import {getTokenScopes, tokenUser} from '../github-helpers/github-token.js';
+import {getTokenInfo, tokenUser} from '../github-helpers/github-token.js';
 import delay from '../helpers/delay.js';
 
+const rtf = new Intl.RelativeTimeFormat('en', {numeric: 'auto'});
+
 type Status = {
 	error?: true;
 	text?: string;
@@ -57,13 +59,24 @@ async function validateToken(): Promise<void> {
 
 	try {
 		const base = getApiUrl();
-		const [scopes, user] = await Promise.all([
-			getTokenScopes(base, tokenField.value),
+		const [tokenInfo, user] = await Promise.all([
+			getTokenInfo(base, tokenField.value),
 			tokenUser.get(base, tokenField.value),
 		]);
+
+		// Build status message with user and expiration
+		let statusMessage = `👤 @${user}`;
+		if (tokenInfo.expiration) {
+			const msUntilExpiration = new Date(tokenInfo.expiration).getTime() - Date.now();
+			const daysUntilExpiration = Math.ceil(msUntilExpiration / (1000 * 60 * 60 * 24));
+			statusMessage += `, expires ${rtf.format(daysUntilExpiration, 'day')}`;
+		} else {
+			statusMessage += ', no expiration';
+		}
+
 		reportStatus({
-			text: `👤 @${user}`,
-			scopes,
+			text: statusMessage,
+			scopes: tokenInfo.scopes,
 		});
 	} catch (error) {
 		assertError(error);
