diff --git a/server/package-lock.json b/server/package-lock.json index 40c6fef..b997b3a 100755 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -2139,6 +2139,11 @@ "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-1.4.0.tgz", "integrity": "sha512-68s5jYdlvasItOJnCuI2Q9s4q98g0pCyL3HrcKJu8KNugUl8ahgmZYg38ysLTgQjjXX3H8CJLkAvWrclWfcalw==" }, + "date-fns": { + "version": "2.16.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz", + "integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ==" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -4435,7 +4440,8 @@ "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==", + "optional": true }, "ms": { "version": "2.0.0", diff --git a/server/package.json b/server/package.json index f14fe8f..75ee020 100755 --- a/server/package.json +++ b/server/package.json @@ -37,12 +37,12 @@ "apollo-server": "^2.9.16", "apollo-server-plugin-response-cache": "^0.4.1", "bcrypt": "^3.0.7", + "date-fns": "^2.16.1", "dotenv": "^8.2.0", "graphql": "^14.6.0", "graphql-tools": "^4.0.6", "jsonwebtoken": "^8.5.1", "ldapjs": "^1.0.2", - "moment": "^2.24.0", "node-cron": "^2.0.3", "node-unifi": "^1.2.2", "prisma-binding": "^2.3.16", diff --git a/server/src/classes/ResetToken.js b/server/src/classes/ResetToken.js index c6624e2..d62b08c 100755 --- a/server/src/classes/ResetToken.js +++ b/server/src/classes/ResetToken.js @@ -1,11 +1,12 @@ -import prisma from '../prisma' - import uuid from 'uuid/v4' import { User } from './User' -import moment from 'moment' +import { addDays } from 'date-fns' + import bcrypt from 'bcrypt' import { replacePassword } from '../utils/activedirectory/passwordUtils' +import prisma from '../prisma' + class ResetToken { /** * Generates a reset token for a specific user @@ -20,10 +21,8 @@ class ResetToken { throw new Error('Apenas estudantes podem utilizar tokens') const token = uuid() - // TODO: replace momentJS - const expiration = moment(new Date()).add(3, 'days').toDate() - console.log(expiration) + const expiration = addDays(new Date(), 3) const hashedToken = await prisma.resetToken.create({ data: {