mythic-insight/calcom
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fixed bug where null email address could occurr in office365 credential key

Browse source
This commit is contained in:
nicolas 2021-06-07 20:21:38 +02:00
parent 2b84612e5d
commit 27194ef68c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pages/api/integrations/office365calendar/callback.ts
View file

@ -28,7 +28,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
const whoami = await fetch('https://graph.microsoft.com/v1.0/me', { headers: { 'Authorization': 'Bearer ' + responseBody.access_token } }); const whoami = await fetch('https://graph.microsoft.com/v1.0/me', { headers: { 'Authorization': 'Bearer ' + responseBody.access_token } });
const graphUser = await whoami.json(); const graphUser = await whoami.json();
responseBody.email = graphUser.mail; // In some cases, graphUser.mail is null. Then graphUser.userPrincipalName most likely contains the email address.
responseBody.email = graphUser.mail ?? graphUser.userPrincipalName;
responseBody.expiry_date = Math.round((+(new Date()) / 1000) + responseBody.expires_in); // set expiry date in seconds responseBody.expiry_date = Math.round((+(new Date()) / 1000) + responseBody.expires_in); // set expiry date in seconds
delete responseBody.expires_in; delete responseBody.expires_in;