fix: prevent admin status reset on login (#659)

This commit is contained in:
Thomas Durieux
2026-04-15 04:34:36 +02:00
committed by GitHub
parent f3641c8ce3
commit c6d6806d7a
+19 -8
View File
@@ -38,6 +38,15 @@ const verify = async (
{ owner: user._id }, { owner: user._id },
{ "source.accessToken": accessToken } { "source.accessToken": accessToken }
); );
} else {
// Check if a user with this username already exists (e.g. created
// manually without externalIDs.github). Link the GitHub ID to the
// existing account instead of creating a duplicate that would lose
// the isAdmin flag.
user = await UserModel.findOne({ username: profile.username });
if (user) {
user.externalIDs.github = profile.id;
user.accessTokens.github = accessToken;
} else { } else {
const photo = profile.photos ? profile.photos[0]?.value : null; const photo = profile.photos ? profile.photos[0]?.value : null;
user = new UserModel({ user = new UserModel({
@@ -55,6 +64,7 @@ const verify = async (
}); });
if (user.emails?.length) user.emails[0].default = true; if (user.emails?.length) user.emails[0].default = true;
} }
}
if (!user.accessTokenDates) { if (!user.accessTokenDates) {
user.accessTokenDates = { user.accessTokenDates = {
github: new Date(), github: new Date(),
@@ -63,14 +73,6 @@ const verify = async (
user.accessTokenDates.github = new Date(); user.accessTokenDates.github = new Date();
} }
await user.save(); await user.save();
} catch (error) {
console.error(error);
throw new AnonymousError("unable_to_connect_user", {
httpStatus: 500,
object: profile,
cause: error as Error,
});
} finally {
done(null, { done(null, {
username: profile.username, username: profile.username,
accessToken, accessToken,
@@ -78,6 +80,15 @@ const verify = async (
profile, profile,
user, user,
}); });
} catch (error) {
console.error(error);
done(
new AnonymousError("unable_to_connect_user", {
httpStatus: 500,
object: profile,
cause: error as Error,
})
);
} }
}; };