From c733d3bf4dd2eb5dfda36a14fd69e2fc7554ef89 Mon Sep 17 00:00:00 2001
From: Dream Hunter <dreamhunter2333@gmail.com>
Date: Sun, 11 Aug 2024 19:29:49 +0800
Subject: [PATCH] fix: get user role before all requests (#393)

---
 .github/workflows/pr_agent.yml | 1 -
 CHANGELOG.md                   | 4 ++++
 frontend/src/App.vue           | 9 ++++++++-
 frontend/src/views/Header.vue  | 9 +++------
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/pr_agent.yml b/.github/workflows/pr_agent.yml
index ad7b727b..aa294ab1 100644
--- a/.github/workflows/pr_agent.yml
+++ b/.github/workflows/pr_agent.yml
@@ -3,7 +3,6 @@ name: Codium PR Agent
 on:
   pull_request:
     types: [opened, reopened, ready_for_review]
-  issue_comment:
 jobs:
   pr_agent_job:
     if: ${{ github.event.sender.type != 'Bot' }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdf120e8..dfc2c3f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 <!-- markdownlint-disable-file MD004 MD024 MD034 MD036 -->
 # CHANGE LOG
 
+## main(v0.7.1)
+
+- fix: 修复用户角色加载失败的问题
+
 ## v0.7.0
 
 ### Breaking Changes
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9edf4184..25880049 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -6,7 +6,7 @@ import { useGlobalState } from './store'
 import { useIsMobile } from './utils/composables'
 import Header from './views/Header.vue';
 import Footer from './views/Footer.vue';
-
+import { api } from './api'
 
 const {
   isDark, loading, useSideMargin, telegramApp, isTelegram
@@ -19,6 +19,13 @@ const showSideMargin = computed(() => !isMobile.value && useSideMargin.value);
 
 
 onMounted(async () => {
+
+  try {
+    await api.getUserSettings();
+  } catch (error) {
+    console.error(error);
+  }
+
   const token = import.meta.env.VITE_CF_WEB_ANALY_TOKEN;
 
   const exist = document.querySelector('script[src="https://static.cloudflareinsights.com/beacon.min.js"]') !== null
diff --git a/frontend/src/views/Header.vue b/frontend/src/views/Header.vue
index f5cfc8dd..83e44924 100644
--- a/frontend/src/views/Header.vue
+++ b/frontend/src/views/Header.vue
@@ -18,7 +18,7 @@ const message = useMessage()
 
 const {
     toggleDark, isDark, isTelegram, showAdminPage,
-    showAuth, auth, loading, openSettings
+    showAuth, auth, loading, openSettings, userSettings
 } = useGlobalState()
 const route = useRoute()
 const router = useRouter()
@@ -224,11 +224,8 @@ const logoClick = async () => {
 
 onMounted(async () => {
     await api.getOpenSettings(message);
-    try {
-        await api.getUserSettings(message);
-    } catch (error) {
-        console.error(error);
-    }
+    // make sure user_id is fetched
+    if (!userSettings.value.user_id) await api.getUserSettings(message);
 });
 </script>