feat: get meta only when login

OI-wiki · Sep 30, 2024 · a104745 · a104745
1 parent cd19c93
commit a104745
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/frontend/lib/auth.ts b/frontend/lib/auth.ts
@@ -1,9 +1,7 @@
 import { GitHubMeta, JWTPayload } from "./types";
 import { apiEndpoint } from "./const";
 
-export let githubMeta: GitHubMeta;
-
-export const fetchGitHubMeta = async () => {
+export const fetchGitHubMeta = async (): Promise<GitHubMeta> => {
   const res = await fetch(`${apiEndpoint}meta/github-app`, {
     method: "GET",
   });
@@ -12,7 +10,7 @@ export const fetchGitHubMeta = async () => {
     throw res;
   }
 
-  if (!githubMeta) githubMeta = (await res.json()).data;
+  return (await res.json()).data;
 };
 
 export const handleOAuthToken = () => {

diff --git a/frontend/lib/dom/comment.ts b/frontend/lib/dom/comment.ts
@@ -4,7 +4,7 @@ import iconEdit from "iconify/edit";
 import iconDelete from "iconify/delete";
 import iconInfoOutlineRounded from "iconify/info-outline-rounded";
 import { Comment } from "../types";
-import { getJWT, decodeJWT, logout, githubMeta } from "../auth";
+import { getJWT, decodeJWT, logout, fetchGitHubMeta } from "../auth";
 import { apiEndpoint } from "../const";
 import { groupBy, dateTimeFormatter } from "../util";
 
@@ -691,10 +691,7 @@ export const renderComments = async (comments: Comment[]) => {
             break;
           }
           case "login": {
-            if (!githubMeta) {
-              console.log("githubMeta not ready");
-              return;
-            }
+            const githubMeta = await fetchGitHubMeta();
             window.location.href = `https://github.com/login/oauth/authorize?client_id=${githubMeta.client_id}&state=${encodeURIComponent(JSON.stringify({ redirect: window.location.href }))}`;
             break;
           }

diff --git a/frontend/lib/main.ts b/frontend/lib/main.ts
@@ -2,7 +2,7 @@ import "./style.css";
 import iconComment from "iconify/comment-outline-rounded";
 import iconClose from "iconify/close";
 import { setApiEndpoint } from "./const";
-import { fetchGitHubMeta, handleOAuthToken } from "./auth";
+import { handleOAuthToken } from "./auth";
 import {
   closeContextMenu,
   createContextMenu,
@@ -71,7 +71,6 @@ export function setupReview(
   resetCommentsCache();
 
   updateAvailableComments();
-  fetchGitHubMeta();
 
   if (globalInitialized) {
     closeCommentsPanel();