scimgateway 4.2.2 → 4.2.3

package/README.md

@@ -1165,6 +1165,12 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v4.2.3  
+
+[Fixed]  
+
+- plugin-loki and plugin-mongodb, for multi-value attributes like emails,phoneNumbers,... that includes primary attribute, only one is allowed having primary value set to true in the multi-value set.
+
 ### v4.2.2  
 
 [Fixed]  

package/lib/plugin-loki.js

@@ -267,27 +267,27 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
   const userObj = res[0]
 
   for (const key in attrObj) {
-    if (Array.isArray(attrObj[key])) { // standard, not using type (e.g roles/groups)
-      attrObj[key].forEach(el => {
-        if (el.operation === 'delete') {
-          userObj[key] = userObj[key].filter(e => {
-            if (Object.prototype.hasOwnProperty.call(el, 'value') && el.value !== e.value) return true
-            if (Object.prototype.hasOwnProperty.call(el, 'type') && el.type !== e.type) return true
-            if (Object.prototype.hasOwnProperty.call(el, 'display') && el.display !== e.display) return true
-            if (Object.prototype.hasOwnProperty.call(el, 'primary') && el.primary !== e.primary) return true
-            return false
-          })
-        } else { // add
-          if (!userObj[key]) userObj[key] = []
-          if (Object.prototype.hasOwnProperty.call(el, 'primary')) {
-            if (el.primary === true || (typeof el.primary === 'string' && el.primary.toLowerCase() === 'true')) {
-              // delete any existing primary before adding
-              const index = userObj[key].findIndex(e => e.primary === el.primary)
-              if (index >= 0) userObj[key].splice(index, 1)
+    if (Array.isArray(attrObj[key])) { // standard, not using type (e.g roles/groups) or skipTypeConvert=true
+      const delArr = attrObj[key].filter(el => el.operation === 'delete')
+      const addArr = attrObj[key].filter(el => (!el.operation || el.operation !== 'delete'))
+      if (!userObj[key]) userObj[key] = []
+      // delete
+      userObj[key] = userObj[key].filter(el => {
+        if (delArr.findIndex(e => e.value === el.value) >= 0) return false
+        return true
+      })
+      // add
+      addArr.forEach(el => {
+        if (Object.prototype.hasOwnProperty.call(el, 'primary')) {
+          if (el.primary === true || (typeof el.primary === 'string' && el.primary.toLowerCase() === 'true')) {
+            const index = userObj[key].findIndex(e => e.primary === el.primary)
+            if (index >= 0) {
+              if (key === 'roles') userObj[key].splice(index, 1) // roles, delete existing role having primary attribute true (new role with primary will be added)
+              else userObj[key][index].primary = undefined // remove primary attribute, only one primary
             }
           }
-          userObj[key].push(el)
         }
+        userObj[key].push(el)
       })
     } else if (scimgateway.isMultiValueTypes(key)) { // "type converted object" logic and original blank type having type "undefined"
       if (!attrObj[key]) delete userObj[key] // blank or null
@@ -300,6 +300,15 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
           if (userObj[key].length < 1) delete userObj[key]
         } else { // modify/create multivalue
           if (!userObj[key]) userObj[key] = []
+          if (attrObj[key][el].primary) { // remove any existing primary attribute, should only have one primary set
+            const primVal = attrObj[key][el].primary
+            if (primVal === true || (typeof primVal === 'string' && primVal.toLowerCase() === 'true')) {
+              const index = userObj[key].findIndex(e => e.primary === primVal)
+              if (index >= 0) {
+                userObj[key][index].primary = undefined
+              }
+            }
+          }
           const found = userObj[key].find((e, i) => {
             if (e.type === el || (!e.type && el === 'undefined')) {
               for (const k in attrObj[key][el]) {

package/lib/plugin-mongodb.js

@@ -353,27 +353,27 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
   let userObj = decodeDotDate(res[0])
 
   for (const key in attrObj) {
-    if (Array.isArray(attrObj[key])) { // standard, not using type (e.g roles/groups)
-      attrObj[key].forEach(el => {
-        if (el.operation === 'delete') {
-          userObj[key] = userObj[key].filter(e => {
-            if (Object.prototype.hasOwnProperty.call(el, 'value') && el.value !== e.value) return true
-            if (Object.prototype.hasOwnProperty.call(el, 'type') && el.type !== e.type) return true
-            if (Object.prototype.hasOwnProperty.call(el, 'display') && el.display !== e.display) return true
-            if (Object.prototype.hasOwnProperty.call(el, 'primary') && el.primary !== e.primary) return true
-            return false
-          })
-        } else { // add
-          if (!userObj[key]) userObj[key] = []
-          if (Object.prototype.hasOwnProperty.call(el, 'primary')) {
-            if (el.primary === true || (typeof el.primary === 'string' && el.primary.toLowerCase() === 'true')) {
-              // delete any existing primary before adding
-              const index = userObj[key].findIndex(e => e.primary === el.primary)
-              if (index >= 0) userObj[key].splice(index, 1)
+    if (Array.isArray(attrObj[key])) { // standard, not using type (e.g roles/groups) or skipTypeConvert=true
+      const delArr = attrObj[key].filter(el => el.operation === 'delete')
+      const addArr = attrObj[key].filter(el => (!el.operation || el.operation !== 'delete'))
+      if (!userObj[key]) userObj[key] = []
+      // delete
+      userObj[key] = userObj[key].filter(el => {
+        if (delArr.findIndex(e => e.value === el.value) >= 0) return false
+        return true
+      })
+      // add
+      addArr.forEach(el => {
+        if (Object.prototype.hasOwnProperty.call(el, 'primary')) {
+          if (el.primary === true || (typeof el.primary === 'string' && el.primary.toLowerCase() === 'true')) {
+            const index = userObj[key].findIndex(e => e.primary === el.primary)
+            if (index >= 0) {
+              if (key === 'roles') userObj[key].splice(index, 1) // roles, delete existing role having primary attribute true (new role with primary will be added)
+              else userObj[key][index].primary = undefined // remove primary attribute, only one primary
             }
           }
-          userObj[key].push(el)
         }
+        userObj[key].push(el)
       })
     } else if (scimgateway.isMultiValueTypes(key)) { // "type converted object" logic and original blank type having type "undefined"
       if (!attrObj[key]) delete userObj[key] // blank or null
@@ -386,6 +386,15 @@ scimgateway.modifyUser = async (baseEntity, id, attrObj, ctx) => {
           if (userObj[key].length < 1) delete userObj[key]
         } else { // modify/create multivalue
           if (!userObj[key]) userObj[key] = []
+          if (attrObj[key][el].primary) { // remove any existing primary attribute, should only have one primary set
+            const primVal = attrObj[key][el].primary
+            if (primVal === true || (typeof primVal === 'string' && primVal.toLowerCase() === 'true')) {
+              const index = userObj[key].findIndex(e => e.primary === primVal)
+              if (index >= 0) {
+                userObj[key][index].primary = undefined
+              }
+            }
+          }
           const found = userObj[key].find((e, i) => {
             if (e.type === el || (!e.type && el === 'undefined')) {
               for (const k in attrObj[key][el]) {

package/lib/scimgateway.js

@@ -2604,7 +2604,7 @@ const addSchemas = (data, type, isScimv2, location) => {
   return data
 }
 
-// addPrimaryAttrs cheks for primary attributes and add them as standalone attributes
+// addPrimaryAttrs cheks for primary attributes (only for roles) and add them as standalone attributes
 // some IdP's may check for these e.g. Azure
 // e.g. {roles: [{value: "val1", primary: "True"}]}
 // gives:
@@ -2613,33 +2613,19 @@ const addSchemas = (data, type, isScimv2, location) => {
 //   roles[primary eq "True"].primary: "True"}]
 // }
 const addPrimaryAttrs = (obj) => {
+  const key = 'roles'
   if (!obj || typeof obj !== 'object') return obj
-  let arrObj
-  if (!Array.isArray(obj)) arrObj = [obj]
-  else {
-    if (obj.length < 1) return obj
-    arrObj = obj
-  }
-  let arrRet = []
-  arrRet = arrObj.map(obj => {
-    const o = utils.copyObj(obj)
-    for (const key in o) {
-      if (Array.isArray(o[key]) && key !== 'groups' && key !== 'members') {
-        // check for primary attribute
-        const index = o[key].findIndex(el => (el.primary === true || (typeof el.primary === 'string' && el.primary.toLowerCase() === 'true')))
-        if (index >= 0) {
-          const prim = o[key][index]
-          for (const k in prim) {
-            const primKey = `${key}[primary eq ${typeof prim.primary === 'string' ? `"${prim.primary}"` : prim.primary}].${k}` // roles[primary eq true].value / roles[primary eq "True"].value``
-            o[primKey] = prim[k] // { roles[primary eq true].value : "some-value" }
-          }
-        }
-      }
+  if (!obj[key] || !Array.isArray(obj[key])) return obj
+  const o = utils.copyObj(obj)
+  const index = o[key].findIndex(el => (el.primary === true || (typeof el.primary === 'string' && el.primary.toLowerCase() === 'true')))
+  if (index >= 0) {
+    const prim = o[key][index]
+    for (const k in prim) {
+      const primKey = `${key}[primary eq ${typeof prim.primary === 'string' ? `"${prim.primary}"` : prim.primary}].${k}` // roles[primary eq true].value / roles[primary eq "True"].value``
+      o[primKey] = prim[k] // { roles[primary eq true].value : "some-value" }
     }
-    return o
-  })
-  if (!Array.isArray(obj)) return arrRet[0]
-  return arrRet
+  }
+  return o
 }
 
 //

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "Using SCIM protocol as a gateway for user provisioning to other endpoints",
   "author": "Jarle Elshaug <jarle.elshaug@gmail.com> (https://elshaug.xyz)",
   "homepage": "https://elshaug.xyz",