@tachybase/module-auth 0.23.47 → 0.23.58

package/dist/externalVersion.js

@@ -1,16 +1,16 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "0.23.47",
+  "@tachybase/client": "0.23.58",
   "react-router-dom": "6.28.1",
-  "@tachybase/utils": "0.23.47",
-  "@tachybase/auth": "0.23.47",
-  "@tachybase/database": "0.23.47",
-  "@tachybase/cache": "0.23.47",
-  "@tachybase/server": "0.23.47",
-  "@tachybase/test": "0.23.47",
+  "@tachybase/utils": "0.23.58",
+  "@tachybase/auth": "0.23.58",
+  "@tachybase/database": "0.23.58",
+  "@tachybase/cache": "0.23.58",
+  "@tachybase/server": "0.23.58",
+  "@tachybase/test": "0.23.58",
   "antd": "5.22.5",
-  "@tachybase/schema": "0.23.47",
+  "@tachybase/schema": "0.23.58",
   "react-i18next": "15.2.0",
   "@ant-design/icons": "5.3.7",
-  "@tachybase/actions": "0.23.47"
+  "@tachybase/actions": "0.23.58"
 };

package/dist/node_modules/cron/package.json

@@ -1 +1 @@
-{"name":"cron","description":"Cron jobs for your node","version":"3.3.1","author":"Nick Campbell <nicholas.j.campbell@gmail.com> (https://github.com/ncb000gt)","bugs":{"url":"https://github.com/kelektiv/node-cron/issues"},"repository":{"type":"git","url":"https://github.com/kelektiv/node-cron.git"},"main":"dist/index.js","types":"dist/index.d.ts","scripts":{"build":"tsc -b tsconfig.build.json","lint:eslint":"eslint src/ tests/","lint:prettier":"prettier ./**/*.{json,md,yml} --check","lint":"npm run lint:eslint && npm run lint:prettier","lint:fix":"npm run lint:eslint -- --fix && npm run lint:prettier -- --write","test":"jest --coverage","test:watch":"jest --watch --coverage","test:fuzz":"jest  --testMatch='**/*.fuzz.ts' --coverage=false --testTimeout=120000","prepare":"husky"},"dependencies":{"@types/luxon":"~3.4.0","luxon":"~3.5.0"},"devDependencies":{"@commitlint/cli":"19.6.0","@eslint/js":"^9.14.0","@fast-check/jest":"2.0.3","@insurgent/commitlint-config":"20.0.0","@insurgent/conventional-changelog-preset":"10.0.0","@semantic-release/changelog":"6.0.3","@semantic-release/commit-analyzer":"13.0.0","@semantic-release/git":"10.0.1","@semantic-release/github":"11.0.1","@semantic-release/npm":"12.0.1","@semantic-release/release-notes-generator":"14.0.1","@types/jest":"29.5.14","@types/node":"20.17.9","@types/sinon":"17.0.3","chai":"4.5.0","eslint":"8.57.1","eslint-config-prettier":"9.1.0","eslint-plugin-jest":"27.9.0","eslint-plugin-prettier":"5.2.1","husky":"9.1.7","jest":"29.7.0","lint-staged":"15.2.10","prettier":"3.3.3","semantic-release":"24.2.0","sinon":"17.0.2","ts-jest":"29.2.5","typescript":"5.7.2","typescript-eslint":"^7.2.0"},"keywords":["cron","node cron","node-cron","schedule","scheduler","cronjob","cron job"],"license":"MIT","contributors":["Brandon der Blätter <https://interlucid.com/contact/> (https://github.com/intcreator)","Pierre Cavin <me@sherlox.io> (https://github.com/sheerlox)","Romain Beauxis <toots@rastageeks.org> (https://github.com/toots)","James Padolsey <> (https://github.com/jamespadolsey)","Finn Herpich <fh@three-heads.de> (https://github.com/ErrorProne)","Clifton Cunningham <clifton.cunningham@gmail.com> (https://github.com/cliftonc)","Eric Abouaf <eric.abouaf@gmail.com> (https://github.com/neyric)","humanchimp <morphcham@gmail.com> (https://github.com/humanchimp)","Craig Condon <craig@spiceapps.com> (https://github.com/spiceapps)","Dan Bear <daniel@hulu.com> (https://github.com/danhbear)","Vadim Baryshev <vadimbaryshev@gmail.com> (https://github.com/baryshev)","Leandro Ferrari <lfthomaz@gmail.com> (https://github.com/lfthomaz)","Gregg Zigler <greggzigler@gmail.com> (https://github.com/greggzigler)","Jordan Abderrachid <jabderrachid@gmail.com> (https://github.com/jordanabderrachid)","Masakazu Matsushita <matsukaz@gmail.com> (matsukaz)","Christopher Lunt <me@kirisu.co.uk> (https://github.com/kirisu)"],"files":["dist/**/*.js","dist/**/*.d.ts","CHANGELOG.md","LICENSE","README.md"],"lint-staged":{"*.ts":"eslint src/ tests/ --fix","*.{json,md,yml}":"prettier ./**/*.{json,md,yml} --check --write"},"_lastModified":"2025-02-21T02:25:45.083Z"}
+{"name":"cron","description":"Cron jobs for your node","version":"3.3.1","author":"Nick Campbell <nicholas.j.campbell@gmail.com> (https://github.com/ncb000gt)","bugs":{"url":"https://github.com/kelektiv/node-cron/issues"},"repository":{"type":"git","url":"https://github.com/kelektiv/node-cron.git"},"main":"dist/index.js","types":"dist/index.d.ts","scripts":{"build":"tsc -b tsconfig.build.json","lint:eslint":"eslint src/ tests/","lint:prettier":"prettier ./**/*.{json,md,yml} --check","lint":"npm run lint:eslint && npm run lint:prettier","lint:fix":"npm run lint:eslint -- --fix && npm run lint:prettier -- --write","test":"jest --coverage","test:watch":"jest --watch --coverage","test:fuzz":"jest  --testMatch='**/*.fuzz.ts' --coverage=false --testTimeout=120000","prepare":"husky"},"dependencies":{"@types/luxon":"~3.4.0","luxon":"~3.5.0"},"devDependencies":{"@commitlint/cli":"19.6.0","@eslint/js":"^9.14.0","@fast-check/jest":"2.0.3","@insurgent/commitlint-config":"20.0.0","@insurgent/conventional-changelog-preset":"10.0.0","@semantic-release/changelog":"6.0.3","@semantic-release/commit-analyzer":"13.0.0","@semantic-release/git":"10.0.1","@semantic-release/github":"11.0.1","@semantic-release/npm":"12.0.1","@semantic-release/release-notes-generator":"14.0.1","@types/jest":"29.5.14","@types/node":"20.17.9","@types/sinon":"17.0.3","chai":"4.5.0","eslint":"8.57.1","eslint-config-prettier":"9.1.0","eslint-plugin-jest":"27.9.0","eslint-plugin-prettier":"5.2.1","husky":"9.1.7","jest":"29.7.0","lint-staged":"15.2.10","prettier":"3.3.3","semantic-release":"24.2.0","sinon":"17.0.2","ts-jest":"29.2.5","typescript":"5.7.2","typescript-eslint":"^7.2.0"},"keywords":["cron","node cron","node-cron","schedule","scheduler","cronjob","cron job"],"license":"MIT","contributors":["Brandon der Blätter <https://interlucid.com/contact/> (https://github.com/intcreator)","Pierre Cavin <me@sherlox.io> (https://github.com/sheerlox)","Romain Beauxis <toots@rastageeks.org> (https://github.com/toots)","James Padolsey <> (https://github.com/jamespadolsey)","Finn Herpich <fh@three-heads.de> (https://github.com/ErrorProne)","Clifton Cunningham <clifton.cunningham@gmail.com> (https://github.com/cliftonc)","Eric Abouaf <eric.abouaf@gmail.com> (https://github.com/neyric)","humanchimp <morphcham@gmail.com> (https://github.com/humanchimp)","Craig Condon <craig@spiceapps.com> (https://github.com/spiceapps)","Dan Bear <daniel@hulu.com> (https://github.com/danhbear)","Vadim Baryshev <vadimbaryshev@gmail.com> (https://github.com/baryshev)","Leandro Ferrari <lfthomaz@gmail.com> (https://github.com/lfthomaz)","Gregg Zigler <greggzigler@gmail.com> (https://github.com/greggzigler)","Jordan Abderrachid <jabderrachid@gmail.com> (https://github.com/jordanabderrachid)","Masakazu Matsushita <matsukaz@gmail.com> (matsukaz)","Christopher Lunt <me@kirisu.co.uk> (https://github.com/kirisu)"],"files":["dist/**/*.js","dist/**/*.d.ts","CHANGELOG.md","LICENSE","README.md"],"lint-staged":{"*.ts":"eslint src/ tests/ --fix","*.{json,md,yml}":"prettier ./**/*.{json,md,yml} --check --write"},"_lastModified":"2025-03-06T09:57:23.111Z"}

package/dist/server/collections/users-authenticators.js

@@ -32,6 +32,13 @@ var users_authenticators_default = (0, import_database.defineCollection)({
   updatedBy: true,
   logging: true,
   fields: [
+    {
+      name: "id",
+      type: "bigInt",
+      autoIncrement: true,
+      primaryKey: true,
+      allowNull: false
+    },
     /**
      * uuid:
      * Unique user id of the authentication method, such as wechat openid, phone number, etc.

package/dist/server/plugin.js

@@ -64,8 +64,10 @@ class PluginAuthServer extends import_server.Plugin {
       store: "memory"
     });
     const storer = new import_storer.Storer({
+      app: this.app,
       db: this.db,
-      cache: this.cache
+      cache: this.cache,
+      authManager: this.app.authManager
     });
     this.app.authManager.setStorer(storer);
     if (!this.app.authManager.jwt.blacklist) {

package/dist/server/storer.d.ts

@@ -1,15 +1,21 @@
-import { Storer as IStorer } from '@tachybase/auth';
+import { AuthManager, Storer as IStorer } from '@tachybase/auth';
 import { Cache } from '@tachybase/cache';
 import { Database } from '@tachybase/database';
+import { Application } from '@tachybase/server';
 import { AuthModel } from './model/authenticator';
 export declare class Storer implements IStorer {
     db: Database;
     cache: Cache;
+    app: Application;
+    authManager: AuthManager;
     key: string;
-    constructor({ db, cache }: {
+    constructor({ app, db, cache, authManager, }: {
+        app?: Application;
         db: Database;
         cache: Cache;
+        authManager: AuthManager;
     });
+    renderJsonTemplate(authenticator: any): any;
     getCache(): Promise<AuthModel[]>;
     setCache(authenticators: AuthModel[]): Promise<void>;
     get(name: string): Promise<AuthModel>;

package/dist/server/storer.js

@@ -21,21 +21,43 @@ __export(storer_exports, {
 });
 module.exports = __toCommonJS(storer_exports);
 class Storer {
-  constructor({ db, cache }) {
+  constructor({
+    app,
+    db,
+    cache,
+    authManager
+  }) {
     this.key = "authenticators";
+    this.app = app;
     this.db = db;
     this.cache = cache;
+    this.authManager = authManager;
     this.db.on("authenticators.afterSave", async (model) => {
       if (!model.enabled) {
         await this.cache.delValueInObject(this.key, model.name);
         return;
       }
-      await this.cache.setValueInObject(this.key, model.name, model);
+      await this.cache.setValueInObject(this.key, model.name, this.renderJsonTemplate(model));
     });
     this.db.on("authenticators.afterDestroy", async (model) => {
       await this.cache.delValueInObject(this.key, model.name);
     });
   }
+  renderJsonTemplate(authenticator) {
+    var _a, _b;
+    if (!authenticator) {
+      return authenticator;
+    }
+    const $env = (_a = this.app) == null ? void 0 : _a.environment;
+    if (!$env) {
+      return authenticator;
+    }
+    const config = this.authManager.getAuthConfig(authenticator.authType);
+    authenticator.dataValues.options = $env.renderJsonTemplate(authenticator.dataValues.options, {
+      omit: (_b = config == null ? void 0 : config.auth) == null ? void 0 : _b["optionsKeysNotAllowedInEnv"]
+    });
+    return authenticator;
+  }
   async getCache() {
     const authenticators = await this.cache.get(this.key);
     if (!authenticators) {
@@ -45,7 +67,7 @@ class Storer {
   }
   async setCache(authenticators) {
     const obj = authenticators.reduce((obj2, authenticator) => {
-      obj2[authenticator.name] = authenticator;
+      obj2[authenticator.name] = this.renderJsonTemplate(authenticator);
       return obj2;
     }, {});
     await this.cache.set(this.key, obj);
@@ -56,6 +78,7 @@ class Storer {
       const repo = this.db.getRepository("authenticators");
       authenticators = await repo.find({ filter: { enabled: true } });
       await this.setCache(authenticators);
+      authenticators = await this.getCache();
     }
     const authenticator = authenticators.find((authenticator2) => authenticator2.name === name);
     return authenticator || authenticators[0];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/module-auth",
   "displayName": "Authentication",
-  "version": "0.23.47",
+  "version": "0.23.58",
   "description": "User authentication management, including password, SMS, and support for Single Sign-On (SSO) protocols, with extensibility.",
   "keywords": [
     "Authentication"
@@ -15,17 +15,17 @@
     "react": "^18.3.1",
     "react-i18next": "^15.2.0",
     "react-router-dom": "6.28.1",
-    "@tachybase/schema": "0.23.47"
+    "@tachybase/schema": "0.23.58"
   },
   "peerDependencies": {
-    "@tachybase/actions": "0.23.47",
-    "@tachybase/auth": "0.23.47",
-    "@tachybase/client": "0.23.47",
-    "@tachybase/database": "0.23.47",
-    "@tachybase/server": "0.23.47",
-    "@tachybase/cache": "0.23.47",
-    "@tachybase/test": "0.23.47",
-    "@tachybase/utils": "0.23.47"
+    "@tachybase/actions": "0.23.58",
+    "@tachybase/auth": "0.23.58",
+    "@tachybase/cache": "0.23.58",
+    "@tachybase/client": "0.23.58",
+    "@tachybase/database": "0.23.58",
+    "@tachybase/server": "0.23.58",
+    "@tachybase/test": "0.23.58",
+    "@tachybase/utils": "0.23.58"
   },
   "description.zh-CN": "用户认证管理，包括基础的密码认证、短信认证、SSO 协议的认证等，可扩展。",
   "displayName.zh-CN": "用户认证",