From 0baab50df199ab0cfe30d287c73c979744b802f8 Mon Sep 17 00:00:00 2001
From: fangyunong <fangyunogn@ylzinfo.com>
Date: Mon, 7 Jul 2025 12:38:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E5=A4=8DuseLogto=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.ts                       |  6 +----
 src/views/login/OauthCallBack.vue | 44 +++++++++++++++----------------
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index 778adee..cc66531 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -29,11 +29,7 @@ const config: LogtoConfig = {
   endpoint: END_POINT,
   appId: APP_ID,
 };
-app.use(createLogto, {
-  ...config,
-  scopes: ['shopping:read', 'shopping:write', 'store:read', 'store:write'],
-  resources: [import.meta.env.VITE_API_BASE_URL],
-});
+app.use(createLogto, config);
 
 app.use(pinia);
 app.use(router);
diff --git a/src/views/login/OauthCallBack.vue b/src/views/login/OauthCallBack.vue
index 8a62cc0..fe21a64 100644
--- a/src/views/login/OauthCallBack.vue
+++ b/src/views/login/OauthCallBack.vue
@@ -5,35 +5,33 @@
 </template>
 
 <script setup lang="ts">
-import { setToken } from '@/utils/auth';
+import { removeToken, setToken } from '@/utils/auth';
 import { useLogto } from '@logto/vue';
 import { useMessage } from 'naive-ui';
 import { isNewUser, getUserInfo } from '@/api/userApi';
-const { isAuthenticated, getAccessToken } = useLogto();
+const { getAccessToken } = useLogto();
 const router = useRouter();
 const message = useMessage();
-watch(() => isAuthenticated.value, (newVal) => {
-  if (newVal) {
-    (async () => {
-      try {
-        const accessToken = await getAccessToken(import.meta.env.VITE_API_BASE_URL);
-        console.log(accessToken);
-        setToken(accessToken);
-        const isCompleteInfo = await isNewUser(); //表示是否完成信息登记 true表示完成
-        if (!isCompleteInfo) return router.push('/register');
-        const result = await getUserInfo();
-        console.log(result, 'result'); //后面userInfo要存到store里面
-        //TODO
-        message.success('登录成功！');
-        router.push('/layout');
-      } catch (error) {
-        router.push('/');
-        message.error(error.message);
-      }
-    })();
+const init = async () => {
+  try {
+    const accessToken = await getAccessToken(import.meta.env.VITE_API_BASE_URL);
+    console.log(accessToken);
+    setToken(accessToken);
+    const isCompleteInfo = await isNewUser(); //表示是否完成信息登记 true表示完成
+    if (!isCompleteInfo) return router.push('/register');
+    const result = await getUserInfo();
+    console.log(result, 'result'); //后面userInfo要存到store里面
+    //TODO
+    message.success('登录成功！');
+    router.push('/layout');
+  } catch (error) {
+    removeToken();
+    router.push('/');
+    message.error(error.message);
   }
-},{
-  immediate:true
+}
+onMounted(() => {
+  init()
 })
 </script>