@cloudbase/lowcode-builder 1.8.83 → 1.8.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.83",
+  "version": "1.8.84",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/mp/common/util.js

@@ -8,6 +8,8 @@ import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
 import { getWedaAPI } from '@cloudbase/weda-client'
 
+let LOGIN_CONFIG = <%= customLoginConfig %>
+
 /**
  * Convert abcWordSnd -> abc-word-snd
  */
@@ -519,7 +521,12 @@ export function formatErrorMsg(e) {
 export async function checkAuth(app, appId, $page) {
   <% if(skipCheckAuth){ %> return true <% } %>
 
+	const loginConfig = await getLoginConfig();
+	const hasPhoneLoginType = loginConfig?.miniprogram?.find(v => v.type === 'miniprogram_phone');
+	const hasOpenIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'openid_login');
+
   const loginPage = findLoginPage(app);
+  const judgePhoneLogin = loginPage && hasPhoneLoginType;
   const loginPageUUID = loginPage?.uuid || loginPage?.id
   const currentUUID = $page.uuid || $page.id
   if (loginPageUUID === currentUUID) {
@@ -532,35 +539,49 @@ export async function checkAuth(app, appId, $page) {
   wx.showNavigationBarLoading();
   const requestList = [getAccessPermission(app, appId, $page.__internal__.packageName, $page.id)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
-  if (loginPage) {
+  if (judgePhoneLogin || hasOpenIdLoginType) {
     requestList.push(getAuthConfig(app));
   }
   try {
     const [accessData, authConfig] = await Promise.all(requestList);
 
     const isAnonymousUser = await checkAnonymous();
-
+    // 如果当前页面匿名用户无权限访问
     if (!accessData?.isAccess) {
-      if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
-        redirectToLogin($page);
+      // 当前匿名情况下，且需要登录后访问应用
+      if (isAnonymousUser && (authConfig?.NeedLogin || authConfig?.RejectStrategy == 'to_login')) {
+        // 开启了手机号授权登录，则判断是否跳转到登录页面
+        if (judgePhoneLogin) {
+          redirectToLogin($page);
+        } else if (hasOpenIdLoginType){
+          // 开启了openId静默登录，则进行openid登录
+          return await app.cloud.openIdLoginInWxApp();
+        }
       } else {
         app.showToast({
           title: ['-2', '-4'].includes(accessData?.roleId) ? '默认访客无权限' : '页面无访问权限',
           icon: 'error',
         });
       }
-    } else if (loginPage && authConfig.NeedLogin) {
-      // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
-      try {
-        if (isAnonymousUser) {
+    } else if (authConfig?.NeedLogin) {
+      // 如果当前页面匿名用户有权限访问，且需要登录后访问应用，则按配置进行登录
+      if (judgePhoneLogin) {
+        // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
+        try {
+          if (isAnonymousUser) {
+            redirectToLogin($page);
+            return false;
+          }
+        } catch (e) {
           redirectToLogin($page);
           return false;
         }
-      } catch (e) {
-        redirectToLogin($page);
-        return false;
+      } else if (hasOpenIdLoginType) {
+        // openId静默登录
+        return await app.cloud.openIdLoginInWxApp();;
       }
     }
+
     return accessData?.isAccess;
   } catch (e) {
     if(app.__internal__?.activePage?.id === $page.id) {
@@ -871,7 +892,6 @@ export function reportEvent(tag) {
   } catch (e) {}
 }
 
-let LOGIN_CONFIG = <%= customLoginConfig %>
 export async function getLoginConfig() {
   <% if(loginConfigPathname){ %>
   const { staticResourceDomain, loginConfigVersion, id } = app.__internal__?.getConfig() || {};

package/template/mp/package.json

@@ -5,8 +5,8 @@
   "dependencies": {<% if(importJSSDK) {%>
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.22",
-    "@cloudbase/weda-cloud-sdk": "1.0.56",
+    "@cloudbase/weda-client": "1.0.23",
+    "@cloudbase/weda-cloud-sdk": "1.0.57",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/mp/packages/$wd_system/pages/login/index.js

@@ -129,6 +129,6 @@ Component({
       const config = settingData || this.data.settingData
       return !!config.miniprogram.find(function (item) { return item.type === 'miniprogram_phone' }
       )
-    }
+    },
   }
 })