From 6aa2cba3cea75ec8350034e293adfdc0afd76b7e Mon Sep 17 00:00:00 2001
From: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date: Mon, 23 Jan 2023 17:36:24 -0500
Subject: [PATCH] Msteams access token refresh (#6607)

* Add is valid call

* WIP

* Change logic for Microsoft refresh token

* remove async
---
 .../app-store/office365video/lib/VideoApiAdapter.ts   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/app-store/office365video/lib/VideoApiAdapter.ts b/packages/app-store/office365video/lib/VideoApiAdapter.ts
index 24cf6d8fcc..9c59d395dc 100644
--- a/packages/app-store/office365video/lib/VideoApiAdapter.ts
+++ b/packages/app-store/office365video/lib/VideoApiAdapter.ts
@@ -52,7 +52,7 @@ const o365Auth = async (credential: CredentialPayload) => {
   if (!client_id) throw new HttpError({ statusCode: 400, message: "MS teams client_id missing." });
   if (!client_secret) throw new HttpError({ statusCode: 400, message: "MS teams client_secret missing." });
 
-  const isExpired = (expiryDate: number) => expiryDate < Math.round(+new Date() / 1000);
+  const isExpired = (expiryDate: number) => expiryDate < Math.round(+new Date());
 
   const o365AuthCredentials = credential.key as unknown as O365AuthCredentials;
 
@@ -69,9 +69,10 @@ const o365Auth = async (credential: CredentialPayload) => {
     });
 
     const responseBody = await handleErrorsJson<ITokenResponse>(response);
+
     if (responseBody?.error) {
       console.error(responseBody);
-      throw new HttpError({ statusCode: 500, message: "Error contacting MS Teams" });
+      throw new HttpError({ statusCode: 500, message: `Error contacting MS Teams: ${responseBody.error}` });
     }
     // set expiry date as offset from current time.
     responseBody.expiry_date = Math.round(Date.now() + (responseBody?.expires_in || 0) * 1000);
@@ -93,9 +94,9 @@ const o365Auth = async (credential: CredentialPayload) => {
 
   return {
     getToken: () =>
-      !isExpired(o365AuthCredentials.expiry_date)
-        ? Promise.resolve(o365AuthCredentials.access_token)
-        : refreshAccessToken(o365AuthCredentials.refresh_token),
+      isExpired(o365AuthCredentials.expiry_date)
+        ? refreshAccessToken(o365AuthCredentials.refresh_token)
+        : Promise.resolve(o365AuthCredentials.access_token),
   };
 };