Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Bump prettier from 1.19.1 to 2.2.1 #55

Merged
merged 2 commits into from Jan 13, 2021
Merged

Bump prettier from 1.19.1 to 2.2.1 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1117463
Bump prettier from 1.19.1 to 2.2.1
dependabot[bot] Jan 13, 2021
0199ae5
fix: formatting
simoneb Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/plugins/verify/index.js
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ async function verify(server, options) {
throw error
}

server.decorateRequest('verify', async function(nonce) {
server.decorateRequest('verify', async function (nonce) {
const { deviceVerification, isProduction } = options
const {
deviceVerificationPayload,
Expand Down
47 changes: 5 additions & 42 deletions lib/routes/check-in/schema.js
View file
Open in desktop
Expand Up @@ -13,49 +13,12 @@ const checkIn = {
.prop('status', S.anyOf([S.null(), S.string().enum(['p', 'c', 'u'])]))
.prop(
'date',
S.anyOf([
S.null(),
S.string()
.minLength(10)
.maxLength(10)
])
)
.prop(
'fever',
S.anyOf([
S.null(),
S.number()
.minimum(0)
.maximum(1)
])
)
.prop(
'cough',
S.anyOf([
S.null(),
S.number()
.minimum(0)
.maximum(1)
])
)
.prop(
'breath',
S.anyOf([
S.null(),
S.number()
.minimum(0)
.maximum(1)
])
)
.prop(
'flu',
S.anyOf([
S.null(),
S.number()
.minimum(0)
.maximum(1)
])
S.anyOf([S.null(), S.string().minLength(10).maxLength(10)])
)
.prop('fever', S.anyOf([S.null(), S.number().minimum(0).maximum(1)]))
.prop('cough', S.anyOf([S.null(), S.number().minimum(0).maximum(1)]))
.prop('breath', S.anyOf([S.null(), S.number().minimum(0).maximum(1)]))
.prop('flu', S.anyOf([S.null(), S.number().minimum(0).maximum(1)]))
)
),
response: {
Expand Down
54 changes: 10 additions & 44 deletions lib/routes/exposures/schema.js
View file
Open in desktop
Expand Up @@ -2,12 +2,7 @@ const S = require('fluent-schema')

const certificate = {
body: S.object()
.prop(
'ekeyhmac',
S.string()
.minLength(44)
.maxLength(44)
)
.prop('ekeyhmac', S.string().minLength(44).maxLength(44))
.prop('token', S.string()),
response: {
200: S.object()
Expand All @@ -23,9 +18,7 @@ const exchange = {
200: S.object()
.prop(
'testtype',
S.string()
.enum(['confirmed', 'likely', 'negative'])
.required()
S.string().enum(['confirmed', 'likely', 'negative']).required()
)
.prop('symptomDate', S.string().format('date'))
.prop('token', S.string().required())
Expand Down Expand Up @@ -56,35 +49,19 @@ const temporaryExposureKey = S.object()
.oneOf([
S.object().prop(
'transmissionRisk',
S.number()
.minimum(0)
.maximum(8)
.required()
S.number().minimum(0).maximum(8).required()
),
S.object().prop(
'transmissionRiskLevel',
S.number()
.minimum(0)
.maximum(8)
.required()
S.number().minimum(0).maximum(8).required()
)
])
.prop('rollingStartNumber', S.number().required())
.prop(
'rollingPeriod',
S.number()
.minimum(1)
.maximum(144)
)
.prop('rollingPeriod', S.number().minimum(1).maximum(144))

const uploadBody = S.object()
.oneOf([
S.object().prop(
'token',
S.string()
.format('uuid')
.required()
),
S.object().prop('token', S.string().format('uuid').required()),
S.object()
.prop('appPackageName', S.string())
.prop('hmackey', S.string().required())
Expand All @@ -93,22 +70,16 @@ const uploadBody = S.object()
.oneOf([
S.object().prop(
'exposures',
S.array()
.items(temporaryExposureKey)
.required()
S.array().items(temporaryExposureKey).required()
),
S.object().prop(
'temporaryExposureKeys',
S.array()
.items(temporaryExposureKey)
.required()
S.array().items(temporaryExposureKey).required()
)
])
.prop(
'platform',
S.string()
.enum(['android', 'ios', 'recaptcha', 'test'])
.required()
S.string().enum(['android', 'ios', 'recaptcha', 'test']).required()
)
.prop('deviceVerificationPayload', S.string().required())
.prop('regions', S.array().items(S.string().pattern(/[A-Z]{2}/)))
Expand All @@ -133,12 +104,7 @@ const upload = {
const verify = {
body: S.object().prop('hash', S.string().pattern(/[a-z0-9]{256}/)),
response: {
200: S.object().prop(
'token',
S.string()
.format('uuid')
.required()
)
200: S.object().prop('token', S.string().format('uuid').required())
}
}

Expand Down
14 changes: 2 additions & 12 deletions lib/routes/metrics/schema.js
View file
Open in desktop
Expand Up @@ -2,18 +2,8 @@ const S = require('fluent-schema')

const event = options => ({
body: S.object()
.prop(
'event',
S.string()
.enum(Object.keys(options.metrics))
.required()
)
.prop(
'os',
S.string()
.enum(['android', 'ios'])
.required()
)
.prop('event', S.string().enum(Object.keys(options.metrics)).required())
.prop('os', S.string().enum(['android', 'ios']).required())
.prop('version', S.string()),
response: {
204: S.null()
Expand Down
25 changes: 4 additions & 21 deletions lib/routes/notices/schema.js
View file
Open in desktop
@@ -1,8 +1,6 @@
const S = require('fluent-schema')

const key = S.string()
.format('uuid')
.required()
const key = S.string().format('uuid').required()

const create = {
response: {
Expand All @@ -12,19 +10,9 @@ const create = {

const verify = {
body: S.object()
.prop(
'selfIsolationEndDate',
S.string()
.format(S.FORMATS.DATE)
.required()
)
.prop('selfIsolationEndDate', S.string().format(S.FORMATS.DATE).required())
.prop('nonce', S.string().required())
.prop(
'platform',
S.string()
.enum(['android', 'ios', 'test'])
.required()
)
.prop('platform', S.string().enum(['android', 'ios', 'test']).required())
.prop('deviceVerificationPayload', S.string().required())
.prop('timestamp', S.number()),
response: {
Expand All @@ -36,12 +24,7 @@ const send = {
body: S.object()
.prop('key', key)
.prop('senderFullName', S.string().required())
.prop(
'senderEmail',
S.string()
.format(S.FORMATS.EMAIL)
.required()
)
.prop('senderEmail', S.string().format(S.FORMATS.EMAIL).required())
.prop(
'recipients',
S.array()
Expand Down
71 changes: 10 additions & 61 deletions lib/routes/qr-code/schema.js
View file
Open in desktop
Expand Up @@ -8,32 +8,16 @@ const create = {
.prop('venueType', S.string().required())
.prop('venueName', S.string().required())
.prop('venueAddress', S.string().required())
.prop(
'venueLocation',
S.array()
.items(S.number())
.minItems(2)
.maxItems(2)
)
.prop(
'contactEmail',
S.string()
.format(S.FORMATS.EMAIL)
.required()
)
.prop('venueLocation', S.array().items(S.number()).minItems(2).maxItems(2))
.prop('contactEmail', S.string().format(S.FORMATS.EMAIL).required())
.prop('contactPhone', S.string().required()),
response: {
204: S.null()
}
}

const email = {
body: S.object().prop(
'emailAddress',
S.string()
.format('email')
.required()
),
body: S.object().prop('emailAddress', S.string().format('email').required()),
response: {
204: S.null()
}
Expand All @@ -46,18 +30,8 @@ const risky = {
S.array().items(
S.object()
.prop('id', S.string().required())
.prop(
'from',
S.string()
.format('date-time')
.required()
)
.prop(
'to',
S.string()
.format('date-time')
.required()
)
.prop('from', S.string().format('date-time').required())
.prop('to', S.string().format('date-time').required())
)
)
}
Expand All @@ -79,38 +53,18 @@ const types = {

const upload = {
body: S.object()
.prop(
'token',
S.string()
.format('uuid')
.required()
)
.prop('token', S.string().format('uuid').required())
.prop(
'venues',
S.array()
.items(
S.object()
.prop(
'id',
S.string()
.format('uuid')
.required()
)
.prop(
'date',
S.string()
.format('date-time')
.required()
)
.prop('id', S.string().format('uuid').required())
.prop('date', S.string().format('date-time').required())
)
.required()
)
.prop(
'platform',
S.string()
.enum(['android', 'ios', 'test'])
.required()
)
.prop('platform', S.string().enum(['android', 'ios', 'test']).required())
.prop('deviceVerificationPayload', S.string().required()),
response: {
204: S.null()
Expand All @@ -119,12 +73,7 @@ const upload = {

const verify = {
body: S.object()
.prop(
'emailAddress',
S.string()
.format('email')
.required()
)
.prop('emailAddress', S.string().format('email').required())
.prop('verificationCode', S.string().required()),
response: {
200: S.object().prop('token', S.string().required())
Expand Down
4 changes: 1 addition & 3 deletions lib/routes/register/schema.js
View file
Open in desktop
Expand Up @@ -23,9 +23,7 @@ const verify = {
.prop('nonce', S.string().required())
.prop(
'platform',
S.string()
.enum(['android', 'ios', 'recaptcha', 'test'])
.required()
S.string().enum(['android', 'ios', 'recaptcha', 'test']).required()
)
.prop('deviceVerificationPayload', S.string().required())
.prop('timestamp', S.number()),
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@
"jest": "^24.0.0",
"lint-staged": "^10.5.3",
"pino-pretty": "^3.5.0",
"prettier": "^1.19.1",
"prettier": "^2.2.1",
"prettier-config-standard": "^1.0.1"
},
"lint-staged": {
Expand Down