17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 23 Pull Requests Actions 3 Packages Projects Releases 6 Wiki Activity

account-claim #98

Merged
Ajdj100 merged 7 commits from account-claim into main 2025-12-14 21:52:23 -06:00
Conversation 0 Commits 7 Files Changed 3 +2 -5
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a335ce862d - Show all commits

7
api/src/routes/auth.ts
View File

@@ -46,7 +46,7 @@ passport.use(new OpenIDConnectStrategy({
//lookup existing user //lookup existing user
const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]); const existing = await con.query(`SELECT id FROM members WHERE authentik_issuer = ? AND authentik_sub = ? LIMIT 1;`, [issuer, sub]);
let memberId; let memberId: number;
//if member exists //if member exists
if (existing.length > 0) { if (existing.length > 0) {
memberId = existing[0].id; memberId = existing[0].id;
@@ -56,10 +56,9 @@ passport.use(new OpenIDConnectStrategy({
const discordID = jwt.discord.id as number; const discordID = jwt.discord.id as number;
//check if account is available to claim //check if account is available to claim
let memberId = await mapDiscordtoID(discordID); memberId = await mapDiscordtoID(discordID);
if (memberId === null) { if (memberId === null) {
console.log('new account');
// create new account // create new account
const username = sub.username; const username = sub.username;
const result = await con.query( const result = await con.query(
@@ -68,7 +67,6 @@ passport.use(new OpenIDConnectStrategy({
) )
memberId = Number(result.insertId); memberId = Number(result.insertId);
} else { } else {
console.log('claim account');
// claim existing account // claim existing account
const result = await con.query( const result = await con.query(
`UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`, `UPDATE members SET authentik_sub = ?, authentik_issuer = ? WHERE id = ?;`,
@@ -80,7 +78,6 @@ passport.use(new OpenIDConnectStrategy({
await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId]) await con.query(`UPDATE members SET last_login = ? WHERE id = ?`, [toDateTime(new Date()), memberId])
await con.commit(); await con.commit();
console.log(memberId);
return cb(null, { memberId }); return cb(null, { memberId });
} catch (error) { } catch (error) {
await con.rollback(); await con.rollback();