scimgateway 5.3.4 → 5.3.6

package/test/lib/plugin-loki_test.ts

@@ -28,7 +28,7 @@ async function fetchSCIM(method: string, endpoint: string, body?: any, headers?:
     body: body ? JSON.stringify(body) : undefined,
   })
   const data = response.status !== 204 ? await response.json() : null
-  return { status: response.status, body: data }
+  return { status: response.status, body: data, headers: response.headers }
 }
 
 describe('plugin-loki', async () => {
@@ -72,16 +72,18 @@ describe('plugin-loki', async () => {
     expect(users.Resources[0].groups[0].value).toBe('Admins')
     expect(users.Resources[0].groups[0].display).toBe('Admins')
     expect(users.Resources[0].groups[0].type).toBe('direct')
+    expect(users.Resources[0].meta.version).toBeDefined()
     expect(users.Resources[1].userName).toBe('jsmith')
     expect(users.Resources[1].id).toBe('jsmith')
     expect(users.Resources[1].name.givenName).toBe('John')
     expect(users.Resources[1].groups[0].value).toBe('Employees')
     expect(users.Resources[1].groups[0].display).toBe('Employees')
     expect(users.Resources[1].groups[0].type).toBe('direct')
+    expect(users.Resources[1].meta.version).toBeDefined()
   })
 
   test('getUsers all test (2)', async () => {
-    const res = await fetchSCIM('GET', '/Users?attributes=userName&startIndex=1&count=100', undefined, options.std.headers)
+    const res = await fetchSCIM('GET', '/Users?attributes=userName&startIndex=1&count=100', undefined, options.std.headers) // id and meta is always returned
     const users = res.body
     expect(res.status).toBe(200)
     expect(users.totalResults).toBe(2)
@@ -89,16 +91,20 @@ describe('plugin-loki', async () => {
     expect(users.startIndex).toBe(1)
     expect(users).toBeDefined()
     expect(users.Resources[0].userName).toBe('bjensen')
-    expect(users.Resources[0].id).toBe(undefined)
+    expect(users.Resources[0].id).toBe('bjensen')
+    expect(users.Resources[0].meta.version).toBeDefined()
     expect(users.Resources[0].groups).toBe(undefined)
     expect(users.Resources[1].userName).toBe('jsmith')
-    expect(users.Resources[1].id).toBe(undefined)
+    expect(users.Resources[1].id).toBe('jsmith')
+    expect(users.Resources[1].meta.version).toBeDefined()
     expect(users.Resources[1].groups).toBe(undefined)
   })
 
   test('getUsers unique test (1)', async () => {
     const res = await fetchSCIM('GET', '/Users/bjensen', undefined, options.std.headers)
     const user = res.body
+    expect(res.headers.get('etag')).toBe('W/"0"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Users/bjensen')
     expect(res.status).toBe(200)
     expect(user).toBeDefined()
     expect(user.id).toBe('bjensen')
@@ -116,6 +122,7 @@ describe('plugin-loki', async () => {
     expect(user.groups[0].display).toBe('Admins')
     expect(user.groups[0].type).toBe('direct')
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].manager.value).toBe('jsmith')
+    expect(user.meta.version).toBeDefined()
     expect(user.meta.location).toBeDefined()
     expect(user.schemas[0]).toBe('urn:ietf:params:scim:schemas:core:2.0:User')
     expect(user.schemas[1]).toBe('urn:ietf:params:scim:schemas:extension:enterprise:2.0:User')
@@ -190,7 +197,7 @@ describe('plugin-loki', async () => {
 
   test('getGroups all test (2)', async () => {
     const res = await fetchSCIM('GET', '/Groups'
-      + '?attributes=displayName&startIndex=1&count=100',
+      + '?attributes=displayName&startIndex=1&count=100', // id and meta is always returned
     undefined, options.std.headers)
     const groups = res.body
     expect(res.status).toBe(200)
@@ -200,16 +207,20 @@ describe('plugin-loki', async () => {
     expect(groups).toBeDefined()
     expect(groups.Resources[0].members).toBe(undefined)
     expect(groups.Resources[0].displayName).toBe('Admins')
-    expect(groups.Resources[0].id).toBe(undefined)
+    expect(groups.Resources[0].id).toBe('Admins')
+    expect(groups.Resources[0].meta).toBeDefined()
     expect(groups.Resources[1].members).toBe(undefined)
     expect(groups.Resources[1].displayName).toBe('Employees')
-    expect(groups.Resources[1].id).toBe(undefined)
+    expect(groups.Resources[1].id).toBe('Employees')
+    expect(groups.Resources[1].meta).toBeDefined()
   })
 
   test('getGroups unique test (1)', async () => {
     const res = await fetchSCIM('GET', '/Groups/Admins', undefined, options.std.headers)
     const group = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"0"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Groups/Admins')
     expect(group).toBeDefined()
     expect(group.schemas).toBeDefined()
     expect(group.meta.location).toBeDefined()
@@ -287,6 +298,8 @@ describe('plugin-loki', async () => {
   test('getUser just created test', async () => {
     const res = await fetchSCIM('GET', '/Users/jgilber', undefined, options.std.headers)
     const user = res.body
+    expect(res.headers.get('etag')).toBe('W/"0"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Users/jgilber')
     expect(res.status).toBe(200)
     expect(user).toBeDefined()
     expect(user.id).toBe('jgilber')
@@ -307,6 +320,7 @@ describe('plugin-loki', async () => {
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].employeeNumber).toBe('123456')
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].test1).toBe('xxx')
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].test2).toBe('yyy')
+    expect(user.meta.version).toBe('W/"0"')
     expect(user.schemas[0]).toBe('urn:ietf:params:scim:schemas:core:2.0:User')
     expect(user.schemas[1]).toBe('urn:ietf:params:scim:schemas:extension:enterprise:2.0:User')
   })
@@ -409,12 +423,18 @@ describe('plugin-loki', async () => {
     }
     const res = await fetchSCIM('PATCH', '/Users/jgilber', user, options.content.headers)
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"1"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Users/jgilber')
+    expect(res.body.meta.version).toBe('W/"1"')
+    expect(res.body.meta.location).toBe('http://localhost:8880/Users/jgilber')
   })
 
   test('getUser just modified test', async () => {
     const res = await fetchSCIM('GET', '/Users/jgilber', undefined, options.std.headers)
     const user = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"1"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Users/jgilber')
     expect(user).toBeDefined()
     expect(user.id).toBe('jgilber')
     expect(user.active).toBe(false) // modified
@@ -435,6 +455,8 @@ describe('plugin-loki', async () => {
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].manager.value).toBe('bjensen') // added
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].test1).toBe('test1-value') // modified
     expect(user['urn:ietf:params:scim:schemas:extension:enterprise:2.0:User'].test2).toBe('test2-value') // modified
+    expect(user.meta.version).toBe('W/"1"')
+    expect(user.meta.location).toBe('http://localhost:8880/Users/jgilber')
   })
 
   test('replaceUser test', async () => {
@@ -470,6 +492,8 @@ describe('plugin-loki', async () => {
     const res = await fetchSCIM('PUT', '/Users/jgilber', putUser, options.content.headers)
     const user = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"2"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Users/jgilber')
     expect(user).toBeDefined()
     expect(user.id).toBe('jgilber')
     expect(user.active).toBe(false)
@@ -489,6 +513,8 @@ describe('plugin-loki', async () => {
     expect(user.groups.length).toBe(2)
     expect(user.groups[0].value).toBe('Admins')
     expect(user.groups[1].value).toBe('Employees')
+    expect(user.meta.version).toBe('W/"2"')
+    expect(user.meta.location).toBe('http://localhost:8880/Users/jgilber')
   })
 
   test('deleteUser test', async () => {
@@ -506,6 +532,9 @@ describe('plugin-loki', async () => {
     }
     const res = await fetchSCIM('POST', '/Groups', newGroup, options.content.headers)
     expect(res.status).toBe(201)
+    expect(res.headers.get('etag')).toBe('W/"0"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Groups/GoGoLoki')
+    expect(res.body.meta.version).toBe('W/"0"')
     expect(res.body.meta.location).toBe('http://localhost:8880/Groups/GoGoLoki')
   })
 
@@ -513,9 +542,13 @@ describe('plugin-loki', async () => {
     const res = await fetchSCIM('GET', '/Groups/GoGoLoki', undefined, options.std.headers)
     const group = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"0"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Groups/GoGoLoki')
     expect(group).toBeDefined()
     expect(group.displayName).toBe('GoGoLoki')
     expect(group.id).toBe('GoGoLoki')
+    expect(group.meta.version).toBe('W/"0"')
+    expect(group.meta.location).toBe('http://localhost:8880/Groups/GoGoLoki')
   })
 
   test('modifyGroupMembers test', async () => {
@@ -542,19 +575,27 @@ describe('plugin-loki', async () => {
     const res = await fetchSCIM('PATCH', '/Groups/GoGoLoki?attributes=members', body, options.content.headers)
     const group = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"1"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Groups/GoGoLoki')
     expect(group.members).toBeDefined()
     expect(group.schemas[0]).toBe('urn:ietf:params:scim:schemas:core:2.0:Group')
+    expect(group.meta.version).toBe('W/"1"')
+    expect(group.meta.location).toBe('http://localhost:8880/Groups/GoGoLoki')
   })
 
   test('getGroup just modified members test', async () => {
     const res = await fetchSCIM('GET', '/Groups/GoGoLoki', undefined, options.std.headers)
     const group = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"1"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Groups/GoGoLoki')
     expect(group).toBeDefined()
     expect(group.displayName).toBe('GoGoLoki')
     expect(group.id).toBe('GoGoLoki')
     expect(group.members.length).toBe(1) // bjensen removed
-    expect(group.members[0].value).toBe('jsmith') // added
+    expect(group.members[0].value).toBe('jsmith') // 
+    expect(group.meta.version).toBe('W/"1"')
+    expect(group.meta.location).toBe('http://localhost:8880/Groups/GoGoLoki')
   })
 
   test('replaceGroup test', async () => {
@@ -571,8 +612,11 @@ describe('plugin-loki', async () => {
     const res = await fetchSCIM('PUT', '/Groups/GoGoLoki', obj, options.content.headers)
     const group = res.body
     expect(res.status).toBe(200)
+    expect(res.headers.get('etag')).toBe('W/"2"')
+    expect(res.headers.get('location')).toBe('http://localhost:8880/Groups/GoGoLoki')
     expect(group.displayName).toBe('NewGoGoLoki')
     expect(group.members.length).toBe(2)
+    expect(group.meta.version).toBe('W/"2"')
     expect(group.meta.location).toBe('http://localhost:8880/Groups/GoGoLoki')
   })
 
@@ -612,6 +656,7 @@ describe('plugin-loki', async () => {
         {
           method: 'PATCH',
           path: '/Groups/Tour Guides',
+          version: 'W/"0"',
           data: {
             op: 'add',
             path: 'members',

package/test/lib/plugin-scim_test.ts

@@ -53,7 +53,7 @@ describe('plugin-scim', async () => {
   })
 
   test('getUsers all test (2)', async () => {
-    const res = await fetchSCIM('GET', '/Users?attributes=userName&startIndex=1&count=100', undefined, options.std.headers)
+    const res = await fetchSCIM('GET', '/Users?attributes=userName&startIndex=1&count=100', undefined, options.std.headers) // id is always returned
     const users = res.body
     expect(res.status).toBe(200)
     expect(users.totalResults).toBe(2)
@@ -61,10 +61,10 @@ describe('plugin-scim', async () => {
     expect(users.startIndex).toBe(1)
     expect(users).toBeDefined()
     expect(users.Resources[0].userName).toBe('bjensen')
-    expect(users.Resources[0].id).toBe(undefined)
+    expect(users.Resources[0].id).toBe('bjensen')
     expect(users.Resources[0].groups).toBe(undefined)
     expect(users.Resources[1].userName).toBe('jsmith')
-    expect(users.Resources[1].id).toBe(undefined)
+    expect(users.Resources[1].id).toBe('jsmith')
     expect(users.Resources[1].groups).toBe(undefined)
   })
 
@@ -154,7 +154,7 @@ describe('plugin-scim', async () => {
 
   test('getGroups all test (2)', async () => {
     const res = await fetchSCIM('GET', '/Groups'
-      + '?attributes=displayName&startIndex=1&count=100',
+      + '?attributes=displayName&startIndex=1&count=100', // id is always returned
     undefined, options.std.headers)
     const groups = res.body
     expect(res.status).toBe(200)
@@ -163,9 +163,11 @@ describe('plugin-scim', async () => {
     expect(groups.itemsPerPage).toBe(2)
     expect(groups.startIndex).toBe(1)
     expect(groups.Resources[0].displayName).toBe('Admins')
-    expect(groups.Resources[0].id).toBe(undefined)
+    expect(groups.Resources[0].id).toBe('Admins')
+    expect(groups.Resources[0].members).toBe(undefined)
     expect(groups.Resources[1].displayName).toBe('Employees')
-    expect(groups.Resources[1].id).toBe(undefined)
+    expect(groups.Resources[1].id).toBe('Employees')
+    expect(groups.Resources[1].members).toBe(undefined)
   })
 
   test('getGroups uniqe test (1)', async () => {