@nocobase/plugin-auth 2.2.34 → 2.2.35

package/dist/externalVersion.js

@@ -8,21 +8,21 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.2.34",
+  "@nocobase/client": "2.2.35",
   "react": "18.2.0",
   "react-router-dom": "6.30.1",
-  "@nocobase/utils": "2.2.34",
+  "@nocobase/utils": "2.2.35",
   "axios": "1.20.0",
   "lodash": "4.18.1",
-  "@nocobase/client-v2": "2.2.34",
-  "@nocobase/flow-engine": "2.2.34",
+  "@nocobase/client-v2": "2.2.35",
+  "@nocobase/flow-engine": "2.2.35",
   "react-i18next": "11.18.6",
-  "@nocobase/auth": "2.2.34",
-  "@nocobase/database": "2.2.34",
-  "@nocobase/cache": "2.2.34",
-  "@nocobase/server": "2.2.34",
-  "@nocobase/logger": "2.2.34",
-  "@nocobase/test": "2.2.34",
+  "@nocobase/auth": "2.2.35",
+  "@nocobase/database": "2.2.35",
+  "@nocobase/cache": "2.2.35",
+  "@nocobase/server": "2.2.35",
+  "@nocobase/logger": "2.2.35",
+  "@nocobase/test": "2.2.35",
   "@formily/antd-v5": "1.2.3",
   "antd": "5.24.2",
   "@formily/shared": "2.3.7",
@@ -30,6 +30,6 @@ module.exports = {
   "@emotion/css": "11.13.0",
   "@ant-design/icons": "5.6.1",
   "ahooks": "3.7.8",
-  "@nocobase/actions": "2.2.34",
+  "@nocobase/actions": "2.2.35",
   "@formily/core": "2.3.7"
 };

package/dist/node_modules/cron/package.json

@@ -1 +1 @@
-{"name":"cron","description":"Cron jobs for your node","version":"2.4.4","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":"lib/cron","scripts":{"lint":"eslint {lib,tests}/*.js","test":"jest --coverage","test:watch":"jest --watch --coverage","test:types":"tsd","prepare":"husky install","release":"semantic-release"},"types":"types/index.d.ts","dependencies":{"@types/luxon":"~3.3.0","luxon":"~3.3.0"},"devDependencies":{"@commitlint/cli":"~17.6.6","@insurgentlab/commitlint-config":"^18.1.0","@insurgentlab/conventional-changelog-preset":"~6.0.3","@semantic-release/changelog":"~6.0.x","@semantic-release/commit-analyzer":"~9.0.x","@semantic-release/git":"~10.0.x","@semantic-release/github":"~8.1.x","@semantic-release/npm":"~10.0.x","@semantic-release/release-notes-generator":"~11.0.x","chai":"~4.2.x","eslint":"~8.36.x","eslint-config-prettier":"^8.7.x","eslint-config-standard":"~17.0.x","eslint-plugin-import":"~2.27.x","eslint-plugin-jest":"~27.2.x","eslint-plugin-n":"~15.6.x","eslint-plugin-prettier":"~4.2.x","eslint-plugin-promise":"~6.1.x","husky":"^8.0.3","jest":"~29.5.x","prettier":"~2.8.x","semantic-release":"~21.0.x","sinon":"^15.0.x","tsd":"^0.28.1"},"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)","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)"],"jest":{"collectCoverage":true,"collectCoverageFrom":["lib/*.js"],"coverageThreshold":{"global":{"statements":80,"branches":80,"functions":70,"lines":80}}},"files":["lib","types","CHANGELOG.md","LICENSE","README.md"],"_lastModified":"2026-10-27T03:00:36.689Z"}
+{"name":"cron","description":"Cron jobs for your node","version":"2.4.4","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":"lib/cron","scripts":{"lint":"eslint {lib,tests}/*.js","test":"jest --coverage","test:watch":"jest --watch --coverage","test:types":"tsd","prepare":"husky install","release":"semantic-release"},"types":"types/index.d.ts","dependencies":{"@types/luxon":"~3.3.0","luxon":"~3.3.0"},"devDependencies":{"@commitlint/cli":"~17.6.6","@insurgentlab/commitlint-config":"^18.1.0","@insurgentlab/conventional-changelog-preset":"~6.0.3","@semantic-release/changelog":"~6.0.x","@semantic-release/commit-analyzer":"~9.0.x","@semantic-release/git":"~10.0.x","@semantic-release/github":"~8.1.x","@semantic-release/npm":"~10.0.x","@semantic-release/release-notes-generator":"~11.0.x","chai":"~4.2.x","eslint":"~8.36.x","eslint-config-prettier":"^8.7.x","eslint-config-standard":"~17.0.x","eslint-plugin-import":"~2.27.x","eslint-plugin-jest":"~27.2.x","eslint-plugin-n":"~15.6.x","eslint-plugin-prettier":"~4.2.x","eslint-plugin-promise":"~6.1.x","husky":"^8.0.3","jest":"~29.5.x","prettier":"~2.8.x","semantic-release":"~21.0.x","sinon":"^15.0.x","tsd":"^0.28.1"},"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)","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)"],"jest":{"collectCoverage":true,"collectCoverageFrom":["lib/*.js"],"coverageThreshold":{"global":{"statements":80,"branches":80,"functions":70,"lines":80}}},"files":["lib","types","CHANGELOG.md","LICENSE","README.md"],"_lastModified":"2026-10-28T02:42:23.931Z"}

package/dist/node_modules/ms/package.json

@@ -1 +1 @@
-{"name":"ms","version":"2.1.3","description":"Tiny millisecond conversion utility","repository":"vercel/ms","main":"./index","files":["index.js"],"scripts":{"precommit":"lint-staged","lint":"eslint lib/* bin/*","test":"mocha tests.js"},"eslintConfig":{"extends":"eslint:recommended","env":{"node":true,"es6":true}},"lint-staged":{"*.js":["npm run lint","prettier --single-quote --write","git add"]},"license":"MIT","devDependencies":{"eslint":"4.18.2","expect.js":"0.3.1","husky":"0.14.3","lint-staged":"5.0.0","mocha":"4.0.1","prettier":"2.0.5"},"_lastModified":"2026-10-27T03:00:36.779Z"}
+{"name":"ms","version":"2.1.3","description":"Tiny millisecond conversion utility","repository":"vercel/ms","main":"./index","files":["index.js"],"scripts":{"precommit":"lint-staged","lint":"eslint lib/* bin/*","test":"mocha tests.js"},"eslintConfig":{"extends":"eslint:recommended","env":{"node":true,"es6":true}},"lint-staged":{"*.js":["npm run lint","prettier --single-quote --write","git add"]},"license":"MIT","devDependencies":{"eslint":"4.18.2","expect.js":"0.3.1","husky":"0.14.3","lint-staged":"5.0.0","mocha":"4.0.1","prettier":"2.0.5"},"_lastModified":"2026-10-28T02:42:24.018Z"}

package/dist/server/storer.d.ts

@@ -23,8 +23,10 @@ export declare class Storer implements IStorer {
         cache: Cache;
         authManager: AuthManager;
     });
+    private getAuthConfig;
+    private prepare;
     renderJsonTemplate(authenticator: any): any;
     getCache(): Promise<AuthModel[]>;
     setCache(authenticators: AuthModel[]): Promise<void>;
-    get(name: string): Promise<AuthModel>;
+    get(name: string): Promise<any>;
 }

package/dist/server/storer.js

@@ -29,6 +29,7 @@ __export(storer_exports, {
   Storer: () => Storer
 });
 module.exports = __toCommonJS(storer_exports);
+const RENDERED = Symbol("authenticatorOptionsRendered");
 class Storer {
   db;
   cache;
@@ -50,25 +51,37 @@ class Storer {
         await this.cache.delValueInObject(this.key, model.name);
         return;
       }
-      await this.cache.setValueInObject(this.key, model.name, this.renderJsonTemplate(model));
+      await this.cache.setValueInObject(this.key, model.name, this.prepare(model));
     });
     this.db.on("authenticators.afterDestroy", async (model) => {
       await this.cache.delValueInObject(this.key, model.name);
     });
   }
-  renderJsonTemplate(authenticator) {
+  getAuthConfig(authType) {
     var _a, _b;
+    return (_b = (_a = this.authManager) == null ? void 0 : _a.getAuthConfig) == null ? void 0 : _b.call(_a, authType);
+  }
+  prepare(authenticator) {
+    return this.renderJsonTemplate(authenticator);
+  }
+  renderJsonTemplate(authenticator) {
+    var _a, _b, _c;
     if (!authenticator) {
       return authenticator;
     }
-    const $env = (_a = this.app) == null ? void 0 : _a.environment;
-    if (!$env) {
+    const options = (_a = authenticator.dataValues) == null ? void 0 : _a.options;
+    if (options && authenticator[RENDERED] === options) {
+      return authenticator;
+    }
+    const $env = (_b = this.app) == null ? void 0 : _b.environment;
+    const config = this.getAuthConfig(authenticator.authType);
+    if (!$env || !config) {
       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"]
+    authenticator.dataValues.options = $env.renderJsonTemplate(options, {
+      omit: (_c = config.auth) == null ? void 0 : _c["optionsKeysNotAllowedInEnv"]
     });
+    authenticator[RENDERED] = authenticator.dataValues.options;
     return authenticator;
   }
   async getCache() {
@@ -80,7 +93,7 @@ class Storer {
   }
   async setCache(authenticators) {
     const obj = authenticators.reduce((obj2, authenticator) => {
-      obj2[authenticator.name] = this.renderJsonTemplate(authenticator);
+      obj2[authenticator.name] = this.prepare(authenticator);
       return obj2;
     }, {});
     await this.cache.set(this.key, obj);
@@ -93,8 +106,8 @@ class Storer {
       await this.setCache(authenticators);
       authenticators = await this.getCache();
     }
-    const authenticator = authenticators.find((authenticator2) => authenticator2.name === name);
-    return authenticator || authenticators[0];
+    const authenticator = authenticators.find((authenticator2) => authenticator2.name === name) || authenticators[0];
+    return this.renderJsonTemplate(authenticator);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-auth",
-  "version": "2.2.34",
+  "version": "2.2.35",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/auth",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/auth",
@@ -31,7 +31,7 @@
   "description": "User authentication management, including password, SMS, and support for Single Sign-On (SSO) protocols, with extensibility.",
   "description.ru-RU": "Управление аутентификацией пользователей: пароли, SMS, поддержка протоколов единого входа (SSO) и возможность расширения.",
   "description.zh-CN": "用户认证管理，包括基础的密码认证、短信认证、SSO 协议的认证等，可扩展。",
-  "gitHead": "b346c56df2f2413ff1ff26fe66cf4c8d93018586",
+  "gitHead": "13ccdcf7d176e839b42bd530b58e4b9639e46d3f",
   "keywords": [
     "Authentication",
     "Security"