Support multiple claims in expression #186

enonic · Mar 11, 2024 · 201fb4c · 201fb4c
1 parent 31a6a40
commit 201fb4c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/resources/lib/configFile/configProvider.js b/src/main/resources/lib/configFile/configProvider.js
@@ -5,7 +5,7 @@ const END_SESSION_ADDITIONAL_PARAMETERS_PATTERN = '^idprovider\.[a-zA-Z0-9_-]+\.
 const ADDITIONAL_ENDPOINTS = "^idprovider\.[a-zA-Z0-9_-]+\.additionalEndpoints\.(\\d+)\.(name|url)$";
 
 const parseStringArray = value => value ? value.split(' ').filter(v => !!v) : [];
-const firstAtsToDollar = value => value ? value.replace(/@@\{/, '${') : value;
+const firstAtsToDollar = value => value ? value.replace(/@@\{/g, '${') : value;
 
 const defaultBooleanTrue = value => value !== 'false';
 

diff --git a/src/test/resources/lib/configFile/configIdProvider-test.js b/src/test/resources/lib/configFile/configIdProvider-test.js
@@ -48,7 +48,7 @@ exports.testValidConfig = () => {
                 'idprovider.myidp.additionalEndpoints.1.name': 'name1',
                 'idprovider.myidp.additionalEndpoints.1.url': 'url1',
 
-                'idprovider.myidp.mappings.displayName': '@@{nikname}',
+                'idprovider.myidp.mappings.displayName': '@@{nikname} - @@{userinfo.name}',
                 'idprovider.myidp.mappings.email': '@@{email}',
 
                 'idprovider.myidp.endSession.url': 'endSessionUrl',
@@ -91,7 +91,7 @@ exports.testValidConfig = () => {
 
     test.assertJsonEquals([{name: 'name0', url: 'url0'}, {name: 'name1', url: 'url1'}], config.additionalEndpoints);
 
-    test.assertEquals('${nikname}', config.mappings.displayName);
+    test.assertEquals('${nikname} - ${userinfo.name}', config.mappings.displayName);
     test.assertEquals('${email}', config.mappings.email);
 
     test.assertEquals('endSessionUrl', config.endSession.url);