diff --git a/src/core/mail.js b/src/core/mail.js index 5d9753c..da55742 100644 --- a/src/core/mail.js +++ b/src/core/mail.js @@ -190,7 +190,7 @@ class MailProvider { mailVerified: true, verificationReqAt: null, }); - return true; + return reguser.name; } static createCode() { diff --git a/src/routes/api/auth/logout.js b/src/routes/api/auth/logout.js index db564ab..be5a83c 100644 --- a/src/routes/api/auth/logout.js +++ b/src/routes/api/auth/logout.js @@ -16,7 +16,7 @@ export default async (req: Request, res: Response) => { return; } - const me = await getMe(req.user); + const me = await getMe(user); req.logout(); res.status(200); res.json({ diff --git a/src/routes/api/auth/verify.js b/src/routes/api/auth/verify.js index 8878daf..cf3f63f 100644 --- a/src/routes/api/auth/verify.js +++ b/src/routes/api/auth/verify.js @@ -5,15 +5,20 @@ import type { Request, Response } from 'express'; +import webSockets from '../../../socket/websockets'; import { getHtml } from '../../../components/RedirectionPage'; import { getHostFromRequest } from '../../../utils/ip'; import mailProvider from '../../../core/mail'; export default async (req: Request, res: Response) => { const { token } = req.query; - const success = await mailProvider.verify(token); + const name = await mailProvider.verify(token); const host = getHostFromRequest(req); - if (success) { + if (name) { + // notify websoecket to reconnect user + // thats a bit counter productive because it directly links to the websocket + webSockets.notifyChangedMe(name); + // --- const index = getHtml('Mail verification', 'You are now verified :)', host); res.status(200).send(index); } else { diff --git a/src/socket/ProtocolClient.js b/src/socket/ProtocolClient.js index f4c260e..0c3e744 100644 --- a/src/socket/ProtocolClient.js +++ b/src/socket/ProtocolClient.js @@ -191,6 +191,7 @@ class ProtocolClient extends EventEmitter { case ChangedMe.OP_CODE: console.log('Websocket requested api/me reload'); this.emit('changedMe'); + this.reconnect(); break; default: console.error(`Unknown op_code ${opcode} received`);