Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Commit

Permalink
use the buildParams directly to create base resource for user requests
Browse files Browse the repository at this point in the history
  • Loading branch information
cianfoley-nearform committed Mar 6, 2018
1 parent f48fa20 commit 9b0026a
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions lib/plugin/security/hapi-auth-validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,10 @@ function buildAuthValidation (authorization) {
})
}

function buildResourcesForUser (udaru, builder, userId, organizationId, done) {
const buildParams = {
userId,
teamId: '*',
organizationId
}

function buildResourcesForUser (udaru, builder, buildParams, organizationId, done) {
const resources = [builder(buildParams)]

udaru.users.read({ id: userId, organizationId: organizationId }, (err, user) => {
udaru.users.read({ id: buildParams.userId, organizationId: organizationId }, (err, user) => {
if (err && err.output.statusCode === 404) return done(null, resources)
if (err) return done(err)

Expand Down Expand Up @@ -83,7 +77,7 @@ function buildAuthValidation (authorization) {
const buildParams = Object.assign({}, { organizationId }, requestParams)

if (resourceType === 'users' && buildParams.userId) {
return buildResourcesForUser(udaru, resourceBuilder, buildParams.userId, organizationId, done)
return buildResourcesForUser(udaru, resourceBuilder, buildParams, organizationId, done)
}

done(null, [resourceBuilder(buildParams)])
Expand Down

0 comments on commit 9b0026a

Please sign in to comment.