Skip to content

fix: handle missing device auth token during session hydration #808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
msivasubramaniaan wants to merge 3 commits into
base: main
Choose a base branch
from
+55 −38
Open

fix: handle missing device auth token during session hydration #808

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b30c1bd
fix: handle missing device auth token during session hydration
msivasubramaniaan Sep 12, 2026
5e9601a
fixed coderabbit review
msivasubramaniaan Sep 12, 2026
ae7bfe3
Merge branch 'main' into github-auth-hydration-regression
msivasubramaniaan Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 55 additions & 38 deletions code/extensions/che-github-authentication/src/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,27 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {

let sessions = await this.sessionsPromise;

const isDeviceAuthToken = await this.githubService.isDeviceAuthToken();
const isDeviceAuthToken = await this.getDeviceAuthState();
let deviceAuthSessionIds = await this.getDeviceAuthSessionIds();

if (isDeviceAuthToken && sessions.length > 0) {
const currentToken = await this.githubService.getToken();
if (isDeviceAuthToken === true && sessions.length > 0) {
try{
const currentToken = await this.githubService.getToken();

const currentDeviceAuthSessions = sessions
.filter((session) => session.accessToken === currentToken)
.map((session) => session.id);
const currentDeviceAuthSessions = sessions
.filter((session) => session.accessToken === currentToken)
.map((session) => session.id);

const updatedDeviceAuthSessionIds = [
...new Set([...deviceAuthSessionIds, ...currentDeviceAuthSessions]),
];
const updatedDeviceAuthSessionIds = [
...new Set([...deviceAuthSessionIds, ...currentDeviceAuthSessions]),
];

if (updatedDeviceAuthSessionIds.length !== deviceAuthSessionIds.length) {
await this.storeDeviceAuthSessionIds(updatedDeviceAuthSessionIds);
deviceAuthSessionIds = updatedDeviceAuthSessionIds;
if (updatedDeviceAuthSessionIds.length !== deviceAuthSessionIds.length) {
await this.storeDeviceAuthSessionIds(updatedDeviceAuthSessionIds);
deviceAuthSessionIds = updatedDeviceAuthSessionIds;
}
} catch (error) {
this.logger.warn(`GitHubAuthProvider: unable to retrieve current Device Authentication token: ${(error as Error).message}`);
}
}

Expand All @@ -111,7 +115,7 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
* If Device Authentication is no longer active, remove only
* the sessions that were previously created using Device Authentication.
*/
if (!isDeviceAuthToken && deviceAuthSessionIds.length > 0) {
if (isDeviceAuthToken === false && deviceAuthSessionIds.length > 0) {
const removed = sessions.filter((session) =>
deviceAuthSessionIds.includes(session.id),
);
Expand Down Expand Up @@ -169,7 +173,16 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
}
}

const token = await this.githubService.getToken();
let token: string;
try {
token = await this.githubService.getToken();
} catch (error) {
this.logger.info(
`GitHubAuthProvider: no GitHub token available during hydration: ${(error as Error).message}`,
);
return;
}

const hydratedSessions = await this.doHydrateWithToken(token);

if (isDeviceAuthToken && hydratedSessions.length > 0) {
Expand Down Expand Up @@ -328,18 +341,7 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
scopes,
};

const isDeviceAuth = await this.githubService.isDeviceAuthToken();
if (isDeviceAuth) {
const deviceAuthSessionIds = await this.getDeviceAuthSessionIds();

if (!deviceAuthSessionIds.includes(session.id)) {
await this.storeDeviceAuthSessionIds([
...deviceAuthSessionIds,
session.id,
]);
}
}

const isDeviceAuth = await this.getDeviceAuthState();
Comment thread
coderabbitai[bot] marked this conversation as resolved.
const sessionIndex = sessions.findIndex(s => sessionMatchesRequestedScopes(s.scopes, sortedScopes));
const removed: vscode.AuthenticationSession[] = [];
const updatedSessions = [...sessions];
Expand All @@ -351,20 +353,20 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {

await this.storeSessions(updatedSessions);
if (isDeviceAuth) {
const deviceAuthSessionIds = await this.getDeviceAuthSessionIds();
try {
const deviceAuthSessionIds = await this.getDeviceAuthSessionIds();

if (!deviceAuthSessionIds.includes(session.id)) {
try {
if (!deviceAuthSessionIds.includes(session.id)) {
await this.storeDeviceAuthSessionIds([
...deviceAuthSessionIds,
session.id,
]);
} catch (error) {
// Roll back the session because its Device Authentication
// tracking ID could not be persisted.
await this.storeSessions(sessions);
throw error;
}
} catch (error) {
// Roll back the session because its Device Authentication
// tracking ID could not be persisted.
await this.storeSessions(sessions);
throw error;
}
}

Expand All @@ -391,8 +393,8 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
return undefined;
}

const isDeviceAuth = await this.githubService.isDeviceAuthToken();
if (!isDeviceAuth) {
const isDeviceAuth = await this.getDeviceAuthState();
if (isDeviceAuth === false) {
const sessions = await this.sessionsPromise;
const hasExistingSession = sessions.some(s =>
sessionMatchesRequestedScopes(s.scopes, sortedScopes)
Expand Down Expand Up @@ -444,8 +446,8 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
return;
}

const isDeviceAuth = await this.githubService.isDeviceAuthToken();
if (!isDeviceAuth) {
const isDeviceAuth = await this.getDeviceAuthState();
if (isDeviceAuth === false) {
Comment thread
msivasubramaniaan marked this conversation as resolved.
this.logger.info('GitHubAuthProvider: skipping session clearing, existing sessions are from K8s token');
return;
}
Expand Down Expand Up @@ -496,4 +498,19 @@ export class GitHubAuthProvider implements vscode.AuthenticationProvider {
this.logger.warn(`GitHubAuthProvider: session for removing not found`);
}
}

private async getDeviceAuthState(): Promise<boolean | undefined> {
try {
return await this.githubService.isDeviceAuthToken();
} catch (error) {
this.logger.warn(
`GitHubAuthProvider: unable to determine Device Authentication state: ${
(error as Error).message
}`,
);

return undefined;
}
}

}