refresh more often based on clock skew

TylerLeonhardt · TylerLeonhardt · commit f8b17200c131 · 2021-11-11T14:24:44.000-08:00
diff --git a/extensions/microsoft-authentication/src/AADHelper.ts b/extensions/microsoft-authentication/src/AADHelper.ts
@@ -45,6 +45,7 @@ interface ITokenClaims {
 	tid: string;
 	email?: string;
 	unique_name?: string;
+	exp?: number;
 	preferred_username?: string;
 	oid?: string;
 	altsecid?: string;
@@ -182,6 +183,7 @@ export class AzureActiveDirectoryService {
 			};
 		});
 
+		Logger.trace('storing data into keychain...');
 		await this._keychain.setToken(JSON.stringify(serializedData));
 	}
 
@@ -537,7 +539,8 @@ export class AzureActiveDirectoryService {
 						onDidChangeSessions.fire({ added: [], removed: [this.convertToSessionSync(token)], changed: [] });
 					}
 				}
-			}, 1000 * (token.expiresIn - 30)));
+				// For details on why this is set to 2/3... see https://github.com/microsoft/vscode/issues/133201#issuecomment-966668197
+			}, 1000 * (token.expiresIn * 2 / 3)));
 		}
 
 		await this.storeTokenData();

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ interface ITokenClaims {`
`45`	`45`	`tid: string;`
`46`	`46`	`email?: string;`
`47`	`47`	`unique_name?: string;`
	`48`	`+ exp?: number;`
`48`	`49`	`preferred_username?: string;`
`49`	`50`	`oid?: string;`
`50`	`51`	`altsecid?: string;`
`@@ -182,6 +183,7 @@ export class AzureActiveDirectoryService {`
`182`	`183`	`};`
`183`	`184`	`});`
`184`	`185`
	`186`	`+ Logger.trace('storing data into keychain...');`
`185`	`187`	`await this._keychain.setToken(JSON.stringify(serializedData));`
`186`	`188`	`}`
`187`	`189`
`@@ -537,7 +539,8 @@ export class AzureActiveDirectoryService {`
`537`	`539`	`onDidChangeSessions.fire({ added: [], removed: [this.convertToSessionSync(token)], changed: [] });`
`538`	`540`	`}`
`539`	`541`	`}`
`540`		`- }, 1000 * (token.expiresIn - 30)));`
	`542`	`+ // For details on why this is set to 2/3... see https://github.com/microsoft/vscode/issues/133201#issuecomment-966668197`
	`543`	`+ }, 1000 * (token.expiresIn * 2 / 3)));`
`541`	`544`	`}`
`542`	`545`
`543`	`546`	`await this.storeTokenData();`