@cloudbase/lowcode-builder 1.9.11 → 1.9.13

package/package.json

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

package/template/html/index.html.ejs

@@ -557,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.be9848557e443dbc9550.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.a33416580dd1425d5d06.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -2,7 +2,7 @@
 'use strict';
 import { auth } from '@cloudbase/weda-client';
 const { checkAnonymous, __internal__ = {}} = auth;
-const { getAuthConfig, redirectToLogin, getAccessPermission, findLoginPage, cleanAccessPermissionCache } = __internal__
+const { getAuthConfig, redirectToLogin: _redirectToLogin, getAccessPermission, findLoginPage, cleanAccessPermissionCache } = __internal__
 import { getWedaAPI } from '@cloudbase/weda-client'
 
 export let LOGIN_CONFIG = <%= customLoginConfig %>
@@ -23,16 +23,41 @@ export function formatErrorMsg(e) {
   return msg;
 }
 
+export async function redirectToLogin($page) {
+  const { app } = getWedaAPI();
+	const loginConfig = await getLoginConfig();
+
+  // openid 登录特殊处理，不在登录页登录，在原地静默登录
+	const hasOpenIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'openid_login')?.enable;
+  const hasUnionIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'unionid_login')?.enable;
+
+  if(hasOpenIdLoginType){
+    // 开启了openId静默登录，则进行openid登录
+    const result = await app.cloud.openIdLoginInWxApp();
+    cleanAccessPermissionCache?.()
+    return { returnResult: result }
+  } else if (hasUnionIdLoginType) {
+    // 开启了unionId静默登录，则进行unionId登录
+    const result = await app.cloud.unionIdLoginInWxApp();
+    cleanAccessPermissionCache?.()
+    return { returnResult: result }
+  }
+  _redirectToLogin($page);
+  return null
+}
+
 /**
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
   <% if(skipCheckAuth){ %> return true <% } %>
 
+  const { publicPage } = app.__internal__?.getConfig() || {};
+
+  // 是否处于公开访问页面
+  const isInPublicPage = publicPage?.includes(`${$page.__internal__.packageName}/${$page.id}`.replace(/^\/|\/$/g, ''));
+
 	const loginConfig = await getLoginConfig();
-  // openid 登录特殊处理，不在登录页登录，在原地静默登录
-	const hasOpenIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'openid_login')?.enable;
-  const hasUnionIdLoginType = loginConfig?.miniprogram?.find(v => v.type === 'unionid_login')?.enable;
 
   const loginPage = findLoginPage(app);
   const loginPageUUID = loginPage?.uuid || loginPage?.id
@@ -47,7 +72,7 @@ export async function checkAuth(app, appId, $page) {
   wx.showNavigationBarLoading();
   const requestList = [getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)];
   // 暂时先认为有登录页则自定义登录功能开启且生效
-  if (loginPage || hasOpenIdLoginType || hasUnionIdLoginType) {
+  if (loginConfig) {
     requestList.push(getAuthConfig(<%= !!isAdminPortal %>));
   }
   try {
@@ -58,20 +83,12 @@ export async function checkAuth(app, appId, $page) {
     if (!accessData?.isAccess) {
       // 当前匿名情况下，且需要登录后访问应用
       if (isAnonymousUser && (authConfig?.NeedLogin || authConfig?.RejectStrategy == 'to_login')) {
-        if(hasOpenIdLoginType){
-          // 开启了openId静默登录，则进行openid登录
-          const result = await app.cloud.openIdLoginInWxApp();
-          cleanAccessPermissionCache?.()
-          return result
-        } else if (hasUnionIdLoginType) {
-          // 开启了unionId静默登录，则进行unionId登录
-          const result = await app.cloud.unionIdLoginInWxApp();
-          cleanAccessPermissionCache?.()
-          return result
-        }
-        else if (loginPage) {
+        if (loginPage && !isInPublicPage) {
           // 开启了手机号授权登录，则判断是否跳转到登录页面
-          redirectToLogin($page);
+          const res = await redirectToLogin($page, loginConfig);
+          if(res !== null) {
+            return res.returnResult
+          }
         }
       } else {
         app.showToast({
@@ -82,22 +99,12 @@ export async function checkAuth(app, appId, $page) {
     } else if (authConfig?.NeedLogin && isAnonymousUser) {
       // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
       // 如果当前页面匿名用户有权限访问，且需要登录后访问应用，则按配置进行登录
-      if (hasOpenIdLoginType) {
-        // openId静默登录
-        const result = await app.cloud.openIdLoginInWxApp();
-        cleanAccessPermissionCache?.()
-        return result
-      } else if (hasUnionIdLoginType) {
-        // 开启了unionId静默登录
-        const result = await app.cloud.unionIdLoginInWxApp();
-        cleanAccessPermissionCache?.()
-        return result
-      } else if (loginPage) {
+      if (loginPage && !isInPublicPage) {
         try {
-          redirectToLogin($page);
+          await redirectToLogin($page, loginConfig);
           return false;
         } catch (e) {
-          redirectToLogin($page);
+          await redirectToLogin($page, loginConfig);
           return false;
         }
       }

package/template/mp/datasources/config.js.tpl

@@ -1,7 +1,7 @@
 import datasetProfiles from './dataset-profiles'
 const dataSourceProfiles = require('./datasource-profiles.js')
 import config from '../common/config'
-import { LOGIN_CONFIG } from '../common/util'
+import { LOGIN_CONFIG, redirectToLogin } from '../common/util'
 
 /**
  * 数据源基本配置
@@ -55,18 +55,17 @@ const CLOUD_CONFIG =  {
 
 			if (!LOGIN_CONFIG?.access?.needLogin) {
         if (<%= pureAnonymousLogin %>) {
-				  return !loginState.isAnonymous && await auth.signInAnonymously();
+				  return loginState.notLogin && await auth.signInAnonymously();
         } else if (!config.endpointType) {
           return await auth.signInAnonymouslyInWx();
         }
 			} else if (publicPage){
 				const pages = getCurrentPages();
-				const currentPage = pages[pages.length - 1]?.route?.match(/^pages\/(.*)\//)?.[1] || getApp().app?.__internal__?.getConfig()?.page?.[0]?.id;
+				const currentPage = pages[pages.length - 1]?.route?.match(/^pages\/(.*)\//)?.[1] || getApp().app?.__internal__?.getConfig()?.pages?.[0]?.id;
 				if (publicPage.includes(currentPage)) {
 					// 未登录时，进入公开访问页面，则匿名登录
-					return !loginState.isAnonymous && await auth.signInAnonymously();
+					return loginState.notLogin && await auth.signInAnonymously();
 				} else {
-					const { redirectToLogin } = getApp().app?.auth?.__internal__ || {};
 					return redirectToLogin?.();
 				}
 			}