fix: token validation

Author: Seldszar

src/background/index.ts

@@ -14,6 +14,7 @@ import {
   getFollowedStreams,
   request,
   revoke,
+  validate,
 } from "./modules/twitch";
 
 setupSentry();
@@ -24,12 +25,10 @@ async function refresh(withNotifications: boolean) {
   });
 
   if (navigator.onLine) {
-    const accessToken = await stores.accessToken.get();
-
     let currentUser: HelixUser | null = null;
     let followedStreams = new Array<HelixStream>();
 
-    if (accessToken) {
+    if (await validate()) {
       currentUser = await getCurrentUser();
 
       if (currentUser) {

src/background/modules/twitch.ts

@@ -1,4 +1,4 @@
-import { camelCase, castArray, chunk, find, flatMap, get, snakeCase, toString } from "lodash-es";
+import { camelCase, castArray, chunk, find, get, snakeCase, toString } from "lodash-es";
 
 import { allPromises, changeCase, matchString, openUrl, t } from "~/common/helpers";
 import { stores } from "~/common/stores";
@@ -11,7 +11,7 @@ class RequestError extends Error {
     readonly request: Request,
     readonly response: Response,
   ) {
-    super(response.statusText);
+    super(`Request failed with status code ${response.status}: ${request.method} ${request.url}`);
 
     if (Error.captureStackTrace) {
       Error.captureStackTrace(this, RequestError);
@@ -36,7 +36,9 @@ export async function request<T>(
   }
 
   const request = new Request(url, {
-    headers: [["Client-ID", process.env.TWITCH_CLIENT_ID]],
+    headers: {
+      "Client-ID": process.env.TWITCH_CLIENT_ID,
+    },
   });
 
   const accessToken = await stores.accessToken.get();
@@ -47,20 +49,8 @@ export async function request<T>(
 
   const response = await fetch(request);
 
-  switch (response.status) {
-    case 204:
-      return undefined as never;
-
-    case 401: {
-      stores.accessToken.set(null);
-
-      createNotification("authorize", {
-        title: t("notificationTitle_accessExpired"),
-        message: t("notificationMessage_accessExpired"),
-      });
-
-      break;
-    }
+  if (response.status === 204) {
+    return undefined as never;
   }
 
   if (response.ok) {
@@ -89,7 +79,7 @@ export async function getUsersByIds(userIds: string[]) {
     get(await request<HelixUser>("users", { id }), "data"),
   );
 
-  return flatMap(pages);
+  return pages.flat();
 }
 
 export async function getFollowedStreams(userId: string) {
@@ -112,6 +102,31 @@ export async function authorize() {
   return openUrl(url.href, undefined, true);
 }
 
+export async function validate() {
+  const accessToken = await stores.accessToken.get();
+
+  if (accessToken) {
+    const response = await fetch("https://id.twitch.tv/oauth2/validate", {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    });
+
+    if (response.status === 401) {
+      createNotification("authorize", {
+        title: t("notificationTitle_accessExpired"),
+        message: t("notificationMessage_accessExpired"),
+      });
+
+      stores.accessToken.set(null);
+    }
+
+    return response.ok;
+  }
+
+  return false;
+}
+
 export async function revoke() {
   const token = await stores.accessToken.get();