@muze-nl/metro-oidc 0.8.0 → 0.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@muze-nl/metro-oidc",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "oidc client middleware for @muze-nl/metro",
   "type": "module",
   "source": [
@@ -53,9 +53,9 @@
   ],
   "dependencies": {
     "@muze-nl/assert": "^0.6.0",
-    "@muze-nl/metro-core": "^0.8.0",
-    "@muze-nl/metro-middleware": "^0.8.0",
-    "@muze-nl/metro-oauth2": "^0.8.2",
+    "@muze-nl/metro-core": "^0.9.0",
+    "@muze-nl/metro-middleware": "^0.9.0",
+    "@muze-nl/metro-oauth2": "^0.9.0",
     "jose": "^6.2.3"
   },
   "exports": {

package/src/oidcmw.mjs

@@ -24,6 +24,7 @@ export default function oidcmw(options={}) {
 	}
 
 	options = Object.assign({}, defaultOptions, options)
+	const requestedClientInfo = options.client_info
 
 	assert(options, {
 		client: Required(instanceOf(metro.client().constructor)), // required because it is set in defaultOptions
@@ -40,7 +41,10 @@ export default function oidcmw(options={}) {
 		options.openid_configuration = options.store.get('openid_configuration')
 	}
 	if (!options.client_info?.client_id && options.store.has('client_info')) {
-		options.client_info = options.store.get('client_info')
+		const storedClientInfo = options.store.get('client_info')
+		if (clientInfoMatchesRequest(storedClientInfo, requestedClientInfo)) {
+			options.client_info = storedClientInfo
+		}
 	}
 
 	return async (req, next) => {
@@ -169,6 +173,17 @@ export default function oidcmw(options={}) {
 
 }
 
+function clientInfoMatchesRequest(storedClientInfo, requestedClientInfo) {
+	if (!storedClientInfo?.client_id) {
+		return false
+	}
+	if (!Array.isArray(requestedClientInfo?.redirect_uris)) {
+		return true
+	}
+	const storedRedirectUris = new Set(storedClientInfo.redirect_uris || [])
+	return requestedClientInfo.redirect_uris.every(uri => storedRedirectUris.has(uri))
+}
+
 export function isRedirected() {
 	return oauth2.isRedirected()
 }