diff options
Diffstat (limited to 'src/routers/vault/middlewares')
-rw-r--r-- | src/routers/vault/middlewares/identity.js | 4 | ||||
-rw-r--r-- | src/routers/vault/middlewares/session.js | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/routers/vault/middlewares/identity.js b/src/routers/vault/middlewares/identity.js index 14903c3..6e8be7f 100644 --- a/src/routers/vault/middlewares/identity.js +++ b/src/routers/vault/middlewares/identity.js @@ -1,9 +1,9 @@ "use strict"; -const uuidv4 = require("uuid/v4"); const nodemailer = require("nodemailer"); const Claim = require("../utils/claim.js"); const validate = require("../utils/validate.js"); const Identity = require("../types/Identity.js"); +const Session = require("../types/Session.js"); let transporter = nodemailer.createTransport({ sendmail: true, @@ -181,7 +181,7 @@ const add_identity = async (req, res, next) => { let uuid; do { // avoid collisions - uuid = uuidv4(); + uuid = await Session.generateToken(); } while (req.app.locals.session.get(uuid)); req.app.locals.identity_pending.set(uuid, { diff --git a/src/routers/vault/middlewares/session.js b/src/routers/vault/middlewares/session.js index 1c322e4..71db21c 100644 --- a/src/routers/vault/middlewares/session.js +++ b/src/routers/vault/middlewares/session.js @@ -1,5 +1,4 @@ "use strict"; -const uuidv4 = require("uuid/v4"); const nodemailer = require("nodemailer"); const Claim = require("../utils/claim.js"); const Session = require("../types/Session.js"); @@ -221,7 +220,7 @@ const auth_session = async (req, res) => { } // immediately change the session uuid - const new_uuid = uuidv4(); + const new_uuid = await Session.generateToken(); req.app.locals.session.set(new_uuid, session); req.app.locals.session.delete(token); // revoke the old uuid @@ -253,7 +252,7 @@ const new_session = async (req, res, next) => { // account creation request let uuid; do { // avoid collisions - uuid = uuidv4(); + uuid = await Session.generateToken(); } while (req.app.locals.session.get(uuid)); const session = new Session(req.ip, email); @@ -344,7 +343,7 @@ const new_session = async (req, res, next) => { let uuid; do { // avoid collisions - uuid = uuidv4(); + uuid = await Session.generateToken(); } while (req.app.locals.session.get(uuid)); const session = new Session(req.ip, email); |