scimgateway 4.2.7 → 4.2.9

package/.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "14"
+  - "16"
 
 sudo: false
 

package/README.md

@@ -1169,11 +1169,23 @@ MIT © [Jarle Elshaug](https://www.elshaug.xyz)
 
 ## Change log  
 
+### v4.2.9  
+
+[Fixed] 
+
+- installation require nodejs >= v.16.0.0 due to previous dependencies bump
+
+### v4.2.8  
+
+[Fixed] 
+
+- PUT did not allow group name to be modified
+
 ### v4.2.7  
 
 [Added]  
 
-- new plugin configuration **scim.usePutGroupMemberOfUser** can be set to true or false, default false. `PUT /Users/<user>` will replace the user bjensen with body content. If body contains groups and usePutGroupMemberOfUser=true, groups will be set on user object (groups are member of user) instead of default user member of groups  
+- new plugin configuration **scim.usePutGroupMemberOfUser** can be set to true or false, default false. `PUT /Users/<user>` will replace user with body content. If body contains groups and usePutGroupMemberOfUser=true, groups will be set on user object (groups are member of user) instead of default user member of groups  
 - plugin-forwardinc renamed to plugin-soap
 - Dependencies bump  
 

package/lib/scimgateway.js

@@ -1280,6 +1280,7 @@ const ScimGateway = function () {
         ctx.body = e
         return
       }
+      delete scimdata.id
       logger.debug(`${gwName}[${pluginName}] calling "${handle.modifyMethod}" and awaiting result`)
       try {
         await this[handle.modifyMethod](ctx.params.baseEntity, id, scimdata, ctx.ctxCopy)
@@ -1291,21 +1292,25 @@ const ScimGateway = function () {
         logger.debug(`${gwName}[${pluginName}] calling "${handle.getMethod}" and awaiting result`)
         const res = await this[handle.getMethod](ctx.params.baseEntity, { attribute: 'id', operator: 'eq', value: id }, ctx.query.attributes ? ctx.query.attributes.split(',').map(item => item.trim()) : [], ctx.ctxCopy)
 
-        if (!res || !res.Resources || !Array.isArray(res.Resources)) {
-          throw new Error(`using ${handle.getMethod} to retrive ${id} after ${handle.modifyMethod} - got invalid response: ${res}`)
+        scimdata = {
+          Resources: []
         }
-        if (res.Resources.length > 1) {
-          throw new Error(`using ${handle.getMethod} to retrive ${id} after ${handle.modifyMethod} - response returned ${res.Resources.length} objects`)
-        }
-        if (res.Resources.length === 0) {
+        if (res) {
+          if (res.Resources && Array.isArray(res.Resources)) {
+            scimdata.Resources = res.Resources
+          } else if (Array.isArray(res)) scimdata.Resources = res
+          else if (typeof (res) === 'object') scimdata.Resources[0] = res
+          else scimdata.Resources = []
+        } else scimdata.Resources = []
+        if (scimdata.Resources.length === 0 || scimdata.Resources.length > 1) {
           ctx.status = 204
           return
         }
 
         const location = ctx.origin + ctx.path
         ctx.set('Location', location)
-        res.Resources[0] = addPrimaryAttrs(res.Resources[0])
-        scimdata = utils.stripObj(res.Resources[0], ctx.query.attributes, ctx.query.excludedAttributes)
+        const userObj = addPrimaryAttrs(scimdata.Resources[0])
+        scimdata = utils.stripObj(userObj, ctx.query.attributes, ctx.query.excludedAttributes)
         scimdata = addSchemas(scimdata, handle.description, isScimv2)
         ctx.status = 200
         ctx.body = scimdata
@@ -1377,12 +1382,12 @@ const ScimGateway = function () {
         // merge cleared object with the new
         const newObj = utils.extendObj(clearedObj, jsonBody)
         delete newObj.id
-        delete newObj.userName
-        delete newObj.externalId
         delete newObj.schemas
         delete newObj.meta
         if (!config.scim.usePutGroupMemberOfUser) delete newObj.groups
-        if (handle.getMethod === handler.groups.getMethod) delete newObj.displayName
+        // not allowing userName/displayName set to blank
+        if (!newObj.userName) delete newObj.userName
+        if (!newObj.displayName) delete newObj.displayName
 
         let [scimdata, err] = ScimGateway.prototype.convertedScim(newObj)
         if (err) throw err
@@ -1488,17 +1493,21 @@ const ScimGateway = function () {
         logger.debug(`${gwName}[${pluginName}] calling "${handle.getMethod}" and awaiting result`)
         res = await this[handle.getMethod](ctx.params.baseEntity, { attribute: 'id', operator: 'eq', value: id }, [], ctx.ctxCopy)
 
-        if (!res || !res.Resources || !Array.isArray(res.Resources)) {
-          throw new Error(`put using method ${handle.getMethod} - got unexpected response: ${JSON.stringify(res)}`)
-        }
-        if (res.Resources.length > 1) {
-          throw new Error(`put using method ${handle.getMethod} to retrive ${id} - response returned ${res.Resources.length} objects`)
+        scimdata = {
+          Resources: []
         }
-        if (res.Resources.length === 0) {
+        if (res) {
+          if (res.Resources && Array.isArray(res.Resources)) {
+            scimdata.Resources = res.Resources
+          } else if (Array.isArray(res)) scimdata.Resources = res
+          else if (typeof (res) === 'object') scimdata.Resources[0] = res
+          else scimdata.Resources = []
+        } else scimdata.Resources = []
+        if (scimdata.Resources.length === 0 || scimdata.Resources.length > 1) {
           ctx.status = 204
           return
         }
-        scimdata = res.Resources[0]
+        scimdata = scimdata.Resources[0]
 
         // include groups
         if (!config.scim.usePutGroupMemberOfUser) { // default user member of group

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scimgateway",
-  "version": "4.2.7",
+  "version": "4.2.9",
   "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",
@@ -29,7 +29,7 @@
     "iga"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "dependencies": {
     "@godaddy/terminus": "^4.12.0",