From b52e310d4161ded4c87170b6351a0a3174aaa32e Mon Sep 17 00:00:00 2001 From: Douglas Barone Date: Wed, 10 Aug 2022 14:06:03 -0400 Subject: [PATCH] Remove parse function --- server/src/resolvers/Query/users.js | 9 ++++----- web/.env.development | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server/src/resolvers/Query/users.js b/server/src/resolvers/Query/users.js index 7926f7c..41cb309 100644 --- a/server/src/resolvers/Query/users.js +++ b/server/src/resolvers/Query/users.js @@ -1,16 +1,14 @@ -const parseSAMAccountName = sAMAccountName => - sAMAccountName ? sAMAccountName.replace('.', ' ') : '' +// const parseSAMAccountName = sAMAccountName => +// sAMAccountName ? sAMAccountName.replace('.', ' ') : '' export async function users( parent, { where: { cn, displayName, sAMAccountName }, limit, onlyStudents }, { ad } ) { - const parsedSAMAccountName = parseSAMAccountName(sAMAccountName) - const studentGroup = process.env.STUDENT_GROUP || 'Estudantes' - const search = `|(sAMAccountName=*${parsedSAMAccountName}*)(cn=*${cn}*)(displayName=*${displayName}*)` + const search = `|(sAMAccountName=*${sAMAccountName}*)(cn=*${cn}*)(displayName=*${displayName}*)` const filter = onlyStudents ? `(&(memberOf=CN=${studentGroup},OU=Groups,DC=ifms,DC=edu,DC=br)(${search}))` @@ -22,6 +20,7 @@ export async function users( sizeLimit: limit }) + console.dir(users) return users.map(user => ({ ...user, roles: [] })) || [] } catch (e) { throw new Error('Não foi possível realizar a busca.') diff --git a/web/.env.development b/web/.env.development index dca1db6..49ac2c2 100755 --- a/web/.env.development +++ b/web/.env.development @@ -1,2 +1,2 @@ -VUE_APP_GRAPHQL_HTTP="http://10.7.0.54:4000/graphql" -VUE_APP_GRAPHQL_WS="ws://10.7.0.54:4000/graphql" +VUE_APP_GRAPHQL_HTTP="http://10.7.1.1:4000/graphql" +VUE_APP_GRAPHQL_WS="ws://10.7.1.1:4000/graphql"