alerte-secours/as-services
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: alerte-secours:11943b667c322dc4017b5d9e77bcf2669ff62e30
Branches Tags
alerte-secours:main
...
compare: alerte-secours:2518ced0fab78945fe29a4a136551b046f203e51
Branches Tags
alerte-secours:main

2 commits
11943b667c ... 2518ced0fa

Author SHA1 Message Date
devthejo
2518ced0fa fix: wip
Some checks are pending
/ deploy (push) Blocked by required conditions
Details
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Has started running
Details
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 1m40s
Details
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 2m35s
Details
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 2m27s
Details
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 2m24s
Details
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 1m52s
Details
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 2m29s
Details
2025-06-30 13:50:26 +02:00
devthejo
391fd6d380 fix: clean error 2025-06-30 13:47:53 +02:00
1 changed files with 14 additions and 14 deletions
Show stats Expand all files Collapse all files

28
services/api/src/api/v1/services/auth-token-handler.js
View file

@ -10,7 +10,7 @@ module.exports = ({ services: { sortRolesByLevel, signJwt } }) => {
const { claimsNamespace, jwtExpirationInHours } = config
async function validateAuthToken(authTokenJwt) {
function validateAuthToken(authTokenJwt) {
try {
const { authToken } = jwtDecode(authTokenJwt)
return authToken
@ -28,22 +28,22 @@ module.exports = ({ services: { sortRolesByLevel, signJwt } }) => {
let deviceId
let roles
try {
const [row] = await sql`
SELECT
"user_id" as "userId",
"device_id" as "deviceId"
FROM
"auth_token"
WHERE
"auth_token" = ${authToken}
`
userId = row.userId
deviceId = row.deviceId
} catch (e) {
const [row] = await sql`
SELECT
"user_id" as "userId",
"device_id" as "deviceId"
FROM
"auth_token"
WHERE
"auth_token" = ${authToken}
`
if (!row) {
throw httpError(410, "Auth token not found")
}
userId = row.userId
deviceId = row.deviceId
if (!userId) {
await sql.begin(async (sql) => {
await sql`set constraints all deferred`