@nocobase/plugin-auth 0.11.1-alpha.4 → 0.12.0-alpha.1

package/{src/server/model/authenticator.ts → dist/server/model/authenticator.js}

@@ -1,48 +1,48 @@
-import { Database, Model } from '@nocobase/database';
+'use strict';
 
-export class AuthModel extends Model {
-  async findUser(uuid: string) {
-    let user: Model;
+var database = require('@nocobase/database');
+
+class AuthModel extends database.Model {
+  async findUser(uuid) {
+    let user;
     const users = await this.getUsers({
       through: {
-        where: { uuid },
-      },
+        where: { uuid }
+      }
     });
     if (users.length) {
       user = users[0];
       return user;
     }
   }
-
-  async newUser(uuid: string, values?: any) {
-    let user: Model;
-    const db: Database = (this.constructor as any).database;
+  async newUser(uuid, values) {
+    let user;
+    const db = this.constructor.database;
     await this.sequelize.transaction(async (transaction) => {
-      // Create a new user if not exists
       user = await this.createUser(
         values || {
-          nickname: uuid,
+          nickname: uuid
         },
         {
           through: {
-            uuid: uuid,
+            uuid
           },
-          transaction,
-        },
+          transaction
+        }
       );
       await db.emitAsync(`users.afterCreateWithAssociations`, user, {
-        transaction,
+        transaction
       });
     });
     return user;
   }
-
-  async findOrCreateUser(uuid: string, userValues?: any) {
+  async findOrCreateUser(uuid, userValues) {
     const user = await this.findUser(uuid);
     if (user) {
       return user;
     }
-
     return await this.newUser(uuid, userValues);
   }
 }
+
+exports.AuthModel = AuthModel;

package/dist/server/plugin.js

@@ -0,0 +1,93 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var server = require('@nocobase/server');
+var path = require('path');
+var preset = require('../preset');
+var authActions = require('./actions/auth');
+var authenticatorsActions = require('./actions/authenticators');
+var basicAuth = require('./basic-auth');
+var locale = require('./locale');
+var authenticator = require('./model/authenticator');
+var tokenBlacklist = require('./token-blacklist');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var authActions__default = /*#__PURE__*/_interopDefault(authActions);
+var authenticatorsActions__default = /*#__PURE__*/_interopDefault(authenticatorsActions);
+
+class AuthPlugin extends server.Plugin {
+  afterAdd() {
+  }
+  async beforeLoad() {
+    this.app.i18n.addResources("zh-CN", preset.namespace, locale.zhCN);
+    this.app.i18n.addResources("en-US", preset.namespace, locale.enUS);
+    this.app.db.registerModels({ AuthModel: authenticator.AuthModel });
+  }
+  async load() {
+    await this.db.import({
+      directory: path.resolve(__dirname, "collections")
+    });
+    this.db.addMigrations({
+      namespace: "auth",
+      directory: path.resolve(__dirname, "migrations"),
+      context: {
+        plugin: this
+      }
+    });
+    this.app.authManager.setStorer({
+      get: async (name) => {
+        const repo = this.db.getRepository("authenticators");
+        const authenticators = await repo.find({ filter: { enabled: true } });
+        const authenticator = authenticators.find((authenticator2) => authenticator2.name === name);
+        return authenticator || authenticators[0];
+      }
+    });
+    if (!this.app.authManager.jwt.blacklist) {
+      this.app.authManager.setTokenBlacklistService(new tokenBlacklist.TokenBlacklistService(this));
+    }
+    this.app.authManager.registerTypes(preset.presetAuthType, {
+      auth: basicAuth.BasicAuth
+    });
+    Object.entries(authActions__default.default).forEach(
+      ([action, handler]) => this.app.resourcer.registerAction(`auth:${action}`, handler)
+    );
+    Object.entries(authenticatorsActions__default.default).forEach(
+      ([action, handler]) => this.app.resourcer.registerAction(`authenticators:${action}`, handler)
+    );
+    ["check", "signIn", "signUp"].forEach((action) => this.app.acl.allow("auth", action));
+    ["signOut", "changePassword"].forEach((action) => this.app.acl.allow("auth", action, "loggedIn"));
+    this.app.acl.allow("authenticators", "publicList");
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}.authenticators`,
+      actions: ["authenticators:*"]
+    });
+  }
+  async install(options) {
+    const repository = this.db.getRepository("authenticators");
+    const exist = await repository.findOne({ filter: { name: preset.presetAuthenticator } });
+    if (exist) {
+      return;
+    }
+    await repository.create({
+      values: {
+        name: preset.presetAuthenticator,
+        authType: preset.presetAuthType,
+        description: "Sign in with email and password.",
+        enabled: true,
+        options: {
+          public: {
+            allowSignUp: true
+          }
+        }
+      }
+    });
+  }
+  async remove() {
+  }
+}
+var plugin_default = AuthPlugin;
+
+exports.AuthPlugin = AuthPlugin;
+exports.default = plugin_default;

package/dist/server/token-blacklist.js

@@ -0,0 +1,62 @@
+'use strict';
+
+var cron = require('cron');
+
+class TokenBlacklistService {
+  constructor(plugin) {
+    this.plugin = plugin;
+    this.repo = plugin.db.getRepository("tokenBlacklist");
+    this.cronJob = this.createCronJob();
+  }
+  repo;
+  cronJob;
+  get app() {
+    return this.plugin.app;
+  }
+  createCronJob() {
+    const cronJob = new cron.CronJob(
+      // every day at 03:00
+      "0 3 * * *",
+      //
+      async () => {
+        this.app.logger.info(`${this.plugin.name}: Start delete expired blacklist token`);
+        await this.deleteByExpiration();
+        this.app.logger.info(`${this.plugin.name}: End delete expired blacklist token`);
+      },
+      null
+    );
+    this.app.once("beforeStart", () => {
+      cronJob.start();
+    });
+    this.app.once("beforeStop", () => {
+      cronJob.stop();
+    });
+    return cronJob;
+  }
+  async has(token) {
+    return !!await this.repo.findOne({
+      filter: {
+        token
+      }
+    });
+  }
+  async add(values) {
+    return this.repo.model.findOrCreate({
+      defaults: values,
+      where: {
+        token: values.token
+      }
+    });
+  }
+  async deleteByExpiration() {
+    return this.repo.destroy({
+      filter: {
+        expiration: {
+          $dateNotAfter: /* @__PURE__ */ new Date()
+        }
+      }
+    });
+  }
+}
+
+exports.TokenBlacklistService = TokenBlacklistService;

package/package.json

@@ -1,39 +1,28 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "0.11.1-alpha.4",
-  "main": "./lib/server/index.js",
-  "files": [
-    "lib",
-    "src",
-    "README.md",
-    "README.zh-CN.md",
-    "CHANGELOG.md",
-    "server.js",
-    "server.d.ts",
-    "client.js",
-    "client.d.ts"
-  ],
+  "version": "0.12.0-alpha.1",
+  "main": "./dist/server/index.js",
   "devDependencies": {
-    "@ant-design/icons": "^5.1.4",
-    "@formily/react": "2.2.26",
-    "@formily/shared": "2.2.26",
-    "@nocobase/auth": "0.11.1-alpha.4",
-    "@nocobase/test": "0.11.1-alpha.4",
+    "@ant-design/icons": "5.x",
+    "@formily/react": "2.x",
+    "@formily/shared": "2.x",
     "@types/cron": "^2.0.1",
-    "antd": "^5.6.4",
+    "antd": "5.x",
+    "cron": "^2.3.1",
     "react": "^18.2.0",
     "react-i18next": "^11.15.1"
   },
-  "dependencies": {
-    "@nocobase/actions": "0.11.1-alpha.4",
-    "@nocobase/client": "0.11.1-alpha.4",
-    "@nocobase/database": "0.11.1-alpha.4",
-    "@nocobase/server": "0.11.1-alpha.4",
-    "cron": "^2.3.1"
+  "peerDependencies": {
+    "@nocobase/actions": "0.x",
+    "@nocobase/auth": "0.x",
+    "@nocobase/client": "0.x",
+    "@nocobase/database": "0.x",
+    "@nocobase/server": "0.x",
+    "@nocobase/test": "0.x"
   },
   "displayName": "Authentication",
   "displayName.zh-CN": "用户认证",
-  "description": "Basic authentication and authenticator management.",
-  "description.zh-CN": "提供基础认证功能和扩展认证器管理功能。",
-  "gitHead": "d9b5bde913013f1057e1aab49587eb0ad3dcb06e"
+  "description": "Basic authentication and authenticator management",
+  "description.zh-CN": "提供基础认证功能和扩展认证器管理功能",
+  "gitHead": "543dcc0216b7b1451b552b0f685bc3e0682f9d59"
 }

package/server.d.ts

@@ -1,2 +1,2 @@
-export * from './src/server';
-export { default } from './src/server';
+export * from './dist/server';
+export { default } from './dist/server';

package/server.js

@@ -39,7 +39,7 @@ function _interopRequireWildcard(obj, nodeInterop) {
   return newObj;
 }
 
-var _index = _interopRequireWildcard(require('./lib/server'));
+var _index = _interopRequireWildcard(require('./dist/server'));
 
 Object.defineProperty(exports, '__esModule', {
   value: true,

package/lib/client/AuthProvider.js

@@ -1,56 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AuthProvider = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-var _Authenticator = require("./settings/Authenticator");
-var _SigninPage = _interopRequireDefault(require("./basic/SigninPage"));
-var _preset = require("../preset");
-var _SignupPage = _interopRequireDefault(require("./basic/SignupPage"));
-var _locale = require("./locale");
-var _Options = require("./basic/Options");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const AuthProvider = props => {
-  const _useAuthTranslation = (0, _locale.useAuthTranslation)(),
-    t = _useAuthTranslation.t;
-  return _react().default.createElement(_client().SettingsCenterProvider, {
-    settings: {
-      auth: {
-        title: t('Authentication'),
-        icon: 'LoginOutlined',
-        tabs: {
-          authenticators: {
-            title: t('Authenticators'),
-            component: () => _react().default.createElement(_Authenticator.Authenticator, null)
-          }
-        }
-      }
-    }
-  }, _react().default.createElement(_client().OptionsComponentProvider, {
-    authType: _preset.presetAuthType,
-    component: _Options.Options
-  }, _react().default.createElement(_client().SigninPageProvider, {
-    authType: _preset.presetAuthType,
-    tabTitle: t('Sign in via email'),
-    component: _SigninPage.default
-  }, _react().default.createElement(_client().SignupPageProvider, {
-    authType: _preset.presetAuthType,
-    component: _SignupPage.default
-  }, props.children))));
-};
-exports.AuthProvider = AuthProvider;

package/lib/client/basic/Options.js

@@ -1,51 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Options = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-var _locale = require("../locale");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const Options = () => {
-  const _useAuthTranslation = (0, _locale.useAuthTranslation)(),
-    t = _useAuthTranslation.t;
-  return _react().default.createElement(_client().SchemaComponent, {
-    scope: {
-      t
-    },
-    schema: {
-      type: 'object',
-      properties: {
-        public: {
-          type: 'object',
-          properties: {
-            allowSignup: {
-              'x-decorator': 'FormItem',
-              type: 'boolean',
-              title: '{{t("Allow to sign up")}}',
-              'x-component': 'Checkbox',
-              'x-component-props': {
-                defaultChecked: true
-              }
-            }
-          }
-        }
-      }
-    }
-  });
-};
-exports.Options = Options;

package/lib/client/basic/SigninPage.js

@@ -1,100 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-const passwordForm = {
-  type: 'object',
-  name: 'passwordForm',
-  'x-component': 'FormV2',
-  properties: {
-    email: {
-      type: 'string',
-      required: true,
-      'x-component': 'Input',
-      'x-validator': 'email',
-      'x-decorator': 'FormItem',
-      'x-component-props': {
-        placeholder: '{{t("Email")}}',
-        style: {}
-      }
-    },
-    password: {
-      type: 'string',
-      'x-component': 'Password',
-      required: true,
-      'x-decorator': 'FormItem',
-      'x-component-props': {
-        placeholder: '{{t("Password")}}',
-        style: {}
-      }
-    },
-    actions: {
-      type: 'void',
-      'x-component': 'div',
-      properties: {
-        submit: {
-          title: '{{t("Sign in")}}',
-          type: 'void',
-          'x-component': 'Action',
-          'x-component-props': {
-            htmlType: 'submit',
-            block: true,
-            type: 'primary',
-            useAction: `{{ useBasicSignIn }}`,
-            style: {
-              width: '100%'
-            }
-          }
-        }
-      }
-    },
-    signup: {
-      type: 'void',
-      'x-component': 'Link',
-      'x-component-props': {
-        to: '{{ signupLink }}'
-      },
-      'x-content': '{{t("Create an account")}}',
-      'x-visible': '{{ allowSignUp }}'
-    }
-  }
-};
-var _default = props => {
-  const authenticator = props.authenticator;
-  const authType = authenticator.authType,
-    name = authenticator.name,
-    options = authenticator.options;
-  const signupPages = (0, _react().useContext)(_client().SignupPageContext);
-  const allowSignUp = !!signupPages[authType] && (options === null || options === void 0 ? void 0 : options.allowSignup);
-  const signupLink = `/signup?authType=${authType}&name=${name}`;
-  const useBasicSignIn = () => {
-    return (0, _client().useSignIn)(name);
-  };
-  return _react().default.createElement(_client().SchemaComponent, {
-    schema: passwordForm,
-    scope: {
-      useBasicSignIn,
-      allowSignUp,
-      signupLink
-    }
-  });
-};
-exports.default = _default;

package/lib/client/basic/SignupPage.js

@@ -1,131 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
-function _shared() {
-  const data = require("@formily/shared");
-  _shared = function _shared() {
-    return data;
-  };
-  return data;
-}
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const signupPageSchema = {
-  type: 'object',
-  name: (0, _shared().uid)(),
-  'x-component': 'FormV2',
-  properties: {
-    email: {
-      type: 'string',
-      required: true,
-      'x-component': 'Input',
-      'x-validator': 'email',
-      'x-decorator': 'FormItem',
-      'x-component-props': {
-        placeholder: '{{t("Email")}}',
-        style: {}
-      }
-    },
-    password: {
-      type: 'string',
-      required: true,
-      'x-component': 'Password',
-      'x-decorator': 'FormItem',
-      'x-component-props': {
-        placeholder: '{{t("Password")}}',
-        checkStrength: true,
-        style: {}
-      },
-      'x-reactions': [{
-        dependencies: ['.confirm_password'],
-        fulfill: {
-          state: {
-            selfErrors: '{{$deps[0] && $self.value && $self.value !== $deps[0] ? t("Password mismatch") : ""}}'
-          }
-        }
-      }]
-    },
-    confirm_password: {
-      type: 'string',
-      required: true,
-      'x-component': 'Password',
-      'x-decorator': 'FormItem',
-      'x-component-props': {
-        placeholder: '{{t("Confirm password")}}',
-        style: {}
-      },
-      'x-reactions': [{
-        dependencies: ['.password'],
-        fulfill: {
-          state: {
-            selfErrors: '{{$deps[0] && $self.value && $self.value !== $deps[0] ? t("Password mismatch") : ""}}'
-          }
-        }
-      }]
-    },
-    actions: {
-      type: 'void',
-      'x-component': 'div',
-      properties: {
-        submit: {
-          title: '{{t("Sign up")}}',
-          type: 'void',
-          'x-component': 'Action',
-          'x-component-props': {
-            block: true,
-            type: 'primary',
-            htmlType: 'submit',
-            useAction: '{{ useBasicSignup }}',
-            style: {
-              width: '100%'
-            }
-          }
-        }
-      }
-    },
-    link: {
-      type: 'void',
-      'x-component': 'div',
-      properties: {
-        link: {
-          type: 'void',
-          'x-component': 'Link',
-          'x-component-props': {
-            to: '/signin'
-          },
-          'x-content': '{{t("Log in with an existing account")}}'
-        }
-      }
-    }
-  }
-};
-var _default = props => {
-  const useBasicSignup = () => {
-    return (0, _client().useSignup)({
-      authenticator: props.name
-    });
-  };
-  return _react().default.createElement(_client().SchemaComponent, {
-    schema: signupPageSchema,
-    scope: {
-      useBasicSignup
-    }
-  });
-};
-exports.default = _default;

package/lib/client/index.js

@@ -1,27 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.AuthPlugin = void 0;
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
-    return data;
-  };
-  return data;
-}
-var _AuthProvider = require("./AuthProvider");
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-class AuthPlugin extends _client().Plugin {
-  load() {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      _this.app.use(_AuthProvider.AuthProvider);
-    })();
-  }
-}
-exports.AuthPlugin = AuthPlugin;
-var _default = AuthPlugin;
-exports.default = _default;

package/lib/client/locale/index.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.NAMESPACE = void 0;
-exports.useAuthTranslation = useAuthTranslation;
-function _reactI18next() {
-  const data = require("react-i18next");
-  _reactI18next = function _reactI18next() {
-    return data;
-  };
-  return data;
-}
-const NAMESPACE = 'auth';
-exports.NAMESPACE = NAMESPACE;
-function useAuthTranslation() {
-  return (0, _reactI18next().useTranslation)(NAMESPACE);
-}