Merge branch 'keycloak-compat' into 'master'

Add Keycloak compat by using first element of role See merge request framasoft/peertube/official-plugins!2
2020-08-10 11:10:58 +02:00 · 2020-08-10 11:10:58 +02:00 · 4ddcaddb19
commit 4ddcaddb19
parent 0cbf9a69f1 1f7f7f609c
1 changed files with 5 additions and 1 deletions
--- a/peertube-plugin-auth-openid-connect/main.js
+++ b/peertube-plugin-auth-openid-connect/main.js
@ -239,7 +239,11 @@ async function handleCb (peertubeHelpers, settingsManager, req, res) {

    let role
    if (settings['role-property']) {
-      role = parseInt('' + userInfo[settings['role-property']], 10)
+      if (Array.isArray(settings['role-property'])){
+        role = parseInt('' + userInfo[settings['role-property']][0], 10);
+      } else {
+        role = parseInt('' + userInfo[settings['role-property']], 10)
+      }
    }

    let displayName