feat: 调整了登录的逻辑

src/hooks/useGoLogin.js

@@ -1,5 +1,5 @@
 import { oauthToken, checkUserPhone } from "@/request/api/LoginApi";
-import { loginAuth, bindPhone } from "@/manager/LoginManager";
+import { authLogin, refreshAuthLogin, checkRefreshToken } from "@/manager/LoginManager";
 import { clientId } from "@/constant/base";
 import { getAccessToken, removeAccessToken, setAccessToken } from "../constant/token";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
@@ -10,6 +10,18 @@ export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
 // 登录成功后，返回上一页
 export const goBack = () => uni.navigateBack({ delta: 1 });
 
+// 检测token
+export const checkToken = () => {
+  const token = getAccessToken();
+  return new Promise((resolve) => {
+    if (!token) {
+      goLogin();
+      return;
+    }
+    resolve();
+  });
+};
+
 // 登录逻辑
 export const onLogin = async (e) => {
   console.info("onLogin code: ", e);
@@ -21,8 +33,8 @@ export const onLogin = async (e) => {
       return;
     }
 
-    await loginAuth(e).then(async () => {
-      console.log("loginAuth resolve success");
+    await authLogin(e).then(async () => {
+      console.log("authLogin resolve success");
       // 检查手机号是否绑定
       const checkRes = await checkUserPhone();
       if (checkRes.data) {
@@ -39,7 +51,7 @@ export const onLogin = async (e) => {
 
       // 绑定手机号
       const params = { wechatPhoneCode: code, clientId: clientId };
-      const res = await bindPhone(params);
+      const res = await bindUserPhone(params);
       if (res.data) {
         // 登录成功后，触发登录成功事件
         uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
@@ -53,83 +65,44 @@ export const onLogin = async (e) => {
   });
 };
 
-// 检测token
-export const checkToken = () => {
-  const token = getAccessToken();
-
-  return new Promise((resolve) => {
-    if (!token) {
-      goLogin();
-      return;
-    }
-
-    resolve();
-  });
-};
-
-// 刷新token
-export const refreshToken = () => {
-  let provider = "weixin";
-  let grant_type = "wechat";
-
-  // #ifdef APP-PLUS
-  const systemInfo = uni.getSystemInfoSync();
-  if (systemInfo.platform === "ios") {
-    provider = "apple";
-    grant_type = "apple";
-  }
-  // #endif
-  
+/// 检查手机号登录
+export const onCheckPhoneLogin = async () => {
   return new Promise(async (resolve) => {
-    uni.login({
-      provider,
-      success: async (loginRes) => {
-        console.log("refreshToken success: ", JSON.stringify(loginRes));
-        const openIdCode =
-          provider === "apple"
-            ? loginRes.appleInfo && loginRes.appleInfo.identityToken
-            : loginRes.code;
-        console.log("获取到的授权code:", openIdCode);
+    await refreshAuthLogin().then(async () => {
+      // 刷新成功后，检查手机号是否绑定
+      const access_token = getAccessToken();
+      const checkRes = await checkUserPhone({
+        token: access_token,
+      });
 
-        if (!openIdCode) {
-          console.warn("refreshToken 未获取到登录 code");
-          resolve(true);
-          return;
-        }
-
-        const params = {
-          grant_type: grant_type,
-          clientId: clientId,
-          scope: "server",
-        };
-
-        if (provider === "apple") {
-          params.identityToken = openIdCode;
-        } else {
-          params.openIdCode = [openIdCode];
-        }
-        console.log("获取到的授权params:", JSON.stringify(params));
-
-        const response = await oauthToken(params);
-        if (response.access_token) {
-          setAccessToken(response.access_token);
-
-          const checkRes = await checkUserPhone({
-            token: response.access_token,
-          });
-          if (checkRes.data) {
-            // 登录成功后，触发登录成功事件
-            uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
-            resolve(false);
-          } else {
-            resolve(true);
-          }
-        }
-      },
-      fail: (err) => {
-        console.warn("refreshToken uni.login fail:", err);
+      if (checkRes.data) {
+        // 登录成功后，触发登录成功事件
+        uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+        resolve(false);
+      } else {
         resolve(true);
-      },
+      }
     });
   });
 };
+
+/// apple登录
+export const onAppleLogin = async (e) => { 
+  return new Promise(async (resolve) => {
+    await refreshAuthLogin()
+      .then(() => {
+        // 登录成功后，触发登录成功事件
+        uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+        resolve(true);
+      })
+      .catch(() => {
+        resolve(false);
+      });
+  });
+}
+
+
+/// 刷新 token
+export const refreshToken = async () => {
+  await checkRefreshToken()
+};