maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If no expiry date then refresh the token (#7805)

This commit is contained in:
Joe Au-Yeung 2023-03-17 13:20:41 -04:00 committed by GitHub
parent 9ba13a3f3c
commit 13577a5dbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/app-store/office365calendar/lib/CalendarService.ts
View File

@ -210,7 +210,13 @@ export default class Office365CalendarService implements Calendar {
}
private o365Auth = (credential: CredentialPayload) => {
const isExpired = (expiryDate: number) => expiryDate < Math.round(+new Date() / 1000);
const isExpired = (expiryDate: number) => {
if (!expiryDate) {
return true;
} else {
return expiryDate < Math.round(+new Date() / 1000);
}
};
const o365AuthCredentials = credential.key as O365AuthCredentials;
const refreshAccessToken = async (refreshToken: string) => {
@ -240,7 +246,7 @@ export default class Office365CalendarService implements Calendar {
return {
getToken: () =>
!isExpired(o365AuthCredentials.expiry_date)
!isExpired(o365AuthCredentials.expires_in)
? Promise.resolve(o365AuthCredentials.access_token)
: refreshAccessToken(o365AuthCredentials.refresh_token),
};

2
packages/app-store/office365calendar/types/Office365Calendar.ts
View File

@ -1,5 +1,5 @@
export type O365AuthCredentials = {
expiry_date: number;
access_token: string;
refresh_token: string;
expires_in: number;
};