@cloudbase/lowcode-builder 1.10.2 → 1.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.10.2",
+  "version": "1.10.4",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -49,7 +49,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.2.8",
+    "@cloudbase/cals": "^1.2.10",
     "@cloudbase/lowcode-generator": "^1.8.37",
     "axios": "^0.21.0",
     "chalk": "^2.4.2",

package/template/html/index.html.ejs

@@ -464,7 +464,7 @@
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="<%= wedaPrivateConfigEndpoint ? wedaPrivateConfigEndpoint : '' %>/weda-config/weda-private.js"></script>
-    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.8.34/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.9.0/cloudbase.full.js?v=1"></script>
     <script
       crossorigin
       src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/cloudbase-adapter-privatelink@0.0.2/dist/index.js"
@@ -557,7 +557,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.c91146779b08145f3c29.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.fb4b74abce8265f4154c.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -50,8 +50,7 @@ export async function redirectToLogin($page) {
       return null
     }
 
-    const accessData = await getAccessPermission(app.id, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
-    return { returnResult: accessData?.isAccess };
+    return { refreshAccess: true };
   }
 
   await _redirectToLogin($page);
@@ -98,8 +97,9 @@ export async function checkAuth(app, appId, $page) {
         if (loginPage && !isInPublicPage) {
           // 开启了手机号授权登录，则判断是否跳转到登录页面
           const res = await redirectToLogin($page, loginConfig);
-          if(res !== null) {
-            return res.returnResult
+          if(res?.refreshAccess) {
+            const accessData = await getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
+            return  accessData?.isAccess
           }
         }
       } else {
@@ -114,20 +114,26 @@ export async function checkAuth(app, appId, $page) {
       if (loginPage && !isInPublicPage) {
         try {
           const res = await redirectToLogin($page, loginConfig);
-          if(res !== null) {
-            return res.returnResult
+          if(res?.refreshAccess) {
+            const accessData = await getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
+            return  accessData?.isAccess
           }
           return false;
         } catch (e) {
           const res = await redirectToLogin($page, loginConfig);
-          if(res !== null) {
-            return res.returnResult
+          if(res?.refreshAccess) {
+            const accessData = await getAccessPermission(appId, $page.__internal__.packageName, $page.id, <%= !!isAdminPortal %>)
+            return  accessData?.isAccess
           }
           return false;
         }
       }
     }
 
+    if (<%= !!ensureUserInfo %>) {
+      await app.auth.getUserInfo()
+    }
+
     return accessData?.isAccess;
   } catch (e) {
     if(app?.__internal__?.activePage?.id === $page.id) {