fix: ensure client is still valid after custom metadata processing

panva · Jul 14, 2020 · fded7c6 · fded7c6
1 parent 7afe4f3
commit fded7c6
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/lib/helpers/client_schema.js b/lib/helpers/client_schema.js
@@ -212,7 +212,7 @@ module.exports = function getSchema(provider) {
   };
 
   class Schema {
-    constructor(metadata, ctx) {
+    constructor(metadata, ctx, processCustomMetadata = !!configuration.extraClientMetadata.properties.length) {
       // unless explicitly provided use token_* values
       ['revocation', 'introspection'].forEach((endpoint) => {
         if (metadata[`${endpoint}_endpoint_auth_method`] === undefined) {
@@ -334,8 +334,15 @@ module.exports = function getSchema(provider) {
         }
       }
 
-      this.processCustomMetadata(ctx);
+      if (processCustomMetadata) {
+        this.processCustomMetadata(ctx);
+      }
+
       this.ensureStripUnrecognized();
+
+      if (processCustomMetadata) {
+        return new Schema(this, ctx, false);
+      }
     }
 
     invalidate(message, code) { // eslint-disable-line class-methods-use-this, no-unused-vars