@cloudbase/lowcode-builder 0.1.9 → 0.1.10

package/lib/builder/mp/index.js

@@ -52,6 +52,7 @@ const templateDir = config_1.appTemplateDir + '/mp/';
 const em = chalk_1.default.blue.bold;
 const error = chalk_1.default.redBright;
 async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins, isProduction, deployMode, extraData, isMixMode, options, buildTypeList, isBrowserMpBuilder = false, }) {
+    var _a;
     const operationLabel = em('Wexin MiniProgram Generated');
     console.time(operationLabel);
     console.log('Generating ' + em('Wexin MiniProgram') + ' to ' + projDir);
@@ -195,6 +196,7 @@ async function generateWxMp({ weapps, projDir, appId, domain, materials, plugins
                 appID: appId,
                 resourceAppid: !!options.isCrossAccount ? options.resourceAppId : '',
                 isProd: deployMode === types_1.DEPLOY_MODE.UPLOAD,
+                clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
             },
             'datasources/datasource-profiles.js.tpl': {
                 datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(weapps.reduce((datasources, app) => {
@@ -400,6 +402,7 @@ async function generateFramework(appData, outDir, ctx) {
                     isBare: false,
                     appConfig: (0, util_3.JsonToStringWithVariableName)({
                         id: ctx.appId,
+                        envId: appData.envId,
                         staticResourceDomain: ctx.domain || '',
                         envVersion: (ctx === null || ctx === void 0 ? void 0 : ctx.isProduction) ? 'production' : 'preview',
                         pages: appData.pageInstanceList

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -28,7 +28,7 @@
     "clean": "rm -rf lib && rm -rf dist",
     "build": "tsc",
     "test": "jest",
-    "test:build": "ts-node ./__test__/build.ts",
+    "test:build": "ts-node ./__tests__/build.ts",
     "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
     "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js"
   },
@@ -36,7 +36,7 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.3.3",
+    "@cloudbase/cals": "^0.3.28",
     "@cloudbase/lowcode-generator": "0.6.17-mpbeta.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/mp/app/weapps-api.js

@@ -11,9 +11,9 @@ import state from '../lowcode/state'
   import common from './common'
 <%} else {%>
 const state = {}
-  const computed = {}
-  const common = {}
-    <%}%>
+const computed = {}
+const common = {}
+<%}%>
 
 const mainAppKey = '__weappsMainApp'
 
@@ -22,12 +22,11 @@ export { process }
 
 function createGlboalApi() {
   const mpApp = createMpApp({
-    appConfig: <%= appConfig %>;
+    appConfig: <%= appConfig %>
   });
   const globalAPI = {
     id: '<%= appId %>',
     domain: '<%= domain %>',
-    activePage: null,
     pages: {},
     session: {
       //configure: sdk.configure,

package/template/mp/app.js

@@ -1,9 +1,11 @@
-import { setConfig } from './datasources/index'
+import { setConfig, getAccessToken, initTcb } from './datasources/index'
 import lifeCycle from './lowcode/lifecycle'
 import { app } from './app/weapps-api'
 import WxReportV2 from './common/wx_yypt_report_v2'
 // 引入数据源管理器并进行初始化
 import { EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
+import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
+
 const $app = app;
 <% if (yyptConfig.yyptAppKey) { %>
 const wxReport = new WxReportV2({
@@ -24,12 +26,67 @@ const wxReport = new WxReportV2({
       if (!cfg.options || !cfg.options.showLoading) return
       app.showLoading()
     },
+    beforeCallFunction: async (params) => {
+      try {
+        const loginPage = findLoginPage();
+
+        let skip = false;
+        switch (params?.data?.methodName) {
+          case 'callWedaApi': {
+            if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
+              skip = true;
+            }
+            break;
+          }
+        }
+
+        // 后续做过滤处理
+        if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+          return params;
+        }
+        // await initTcb();
+        const { accessToken } = await getAccessToken();
+        if (accessToken) {
+          params.data.accessToken = accessToken;
+        }
+      } catch (e) {
+        if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+          app.showToast({
+            title: '登录态失效',
+            icon: 'error',
+          });
+        }
+        console.error('beforeCallFunction error', e);
+      }
+      return params;
+    },
     afterDSRequest: (cfg, error, result) => {
       if (!cfg.options) return
       if (cfg.options.showLoading) app.hideLoading()
       if (!cfg.options.showToast) return
       const isSuccess = !error && result && !result.code
       app.showToast({ icon: isSuccess ? 'success' : 'error' })
+    },
+    async afterCallFunction(params, error, res) {
+      if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
+        const loginPage = findLoginPage();
+        if (loginPage) {
+          const authConfig = await getAuthConfig();
+          let isAnonymous = true;
+          try {
+            const { accessToken } = await getAccessToken();
+            isAnonymous = !accessToken;
+          } catch (e) { }
+          if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
+            redirectToLogin();
+          } else if (authConfig.RejectStrategy == 'show_warning') {
+            app.showToast({
+              title: '接口无访问权限',
+              icon: 'error',
+            });
+          }
+        }
+      }
     }
   })
 

package/template/mp/common/jwt.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+var b64re = /^(?:[A-Za-z\d+\/]{4})*?(?:[A-Za-z\d+\/]{2}(?:==)?|[A-Za-z\d+\/]{3}=?)?$/;
+exports.weBtoa = function (string) {
+  string = String(string);
+  var bitmap,
+    a,
+    b,
+    c,
+    result = "",
+    i = 0,
+    rest = string.length % 3;
+  for (; i < string.length; ) {
+    if (
+      (a = string.charCodeAt(i++)) > 255 ||
+      (b = string.charCodeAt(i++)) > 255 ||
+      (c = string.charCodeAt(i++)) > 255
+    )
+      throw new TypeError(
+        "Failed to execute 'btoa' on 'Window': The string to be encoded contains characters outside of the Latin1 range."
+      );
+    bitmap = (a << 16) | (b << 8) | c;
+    result +=
+      b64.charAt((bitmap >> 18) & 63) +
+      b64.charAt((bitmap >> 12) & 63) +
+      b64.charAt((bitmap >> 6) & 63) +
+      b64.charAt(bitmap & 63);
+  }
+  return rest ? result.slice(0, rest - 3) + "===".substring(rest) : result;
+};
+exports.weAtob = function (string) {
+  string = String(string).replace(/[\t\n\f\r ]+/g, "");
+  if (!b64re.test(string))
+    throw new TypeError(
+      "Failed to execute 'atob' on 'Window': The string to be decoded is not correctly encoded."
+    );
+  string += "==".slice(2 - (string.length & 3));
+  var bitmap,
+    result = "",
+    r1,
+    r2,
+    i = 0;
+  for (; i < string.length; ) {
+    bitmap =
+      (b64.indexOf(string.charAt(i++)) << 18) |
+      (b64.indexOf(string.charAt(i++)) << 12) |
+      ((r1 = b64.indexOf(string.charAt(i++))) << 6) |
+      (r2 = b64.indexOf(string.charAt(i++)));
+    result +=
+      r1 === 64
+        ? String.fromCharCode((bitmap >> 16) & 255)
+        : r2 === 64
+        ? String.fromCharCode((bitmap >> 16) & 255, (bitmap >> 8) & 255)
+        : String.fromCharCode(
+            (bitmap >> 16) & 255,
+            (bitmap >> 8) & 255,
+            bitmap & 255
+          );
+  }
+  return result;
+};
+function b64DecodeUnicode(str) {
+  return decodeURIComponent(
+    exports.weAtob(str).replace(/(.)/g, function (p) {
+      var code = p.charCodeAt(0).toString(16).toUpperCase();
+      if (code.length < 2) {
+        code = "0" + code;
+      }
+      return "%" + code;
+    })
+  );
+}
+function base64_url_decode(str) {
+  var output = str.replace(/-/g, "+").replace(/_/g, "/");
+  switch (output.length % 4) {
+    case 0:
+      break;
+    case 2:
+      output += "==";
+      break;
+    case 3:
+      output += "=";
+      break;
+    default:
+      throw "Illegal base64url string!";
+  }
+  try {
+    return b64DecodeUnicode(output);
+  } catch (err) {
+    return exports.weAtob(output);
+  }
+}
+function weappJwtDecode(token, options) {
+  if (typeof token !== "string") {
+    throw "Invalid token specified";
+  }
+  options = options || {};
+  var pos = options.header === true ? 0 : 1;
+  try {
+    return JSON.parse(base64_url_decode(token.split(".")[pos]));
+  } catch (e) {
+    throw "Invalid token specified: " + e.message;
+  }
+}
+exports.default = weappJwtDecode;

package/template/mp/common/util.js

@@ -233,32 +233,135 @@ export function setter(context, path, value = undefined) {
   return lodashSet(context, path, value);
 }
 
+export function findLoginPage() {
+  const { app } = getApp();
+  const { pages = [] } = app.__internal__.getConfig();
+  return pages.find(item => item.type === 'login');
+}
+
+let _AUTH_CONFIG_CACHE = null;
+export async function getAuthConfig() {
+  const { app } = getApp();
+  if (_AUTH_CONFIG_CACHE) {
+    return _AUTH_CONFIG_CACHE;
+  }
+  try {
+    const res = await app.cloud.callWedaApi({
+      action: "DescribeRuntimeResourceStrategy",
+      data: {
+        ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
+        ResourceId: app.id,
+      },
+    });
+    const settingData = {};
+    // 云api不支持map只能传字符串，需要转换
+    res.forEach((item) => {
+      settingData[item.Key] = ['AllowRegister', 'NeedLogin'].includes(item.Key) ? item.Value === '1' : item.Value;
+    });
+    _AUTH_CONFIG_CACHE = settingData;
+    return _AUTH_CONFIG_CACHE;
+  } catch (e) {
+    return {
+      NeedLogin: false,
+      RejectStrategy: "show_warning",
+    };
+  }
+}
+
+let _AUTH_CACHE_MAP = {}
+async function getAccessPermission(app, appId, pageId) {
+  const cacheKey = `${appId}-${pageId}`
+  if (_AUTH_CACHE_MAP[cacheKey] !== undefined) {
+    return _AUTH_CACHE_MAP[cacheKey];
+  }
+
+  let isAccess = false;
+  try {
+    const res = await app.cloud.callWedaApi({
+      action: 'DescribeResourcesPermission',
+      data: {
+        ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
+        ResourceIdList: [cacheKey],
+        AppResourceId: appId,
+      },
+    });
+    if (Array.isArray(res) && res.length > 0) {
+      isAccess = !!res[0].IsAccess;
+    }
+    _AUTH_CACHE_MAP[cacheKey] = isAccess;
+  } catch (e) {
+    console.warn('getAccessPermission', e);
+  }
+  return isAccess
+}
+
 /**
  * 检查页面权限
  **/
-export async function checkAuth(app, appId, pageId) {
-  return true
+export async function checkAuth(app, appId, $page) {
+  const loginPage = findLoginPage(app);
+  if (loginPage?.id === $page.id) {
+    return true
+  }
   app.showNavigationBarLoading();
-  const checkAuthResult = await app.cloud.callWedaApi({
-    action: 'DescribeResourcesPermission',
-    data: {
-      ResourceType: `<%= isAdminPortal? 'modelApp' : 'app'%>`,
-      ResourceIdList: [`${appId}-${pageId}`],
-    },
-  });
-  let isLogin = false;
-  if (Array.isArray(checkAuthResult) && checkAuthResult.length > 0) {
-    isLogin = checkAuthResult[0]?.IsAccess || false;
+  const requestList = [getAccessPermission(app, appId, $page.id)];
+  // 暂时先认为有登录页则自定义登录功能开启且生效
+  if (loginPage) {
+    requestList.push(getAuthConfig(app));
   }
+  const [isAccess, authConfig] = await Promise.all(requestList);
   app.hideNavigationBarLoading();
 
-  if (!isLogin) {
+  const { accessToken } = await getAccessToken()
+  const isAnonymousUser = !accessToken
+
+  if (!isAccess) {
+    if (isAnonymousUser && loginPage && (authConfig.NeedLogin || authConfig.RejectStrategy == 'to_login')) {
+      redirectToLogin($page);
+    } else {
+      app.showToast({
+        title: '页面无访问权限',
+        icon: 'error',
+      });
+    }
+  } else if (loginPage && authConfig.NeedLogin) {
+    // 此分支逻辑本不应该前端判断是否登录，历史原因后端短期内搞不定，后续后端优化后删除
+    try {
+      if (isAnonymousUser) {
+        redirectToLogin($page);
+      }
+    } catch (e) {
+      redirectToLogin($page);
+    }
+  }
+  return isAccess;
+}
+
+export function redirectToLogin(currentPage) {
+  // 去登录则清空权限缓存。
+  _AUTH_CACHE_MAP = {};
+  const { app } = getApp();
+  const loginPage = findLoginPage(app);
+  if (!currentPage) {
+    currentPage = app.utils.getCurrentPage() || {};
+  }
+  if (loginPage?.id === currentPage.id) {
+    return true
+  }
+  if (loginPage) {
+    app.redirectTo({
+      pageId: loginPage.id,
+      params: {
+        sourcePageId: currentPage.id,
+        sourcePageParams: currentPage.params
+      }
+    })
+  } else {
     app.showToast({
-      title: '页面无访问权限',
+      title: '用户未登录',
       icon: 'error',
     });
   }
-  return isLogin;
 }
 
 // 日期转换

package/template/mp/common/weapp-page.js

@@ -23,9 +23,9 @@ export function createPage(
   const evtHandlers = createEventHandlers(evtListeners, context);
 
   function extractLifecyles() {
-    const result = { };
-    Object.keys(lifecycle).map(name=>{
-      result[name] = function() {
+    const result = {};
+    Object.keys(lifecycle).map(name => {
+      result[name] = function () {
         return lifecycle[name].apply(this.getWeAppInst(), arguments)
       }
     })
@@ -73,7 +73,7 @@ export function createPage(
       onLoad(options) {
         const $page = this.getWeAppInst()
         setConfig({ currentPageId: $page.uuid });
-        app.activePage = $page;
+        app.__internal__.activePage = $page;
         this._pageActive = true;
 
         let query = decodePageQuery(options || {});
@@ -100,14 +100,14 @@ export function createPage(
       async onShow() {
         const $page = this.getWeAppInst()
         setConfig({ currentPageId: $page.uuid });
-        app.activePage = $page;
+        app.__internal__.activePage = $page;
         this._pageActive = true;
 
         const hook = lifecycle.onShow || lifecycle.onPageShow;
         hook && hook.call($page);
 
         // 权限检查
-        if (await checkAuth(app, app.id, app.activePage.id)) {
+        if (await checkAuth(app, app.id, $page)) {
           this.setData({
             weDaHasLogin: true,
           });

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

@@ -11,6 +11,8 @@ export default {
   appID: '<%= appID %>',
   /** 云开发环境ID */
   envID: '<%= envID %>',
+  /** 应用端ID */
+  tcbClientId: '<%= clientID %>',
   /** 云开发资源所属的微信app id */
   resourceAppid: '<%= resourceAppid %>',
   /** 数据源描述对象数组 */

package/template/mp/datasources/index.js

@@ -1,4 +1,4 @@
-import { WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
 const {
   setConfig,
   initTcb,
@@ -8,7 +8,8 @@ const {
   generateParamsParser,
   EXTRA_API,
   DS_API,
-  DS_SDK
+  DS_SDK,
+  getAccessToken,
 } = WEDA_CLOUD_SDK
 
 export {
@@ -19,7 +20,9 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-  setConfig
+  setConfig,
+  getAccessToken,
+  initTcb,
 }
 
 import config from './config'

package/template/mp/package.json

@@ -3,7 +3,7 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "stable",
+		"@cloudbase/weda-client": "0.1.13-alpha.1",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",
 		"lodash.set": "^4.3.2",

package/template/package.json

@@ -5,11 +5,11 @@
     "build-web": "rm -rf ./preivew && webpack --config ./webpack/webpack.web.prod.js"
   },
   "dependencies": {
-    "@cloudbase/js-sdk": "1.5.3-alpha.0",
+    "@cloudbase/js-sdk": "2.4.0-beta.0",
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
-    "@cloudbase/weda-client": "0.1.11",
+    "@cloudbase/weda-client": "0.2.0",
     "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",

package/template/src/app/global-api.js

@@ -7,7 +7,7 @@ import { formatDate } from '../utils/date';
 import { getter, setter, _isMobile } from '../utils';
 import actionMap from './material-actions';
 import { scanCodeApi } from '../utils/scan-code-action';
-import { createWebApp, ACTIONS_KEY, ROUTER_KEY } from '@cloudbase/weda-client';
+import { createWebApp, _ACTIONS_KEY as ACTIONS_KEY, _ROUTER_KEY as ROUTER_KEY } from '@cloudbase/weda-client';
 import { createDataset, EXTRA_API } from '../datasources/index'
 
 const mainAppKey = '__weappsMainApp';

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

@@ -11,6 +11,8 @@ export default {
   appID: '<%= appID %>',
   /** 云开发环境ID */
   envID: '<%= envID %>',
+  /** 应用端ID */
+  tcbClientId: '<%= clientID %>',
   /** 数据源描述对象数组 */
   dataSourceProfiles: dataSourceProfiles,
   /**

package/template/src/datasources/index.js

@@ -1,4 +1,4 @@
-import { WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
 import config from './config';
 
 const {
@@ -10,7 +10,8 @@ const {
   generateParamsParser,
   EXTRA_API,
   DS_API,
-  DS_SDK
+  DS_SDK,
+  getAccessToken,
 } = WEDA_CLOUD_SDK
 
 export {
@@ -21,7 +22,9 @@ export {
   CLOUD_SDK,
   DS_API,
   DS_SDK,
-  setConfig
+  setConfig,
+  initTcb,
+  getAccessToken,
 }
 
 setConfig(config);