@cloudbase/lowcode-builder 1.1.5-alpha.3 → 1.1.5-alpha.5

package/lib/builder/service/webpack.js

@@ -459,7 +459,7 @@ async function installDependencies(targetDir, options = {}) {
     const isPkgModify = !generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')]
         ? true
         : generateFiles_1.generatedFileContents[path_1.default.resolve(targetDir, 'package.json')].modify;
-    if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules')) && !isPkgModify) {
+    if ((options === null || options === void 0 ? void 0 : options.ignoreInstall) && fs_extra_1.default.existsSync(path_1.default.join(targetDir, 'node_modules'))) {
         console.log(`ignore install dependencies in ${targetDir}`);
         return;
     }

package/package.json

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

package/template/mp/app.js

@@ -2,7 +2,7 @@
 import { app } from './app/weapps-api'
 // 引入数据源管理器并进行初始化
 import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
-import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util'
 
 // 防止报类型不匹配warning
 const originWarn = console.warn;
@@ -69,11 +69,7 @@ setConfig({
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        let isAnonymous = true;
-        try {
-          const { accessToken } = await getAccessToken();
-          isAnonymous = !accessToken;
-        } catch (e) { }
+        const isAnonymous = await checkAnonymous();
         if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
           redirectToLogin();
         } else if (authConfig.RejectStrategy == 'show_warning') {

package/template/mp/common/util.js

@@ -1,7 +1,7 @@
 'use strict';
 import { findForItemsOfWidget, getWidget } from './widget'
 import { observable, untracked } from 'mobx';
-import { getAccessToken } from '../datasources/index'
+import { getAccessToken, loginScope } from '../datasources/index'
 import { app } from '../app/weapps-api'
 
 /**
@@ -61,7 +61,7 @@ export function createEventHandlers(evtListeners) {
       const [prefix = ''] = name.split('$');
       // The page event handler
       const { lists = [], itemsById = {} } = !!currentTarget && findForItemsOfWidget(currentTarget) || {}
-      const dataContext = untracked(()=>generateDataContext(currentTarget))
+      const dataContext = untracked(() => generateDataContext(currentTarget))
 
       listeners.forEach(async l => {
         let { data = {}, boundData = {} } = l;
@@ -310,6 +310,21 @@ async function getAccessPermission(app, appId, pageId) {
   return isAccess
 }
 
+export async function checkAnonymous() {
+  let isAnonymous = true;
+  try {
+    const { accessToken } = await getAccessToken();
+    isAnonymous = !accessToken;
+    const { app } = getApp();
+    // 私密链路有token则不是匿名; tcb链路会匿名登录需要多验证scope === 'anonymous'
+    if (accessToken && app.__internal__.getCloudSdkConfig('endpointType') === 'tcb-api') {
+      const scope = await loginScope();
+      isAnonymous = scope === 'anonymous';
+    }
+  } catch (e) { }
+  return isAnonymous;
+}
+
 /**
  * 检查页面权限
  **/
@@ -327,11 +342,7 @@ export async function checkAuth(app, appId, $page) {
   const [isAccess, authConfig] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  let isAnonymousUser = true;
-  try {
-    const { accessToken } = await getAccessToken();
-    isAnonymousUser = !accessToken;
-  } catch (e) { }
+  const isAnonymousUser = await checkAnonymous();
 
   if (!isAccess) {
     if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {

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

@@ -19,12 +19,17 @@ export default {
   dataSourceProfiles: dataSourceProfiles,
   /**
    * 新的dataset变量配置对象
-   *  key 为页面ID(全局为$global), val 为变量配置数组
+   * key 为页面ID(全局为$global), val 为变量配置数组
    */
   datasetProfiles: datasetProfiles,
   /**
    * 确定调用链路
    */
   endpointType: <%= isPrivateMode %> ? 'tcb-api' : 'wechat-service',
+  /**
+   * 调用链路为 tcb-api 时有效
+   * 私有化需要设置
+   */
+  tcbApiOrigin: '<%= tcbApiOrigin %>',
   isPrivate: <%= isPrivateMode %>
 }

package/template/mp/datasources/index.js

@@ -1,4 +1,4 @@
-import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth} from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth } from '@cloudbase/weda-client'
 const {
   setConfig,
   initTcb,
@@ -10,6 +10,7 @@ const {
   DS_SDK,
 } = WEDA_CLOUD_SDK
 const getAccessToken = auth.getAccessToken
+const loginScope = auth.loginScope
 
 export {
   createDataset,
@@ -20,6 +21,7 @@ export {
   DS_SDK,
   setConfig,
   getAccessToken,
+  loginScope,
   initTcb,
 }
 

package/template/mp/package.json

@@ -3,9 +3,9 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {<% if(isPrivateMode) {%>
-		"@cloudbase/js-sdk": "2.5.5-alpha.0",<% } %>
+		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-		"@cloudbase/weda-client": "0.2.32",
+		"@cloudbase/weda-client": "0.2.36",
 		"@cloudbase/weda-cloud-sdk": "1.0.24-alpha.3",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",