rparodi/ft_transcendence
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(auth): small issues with login process

Browse source
This commit is contained in:
Maieul BOYER 2025-09-08 14:52:47 +02:00
parent 4f8ebc7dd9
commit c4b1bb2f65
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/@shared/src/database/mixin/user.ts
View file

@ -104,7 +104,7 @@ export const UserImpl: Omit<IUserDb, keyof Database> = {
if (!isNullish(otp))
return otp;
let otpGen = new Otp();
const res: SqliteReturn = this.prepare("UPDATE OR IGNORE user SET otp = @otp WHERE id = @id RETURNING otp")
const res: any = this.prepare("UPDATE OR IGNORE user SET otp = @otp WHERE id = @id RETURNING otp")
.get({ id, otp: otpGen.secret });
return res?.otp;
},

6
src/auth/src/routes/otp.ts
View file

@ -40,14 +40,14 @@ const route: FastifyPluginAsync = async (fastify, _opts): Promise<void> => {
return makeResponse("failed", "otp.failed.timeout");
// get the Otp sercret from the db
let otpSecret = this.db.getUserOtpSecret(dJwt.who);
if (isNullish(otpSecret))
let user = this.db.getUserFromName(dJwt.who);
if (isNullish(user?.otp))
// oops, either no user, or user without otpSecret
// fuck off
return makeResponse("failed", "otp.failed.noSecret");
// good lets now verify the token you gave us is the correct one...
let otpHandle = new Otp({ secret: otpSecret });
let otpHandle = new Otp({ secret: user.otp });
let now = Date.now();
const tokens = [

1
src/auth/src/routes/whoami.ts
View file

@ -16,6 +16,7 @@ const route: FastifyPluginAsync = async (fastify, _opts): Promise<void> => {
"/api/auth/whoami",
{ schema: { response: { "2xx": WhoAmIRes } }, config: { requireAuth: true } },
async function(req, _res) {
if (isNullish(req.authUser))
return makeResponse("failure", "whoami.failure.generic")
return makeResponse("success", "whoami.success", { name: req.authUser.name })
},