@nocobase/plugin-client 0.7.0-alpha.82 → 0.7.1-alpha.4

package/lib/index.d.ts

@@ -1 +1 @@
-export { default } from './plugin';
+export { default } from './server';

package/lib/index.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
-    return _plugin.default;
+    return _server.default;
   }
 });
 
-var _plugin = _interopRequireDefault(require("./plugin"));
+var _server = _interopRequireDefault(require("./server"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/{plugin.js → server.js}

@@ -95,21 +95,28 @@ class ClientPlugin extends _server().Plugin {
     return _asyncToGenerator(function* () {
       _this2.app.acl.allow('app', 'getLang');
 
+      _this2.app.acl.allow('app', 'getInfo');
+
       _this2.app.acl.allow('plugins', 'getPinned', 'loggedIn');
 
       _this2.app.resource({
         name: 'app',
         actions: {
           getInfo(ctx, next) {
-            var _this3 = this;
-
             return _asyncToGenerator(function* () {
               const SystemSetting = ctx.db.getRepository('systemSettings');
               const systemSetting = yield SystemSetting.findOne();
+              const enabledLanguages = systemSetting.get('enabledLanguages') || [];
               const currentUser = ctx.state.currentUser;
+              let lang = (systemSetting === null || systemSetting === void 0 ? void 0 : systemSetting.appLang) || process.env.APP_LANG || 'en-US';
+
+              if (enabledLanguages.includes(currentUser === null || currentUser === void 0 ? void 0 : currentUser.appLang)) {
+                lang = currentUser === null || currentUser === void 0 ? void 0 : currentUser.appLang;
+              }
+
               ctx.body = {
-                version: _this3.app.getVersion(),
-                lang: (currentUser === null || currentUser === void 0 ? void 0 : currentUser.appLang) || (systemSetting === null || systemSetting === void 0 ? void 0 : systemSetting.appLang) || process.env.APP_LANG || 'en-US'
+                version: yield ctx.app.version.get(),
+                lang
               };
               yield next();
             })();
@@ -119,9 +126,16 @@ class ClientPlugin extends _server().Plugin {
             return _asyncToGenerator(function* () {
               const SystemSetting = ctx.db.getRepository('systemSettings');
               const systemSetting = yield SystemSetting.findOne();
+              const enabledLanguages = systemSetting.get('enabledLanguages') || [];
               const currentUser = ctx.state.currentUser;
+              let lang = (systemSetting === null || systemSetting === void 0 ? void 0 : systemSetting.appLang) || process.env.APP_LANG || 'en-US';
+
+              if (enabledLanguages.includes(currentUser === null || currentUser === void 0 ? void 0 : currentUser.appLang)) {
+                lang = currentUser === null || currentUser === void 0 ? void 0 : currentUser.appLang;
+              }
+
               ctx.body = {
-                lang: (currentUser === null || currentUser === void 0 ? void 0 : currentUser.appLang) || (systemSetting === null || systemSetting === void 0 ? void 0 : systemSetting.appLang) || process.env.APP_LANG || 'en-US'
+                lang
               };
               yield next();
             })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-client",
-  "version": "0.7.0-alpha.82",
+  "version": "0.7.1-alpha.4",
   "main": "lib/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -10,10 +10,10 @@
     }
   ],
   "dependencies": {
-    "@nocobase/server": "0.7.0-alpha.82"
+    "@nocobase/server": "0.7.1-alpha.4"
   },
   "devDependencies": {
-    "@nocobase/test": "0.7.0-alpha.82"
+    "@nocobase/test": "0.7.1-alpha.4"
   },
-  "gitHead": "4820fd09375c7200d1ea0bb0aab1bd4783b80d3d"
+  "gitHead": "570d039f1904a041729c1967c0637b1109c278a8"
 }