Skip to content

Commit b13c82f

Browse files
authored
Merge pull request #121 from HSLdevcom/48533-speed-search-error-handling
error response added
2 parents 41c862f + cc67fbe commit b13c82f

2 files changed

Lines changed: 5 additions & 6 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:12-alpine
1+
FROM node:14-alpine
22

33
RUN apk --no-cache add curl
44

src/creators/createAreaJourneysResponse.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
} from '../types/generated/schema-types'
77
import { CachedFetcher } from '../types/CachedFetcher'
88
import { cacheFetch } from '../cache'
9+
import { ForbiddenError } from 'apollo-server-errors'
910
import { groupBy, map } from 'lodash'
1011
import { createAreaJourneyObject } from '../objects/createAreaJourneyObject'
1112
import { createBBoxString } from '../utils/createBBoxString'
@@ -47,7 +48,9 @@ export const createAreaJourneysResponse = async (
4748
(events: Vehicles[]) => createAreaJourneyObject(events)
4849
)
4950
}
50-
51+
if (speedFilter && !user) {
52+
throw new ForbiddenError('Authentication required. Please login.')
53+
}
5154
// Cache for when a link containing an area query is shared.
5255
const cacheKey = `area_journeys_${createBBoxString(bbox)}_${minTime}_${maxTime}_${date}_${
5356
!!user && unsignedEvents ? 'unsigned' : ''
@@ -58,10 +61,6 @@ export const createAreaJourneysResponse = async (
5861
return []
5962
}
6063

61-
if (speedFilter && !user) {
62-
return []
63-
}
64-
6564
let hslGroup: boolean = false
6665
if (user) {
6766
if (requireUser(user, 'HSL')) {

0 commit comments

Comments
 (0)