Skip to content

Commit d7eafbb

Browse files
committed
improve errors when logging in with revoked or invalid token
1 parent 0712350 commit d7eafbb

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

apps/webapp/app/services/personalAccessToken.server.ts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,20 +134,27 @@ export async function authenticatePersonalAccessToken(
134134

135135
const hashedToken = hashToken(token);
136136

137-
const personalAccessToken = await prisma.personalAccessToken.update({
137+
const personalAccessToken = await prisma.personalAccessToken.findFirst({
138138
where: {
139139
hashedToken,
140140
revokedAt: null,
141141
},
142-
data: {
143-
lastAccessedAt: new Date(),
144-
},
145142
});
146143

147144
if (!personalAccessToken) {
145+
// The token may have been revoked or is entirely invalid
148146
return;
149147
}
150148

149+
await prisma.personalAccessToken.update({
150+
where: {
151+
id: personalAccessToken.id,
152+
},
153+
data: {
154+
lastAccessedAt: new Date(),
155+
},
156+
});
157+
151158
const decryptedToken = decryptPersonalAccessToken(personalAccessToken);
152159

153160
if (decryptedToken !== token) {

0 commit comments

Comments
 (0)