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

fixed zoom video not creating when credentials are not valid (#1329)

Browse source 
* fixed nextcloud

* fixed nextcloud & fastmail issues

* fixed zoom video not creating when credentials are not valid
also fixed reponse to reflect create failure.

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Nathaniel 2021-12-23 04:38:24 +08:00 committed by GitHub
parent 9d7dc09974
commit 3761a75b28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/integrations/Zoom/ZoomVideoApiAdapter.ts
View file

@ -69,7 +69,8 @@ interface ZoomToken {
const zoomAuth = (credential: Credential) => { const zoomAuth = (credential: Credential) => {
const credentialKey = credential.key as unknown as ZoomToken; const credentialKey = credential.key as unknown as ZoomToken;
const isExpired = (expiryDate: number) => expiryDate < Date.now(); const isTokenValid = (token: ZoomToken) =>
token && token.token_type && token.access_token && (token.expires_in || token.expiry_date) < Date.now();
const authHeader = const authHeader =
"Basic " + "Basic " +
Buffer.from(process.env.ZOOM_CLIENT_ID + ":" + process.env.ZOOM_CLIENT_SECRET).toString("base64"); Buffer.from(process.env.ZOOM_CLIENT_ID + ":" + process.env.ZOOM_CLIENT_SECRET).toString("base64");
@ -107,7 +108,7 @@ const zoomAuth = (credential: Credential) => {
return { return {
getToken: () => getToken: () =>
!isExpired(credentialKey.expires_in || credentialKey.expiry_date) !isTokenValid(credentialKey)
? Promise.resolve(credentialKey.access_token) ? Promise.resolve(credentialKey.access_token)
: refreshAccessToken(credentialKey.refresh_token), : refreshAccessToken(credentialKey.refresh_token),
}; };

7
lib/videoClient.ts
View file

@ -68,19 +68,16 @@ const createMeeting = async (
); );
} }
let success = true;
const videoAdapters = getVideoAdapters([credential]); const videoAdapters = getVideoAdapters([credential]);
const [firstVideoAdapter] = videoAdapters; const [firstVideoAdapter] = videoAdapters;
const createdMeeting = await firstVideoAdapter.createMeeting(calEvent).catch((e) => { const createdMeeting = await firstVideoAdapter.createMeeting(calEvent).catch((e) => {
log.error("createMeeting failed", e, calEvent); log.error("createMeeting failed", e, calEvent);
success = false;
}); });
if (!createdMeeting) { if (!createdMeeting) {
return { return {
type: credential.type, type: credential.type,
success, success: false,
uid, uid,
originalEvent: calEvent, originalEvent: calEvent,
}; };
@ -88,7 +85,7 @@ const createMeeting = async (
return { return {
type: credential.type, type: credential.type,
success, success: true,
uid, uid,
createdEvent: createdMeeting, createdEvent: createdMeeting,
originalEvent: calEvent, originalEvent: calEvent,