diff --git a/server/src/classes/ResetToken.js b/server/src/classes/ResetToken.js index 00bc2e8..b24ff22 100755 --- a/server/src/classes/ResetToken.js +++ b/server/src/classes/ResetToken.js @@ -3,7 +3,7 @@ import { User } from './User' import { addDays } from 'date-fns' import bcrypt from 'bcrypt' -import { replacePassword } from '../utils/activedirectory/passwordUtils' +import { replacePassword } from '../lib/activedirectory/passwordUtils' import prisma from '../prisma' diff --git a/server/src/classes/User.js b/server/src/classes/User.js index cb0c86e..0d27f8e 100755 --- a/server/src/classes/User.js +++ b/server/src/classes/User.js @@ -1,10 +1,10 @@ import { addSeconds, differenceInSeconds } from 'date-fns' -import { ad } from '../utils/activedirectory' +import { ad } from '../lib/activedirectory' import prisma from '../prisma' import { Change, createClient } from 'ldapjs' -import { encodePassword } from '../utils/activedirectory/encodePassword' -import config from '../utils/activedirectory/config' +import { encodePassword } from '../lib/activedirectory/encodePassword' +import config from '../lib/activedirectory/config' import jwt from 'jsonwebtoken' import { pubsub, AUTH_UPDATED } from '../pubsub' diff --git a/server/src/cronTasks.js b/server/src/cronTasks.js index ba38887..73631e4 100644 --- a/server/src/cronTasks.js +++ b/server/src/cronTasks.js @@ -1,10 +1,10 @@ import cron from 'node-cron' -import { updateDevicesInfo } from './utils/wifiUtils' +import { updateDevicesInfo } from './lib/wifiUtils' import { User } from './classes/User' import { format } from 'date-fns' import oui from 'oui' -import { updateUserIdMappings } from './utils/paloalto' +import { updateUserIdMappings } from './lib/paloalto' function logMsg(msg) { console.log(`[${format(new Date(), 'HH:mm:ss')}] cron: ${msg}`) diff --git a/server/src/utils/activedirectory/attributes.js b/server/src/lib/activedirectory/attributes.js similarity index 100% rename from server/src/utils/activedirectory/attributes.js rename to server/src/lib/activedirectory/attributes.js diff --git a/server/src/utils/activedirectory/config.js b/server/src/lib/activedirectory/config.js similarity index 100% rename from server/src/utils/activedirectory/config.js rename to server/src/lib/activedirectory/config.js diff --git a/server/src/utils/activedirectory/encodePassword.js b/server/src/lib/activedirectory/encodePassword.js similarity index 100% rename from server/src/utils/activedirectory/encodePassword.js rename to server/src/lib/activedirectory/encodePassword.js diff --git a/server/src/utils/activedirectory/entryParser.js b/server/src/lib/activedirectory/entryParser.js similarity index 100% rename from server/src/utils/activedirectory/entryParser.js rename to server/src/lib/activedirectory/entryParser.js diff --git a/server/src/utils/activedirectory/index.js b/server/src/lib/activedirectory/index.js similarity index 100% rename from server/src/utils/activedirectory/index.js rename to server/src/lib/activedirectory/index.js diff --git a/server/src/utils/activedirectory/passwordUtils.js b/server/src/lib/activedirectory/passwordUtils.js similarity index 100% rename from server/src/utils/activedirectory/passwordUtils.js rename to server/src/lib/activedirectory/passwordUtils.js diff --git a/server/src/utils/ciscoController.js b/server/src/lib/ciscoController.js similarity index 97% rename from server/src/utils/ciscoController.js rename to server/src/lib/ciscoController.js index d45b81c..72d6424 100644 --- a/server/src/utils/ciscoController.js +++ b/server/src/lib/ciscoController.js @@ -1,6 +1,6 @@ import { create } from 'axios' import https from 'https' -import { ouiFinder } from './ouiFinder' +import { ouiFinder } from '../utils/ouiFinder' const httpsAgent = new https.Agent({ rejectUnauthorized: false, diff --git a/server/src/utils/paloalto.js b/server/src/lib/paloalto.js similarity index 100% rename from server/src/utils/paloalto.js rename to server/src/lib/paloalto.js diff --git a/server/src/utils/unifiController.js b/server/src/lib/unifiController.js similarity index 98% rename from server/src/utils/unifiController.js rename to server/src/lib/unifiController.js index 7711dff..82bccee 100644 --- a/server/src/utils/unifiController.js +++ b/server/src/lib/unifiController.js @@ -1,6 +1,6 @@ import { Controller } from 'node-unifi' import { promisify } from 'util' -import { ouiFinder } from './ouiFinder' +import { ouiFinder } from '../utils/ouiFinder' const unifiController = new Controller( process.env.UNIFI_HOST || 'unifi.pp.ifms.edu.br', diff --git a/server/src/utils/wifiUtils.js b/server/src/lib/wifiUtils.js similarity index 100% rename from server/src/utils/wifiUtils.js rename to server/src/lib/wifiUtils.js diff --git a/server/src/resolvers/Mutation.js b/server/src/resolvers/Mutation.js index a245fa3..6429a5a 100755 --- a/server/src/resolvers/Mutation.js +++ b/server/src/resolvers/Mutation.js @@ -1,9 +1,9 @@ -import { replacePassword } from '../utils/activedirectory/passwordUtils' +import { replacePassword } from '../lib/activedirectory/passwordUtils' import { User } from '../classes/User' import { ResetToken } from '../classes/ResetToken' -import { updateDevicesInfo } from '../utils/wifiUtils' -import { updateUserIdMappings } from '../utils/paloalto' +import { updateDevicesInfo } from '../lib/wifiUtils' +import { updateUserIdMappings } from '../lib/paloalto' const Mutation = { async login(_, { data }) { diff --git a/server/src/server.js b/server/src/server.js index d09f762..d6bf765 100755 --- a/server/src/server.js +++ b/server/src/server.js @@ -1,7 +1,7 @@ import { ApolloServer } from 'apollo-server' import responseCachePlugin from 'apollo-server-plugin-response-cache' -import { ad } from './utils/activedirectory' +import { ad } from './lib/activedirectory' import { typeDefs } from './typeDefs' import { resolvers } from './resolvers'