fixed post account creation/claim flow. This may fix #93
This commit is contained in:
@@ -46,7 +46,7 @@ passport.use(new OpenIDConnectStrategy({
|
||||
|
||||
//lookup existing user
|
||||
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 (existing.length > 0) {
|
||||
memberId = existing[0].id;
|
||||
@@ -56,10 +56,9 @@ passport.use(new OpenIDConnectStrategy({
|
||||
const discordID = jwt.discord.id as number;
|
||||
|
||||
//check if account is available to claim
|
||||
let memberId = await mapDiscordtoID(discordID);
|
||||
memberId = await mapDiscordtoID(discordID);
|
||||
|
||||
if (memberId === null) {
|
||||
console.log('new account');
|
||||
// create new account
|
||||
const username = sub.username;
|
||||
const result = await con.query(
|
||||
@@ -68,7 +67,6 @@ passport.use(new OpenIDConnectStrategy({
|
||||
)
|
||||
memberId = Number(result.insertId);
|
||||
} else {
|
||||
console.log('claim account');
|
||||
// claim existing account
|
||||
const result = await con.query(
|
||||
`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.commit();
|
||||
console.log(memberId);
|
||||
return cb(null, { memberId });
|
||||
} catch (error) {
|
||||
await con.rollback();
|
||||
|
||||
Reference in New Issue
Block a user