@nocobase/server 0.9.4-alpha.2 → 0.10.0-alpha.2

package/lib/application.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="koa-bodyparser" />
 import { ACL } from '@nocobase/acl';
+import { AuthManager } from '@nocobase/auth';
 import { Cache, ICacheConfig } from '@nocobase/cache';
 import Database, { Collection, CollectionOptions, IDatabaseOptions } from '@nocobase/database';
 import { AppLoggerOptions, Logger } from '@nocobase/logger';
@@ -85,6 +86,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     protected _pm: PluginManager;
     protected _acl: ACL;
     protected _appManager: AppManager;
+    protected _authManager: AuthManager;
     protected _version: ApplicationVersion;
     protected plugins: Map<string, Plugin<any>>;
     listenServer: Server;
@@ -100,6 +102,7 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get pm(): PluginManager;
     get version(): ApplicationVersion;
     get appManager(): AppManager;
+    get authManager(): AuthManager;
     get logger(): Logger;
     get log(): Logger;
     get name(): string;

package/lib/application.js

@@ -11,6 +11,13 @@ function _actions() {
   };
   return data;
 }
+function _auth() {
+  const data = require("@nocobase/auth");
+  _auth = function _auth() {
+    return data;
+  };
+  return data;
+}
 function _cache() {
   const data = require("@nocobase/cache");
   _cache = function _cache() {
@@ -170,6 +177,7 @@ class Application extends _koa().default {
     this._pm = void 0;
     this._acl = void 0;
     this._appManager = void 0;
+    this._authManager = void 0;
     this._version = void 0;
     this.plugins = new Map();
     this.listenServer = void 0;
@@ -204,6 +212,9 @@ class Application extends _koa().default {
   get appManager() {
     return this._appManager;
   }
+  get authManager() {
+    return this._authManager;
+  }
   get logger() {
     return this._logger;
   }
@@ -254,10 +265,21 @@ class Application extends _koa().default {
     } else {
       this._appManager = new _appManager.AppManager(this);
     }
+    this._authManager = new (_auth().AuthManager)({
+      authKey: 'X-Authenticator',
+      default: 'basic'
+    });
+    this.resource({
+      name: 'auth',
+      actions: _auth().actions
+    });
+    this._resourcer.use(this._authManager.middleware(), {
+      tag: 'auth'
+    });
     if (this.options.acl !== false) {
       this._resourcer.use(this._acl.middleware(), {
         tag: 'acl',
-        after: ['parseToken']
+        after: ['auth']
       });
     }
     (0, _helper.registerMiddlewares)(this, options);

package/lib/middlewares/data-template.js

@@ -19,8 +19,7 @@ const dateTemplate = /*#__PURE__*/function () {
       fields = _ctx$action$params.fields;
     yield next();
     if (isTemplate && actionName === 'get' && fields.length > 0) {
-      var _ctx$body;
-      ctx.body = traverseJSON((_ctx$body = ctx.body) === null || _ctx$body === void 0 ? void 0 : _ctx$body.toJSON(), {
+      ctx.body = traverseJSON(JSON.parse(JSON.stringify(ctx.body)), {
         collection: ctx.db.getCollection(resourceName),
         include: fields
       });
@@ -59,12 +58,15 @@ const traverseBelongsToMany = (arr, {
       collection: throughCollection,
       exclude
     });
-    if (Object.keys(data).length) {
+    if (data && Object.keys(data).length) {
       item[through] = data;
     } else {
       delete item[through];
     }
-    return item;
+    return traverseJSON(item, {
+      collection,
+      excludePk: false
+    });
   });
 };
 const parseInclude = keys => {
@@ -89,11 +91,16 @@ const parseInclude = keys => {
   return map;
 };
 const traverseJSON = (data, options) => {
+  if (!data) {
+    return data;
+  }
   const collection = options.collection,
     _options$exclude = options.exclude,
     exclude = _options$exclude === void 0 ? [] : _options$exclude,
     _options$include = options.include,
-    include = _options$include === void 0 ? [] : _options$include;
+    include = _options$include === void 0 ? [] : _options$include,
+    _options$excludePk = options.excludePk,
+    excludePk = _options$excludePk === void 0 ? true : _options$excludePk;
   const map = parseInclude(include);
   const result = {};
   for (var _i = 0, _Object$keys = Object.keys(data || {}); _i < _Object$keys.length; _i++) {
@@ -113,7 +120,10 @@ const traverseJSON = (data, options) => {
       result[key] = data[key];
       continue;
     }
-    if (field.options.primaryKey) {
+    if (field.options.primaryKey && excludePk) {
+      continue;
+    }
+    if (field.options.isForeignKey) {
       continue;
     }
     if (['sort', 'password', 'sequence'].includes(field.type)) {
@@ -132,7 +142,12 @@ const traverseJSON = (data, options) => {
         include: subInclude
       });
     } else if (field.type === 'belongsTo') {
-      result[key] = data[key];
+      result[key] = traverseJSON(data[key], {
+        collection: collection.db.getCollection(field.target),
+        // exclude: [field.foreignKey],
+        include: subInclude,
+        excludePk: false
+      });
     } else if (field.type === 'belongsToMany') {
       result[key] = traverseBelongsToMany(data[key], {
         collection: collection.db.getCollection(field.target),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.9.4-alpha.2",
+  "version": "0.10.0-alpha.2",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -8,12 +8,13 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.9.4-alpha.2",
-    "@nocobase/actions": "0.9.4-alpha.2",
-    "@nocobase/database": "0.9.4-alpha.2",
-    "@nocobase/logger": "0.9.4-alpha.2",
-    "@nocobase/resourcer": "0.9.4-alpha.2",
-    "@nocobase/utils": "0.9.4-alpha.2",
+    "@nocobase/acl": "0.10.0-alpha.2",
+    "@nocobase/actions": "0.10.0-alpha.2",
+    "@nocobase/auth": "0.10.0-alpha.2",
+    "@nocobase/database": "0.10.0-alpha.2",
+    "@nocobase/logger": "0.10.0-alpha.2",
+    "@nocobase/resourcer": "0.10.0-alpha.2",
+    "@nocobase/utils": "0.10.0-alpha.2",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -29,5 +30,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
+  "gitHead": "85028ae1733fcbd46ecd5d291dacbdc175f7f073"
 }