@nocobase/plugin-idp-oauth 2.1.0-alpha.19 → 2.1.0-alpha.20

package/dist/externalVersion.js

@@ -11,10 +11,10 @@ module.exports = {
   "antd": "5.24.2",
   "react": "18.2.0",
   "react-router-dom": "6.30.1",
-  "@nocobase/client": "2.1.0-alpha.19",
-  "@nocobase/flow-engine": "2.1.0-alpha.19",
-  "@nocobase/server": "2.1.0-alpha.19",
-  "@nocobase/cache": "2.1.0-alpha.19",
-  "@nocobase/utils": "2.1.0-alpha.19",
-  "@nocobase/database": "2.1.0-alpha.19"
+  "@nocobase/client": "2.1.0-alpha.20",
+  "@nocobase/flow-engine": "2.1.0-alpha.20",
+  "@nocobase/server": "2.1.0-alpha.20",
+  "@nocobase/cache": "2.1.0-alpha.20",
+  "@nocobase/utils": "2.1.0-alpha.20",
+  "@nocobase/database": "2.1.0-alpha.20"
 };

package/dist/node_modules/light-my-request/package.json

@@ -1 +1 @@
-{"name":"light-my-request","version":"6.6.0","description":"Fake HTTP injection library","main":"index.js","type":"commonjs","types":"types/index.d.ts","dependencies":{"cookie":"^1.0.1","process-warning":"^4.0.0","set-cookie-parser":"^2.6.0"},"devDependencies":{"@fastify/ajv-compiler":"^4.0.0","@fastify/pre-commit":"^2.1.0","@types/node":"^22.7.7","c8":"^10.1.2","end-of-stream":"^1.4.4","eslint":"^9.17.0","express":"^4.19.2","form-auto-content":"^3.2.1","form-data":"^4.0.0","formdata-node":"^6.0.3","multer":"^1.4.5-lts.1","neostandard":"^0.12.0","tinybench":"^3.0.0","tsd":"^0.31.0","undici":"^7.0.0"},"scripts":{"benchmark":"node benchmark/benchmark.js","coverage":"npm run unit -- --cov --coverage-report=html","lint":"eslint","lint:fix":"eslint --fix","test":"npm run lint && npm run test:unit && npm run test:typescript","test:typescript":"tsd","test:unit":"c8 --100 node --test"},"repository":{"type":"git","url":"git+https://github.com/fastify/light-my-request.git"},"keywords":["http","inject","fake","request","server"],"author":"Tomas Della Vedova - @delvedor (http://delved.org)","contributors":[{"name":"Matteo Collina","email":"hello@matteocollina.com"},{"name":"Manuel Spigolon","email":"behemoth89@gmail.com"},{"name":"Aras Abbasi","email":"aras.abbasi@gmail.com"},{"name":"Frazer Smith","email":"frazer.dev@icloud.com","url":"https://github.com/fdawgs"}],"license":"BSD-3-Clause","bugs":{"url":"https://github.com/fastify/light-my-request/issues"},"homepage":"https://github.com/fastify/light-my-request#readme","funding":[{"type":"github","url":"https://github.com/sponsors/fastify"},{"type":"opencollective","url":"https://opencollective.com/fastify"}],"_lastModified":"2026-04-19T04:12:08.762Z"}
+{"name":"light-my-request","version":"6.6.0","description":"Fake HTTP injection library","main":"index.js","type":"commonjs","types":"types/index.d.ts","dependencies":{"cookie":"^1.0.1","process-warning":"^4.0.0","set-cookie-parser":"^2.6.0"},"devDependencies":{"@fastify/ajv-compiler":"^4.0.0","@fastify/pre-commit":"^2.1.0","@types/node":"^22.7.7","c8":"^10.1.2","end-of-stream":"^1.4.4","eslint":"^9.17.0","express":"^4.19.2","form-auto-content":"^3.2.1","form-data":"^4.0.0","formdata-node":"^6.0.3","multer":"^1.4.5-lts.1","neostandard":"^0.12.0","tinybench":"^3.0.0","tsd":"^0.31.0","undici":"^7.0.0"},"scripts":{"benchmark":"node benchmark/benchmark.js","coverage":"npm run unit -- --cov --coverage-report=html","lint":"eslint","lint:fix":"eslint --fix","test":"npm run lint && npm run test:unit && npm run test:typescript","test:typescript":"tsd","test:unit":"c8 --100 node --test"},"repository":{"type":"git","url":"git+https://github.com/fastify/light-my-request.git"},"keywords":["http","inject","fake","request","server"],"author":"Tomas Della Vedova - @delvedor (http://delved.org)","contributors":[{"name":"Matteo Collina","email":"hello@matteocollina.com"},{"name":"Manuel Spigolon","email":"behemoth89@gmail.com"},{"name":"Aras Abbasi","email":"aras.abbasi@gmail.com"},{"name":"Frazer Smith","email":"frazer.dev@icloud.com","url":"https://github.com/fdawgs"}],"license":"BSD-3-Clause","bugs":{"url":"https://github.com/fastify/light-my-request/issues"},"homepage":"https://github.com/fastify/light-my-request#readme","funding":[{"type":"github","url":"https://github.com/sponsors/fastify"},{"type":"opencollective","url":"https://opencollective.com/fastify"}],"_lastModified":"2026-04-20T10:42:57.367Z"}

package/dist/server/service.js

@@ -217,6 +217,8 @@ class IdpOauthService {
   }
   getRequestResourceConfig(ctx) {
     const requestPath = (0, import_utils2.normalizeBasePath)(ctx.path || this.getRequestPath(ctx) || "/");
+    let matchedConfig;
+    let matchedPathLength = -1;
     for (const config of this.resourceServers.values()) {
       const resourcePath = this.getResourcePath(config);
       if (!resourcePath) {
@@ -226,10 +228,13 @@ class IdpOauthService {
       const isRootResource = normalizedResourcePath === (0, import_utils2.normalizeBasePath)(`${this.getApiBasePath()}/`);
       const matches = requestPath === normalizedResourcePath || requestPath.startsWith(`${normalizedResourcePath}/`) || isRootResource && requestPath.startsWith(`${this.getApiBasePath()}/`);
       if (matches) {
-        return config;
+        if (normalizedResourcePath.length > matchedPathLength) {
+          matchedConfig = config;
+          matchedPathLength = normalizedResourcePath.length;
+        }
       }
     }
-    return void 0;
+    return matchedConfig;
   }
   async getProviderJwks(provider) {
     if (this.resourceJwks.has(provider.issuer)) {
@@ -445,7 +450,10 @@ class IdpOauthService {
     }
     const authorizationHeader = `Bearer ${internalToken}`;
     ctx.req.headers.authorization = authorizationHeader;
+    ctx.request.headers.authorization = authorizationHeader;
+    ctx.getBearerToken = () => internalToken;
     ctx.req.headers["x-authenticator"] = "basic";
+    ctx.request.headers["x-authenticator"] = "basic";
     ctx.state.currentUser = user;
     ctx.auth = ctx.auth || {};
     ctx.auth.user = user;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-idp-oauth",
-  "version": "2.1.0-alpha.19",
+  "version": "2.1.0-alpha.20",
   "main": "dist/server/index.js",
   "displayName": "IdP: OAuth",
   "displayName.zh-CN": "IdP: OAuth",
@@ -20,5 +20,5 @@
   "keywords": [
     "Authentication"
   ],
-  "gitHead": "3d13700360eac1c0f9dbf6a5f167ed396a294a3c"
+  "gitHead": "3d1535db6bf93ca23257faf474afee0d565f54c6"
 }