Skip to content

Commit c63dc7e

Browse files
committed
fix: lint and fix sp tc
1 parent 1f7bfeb commit c63dc7e

File tree

11 files changed

+326
-2138
lines changed

11 files changed

+326
-2138
lines changed

src/app/modules/form/admin-form/__tests__/admin-form.controller.spec.ts

Lines changed: 0 additions & 1012 deletions
Large diffs are not rendered by default.

src/app/modules/myinfo/myinfo.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,6 +462,7 @@ export class MyInfoServiceClass {
462462
return Result.fromThrowable(
463463
() => jwt.verify(loginJwt, spcpMyInfoConfig.myInfoJwtSecret),
464464
(error) => {
465+
console.log('xxx4', error)
465466
logger.error({
466467
message: 'Error while verifying MyInfo login cookie',
467468
meta: {
@@ -475,6 +476,7 @@ export class MyInfoServiceClass {
475476
if (isMyInfoLoginCookie(decoded)) {
476477
return ok(decoded)
477478
}
479+
console.log('xxx3', decoded)
478480
return err(new MyInfoInvalidLoginCookieError())
479481
})
480482
}

src/app/modules/payments/payments.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ export const performPaymentPostSubmissionActions = (
242242
performEncryptPostSubmissionActions({
243243
submission,
244244
responses: payment.responses,
245-
emailFields: [], // TODO [EMAIL-CONFIRMATION-BUG]: Email confirmation email to email fields does not work for payment forms, this is an existing issue to be fixed.
245+
emailFields: [], // TODO [EMAIL-CONFIRMATION-BUG]: Email confirmation email to email fields does not work for payment forms, this is an existing issue to be fixed.
246246
})
247247
.andThen(() =>
248248
// If successfully sent email confirmations, delete response data from payment document.

src/app/modules/submission/__tests__/submission.service.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ describe('submission.service', () => {
668668
submissionAttachments: MOCK_ATTACHMENTS,
669669
pdfAttachment: undefined,
670670
isPaymentEnabled: false,
671-
responsesData: undefined,
671+
responsesData: [],
672672
})
673673

674674
const expectedAutoReplyData = [

src/app/modules/submission/encrypt-submission/__tests__/encrypt-submission.service.spec.ts

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,22 +165,14 @@ describe('encrypt-submission.service', () => {
165165

166166
expect(
167167
MockMailService.sendSubmissionToAdmin.mock.calls[0][0].formData,
168-
).toEqual(
169-
expect.arrayContaining([
170-
expect.objectContaining({
171-
answer: MOCK_NRIC,
172-
fieldType: BasicField.Nric,
173-
isVisible: true,
174-
question: SgidFieldTitle.SgidNric,
175-
}),
176-
]),
177-
)
178-
179-
// Does not contain any other fields
180-
expect(
181-
MockMailService.sendSubmissionToAdmin.mock.calls[0][0].formData
182-
.length,
183-
).toEqual(1)
168+
).toEqual([
169+
{
170+
answer: MOCK_NRIC,
171+
fieldType: BasicField.Nric,
172+
answerTemplate: [MOCK_NRIC],
173+
question: SgidFieldTitle.SgidNric,
174+
},
175+
])
184176
})
185177
})
186178

src/app/modules/submission/encrypt-submission/encrypt-submission.controller.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ const submitEncryptModeForm = async (
197197
}
198198
case FormAuthType.SGID_MyInfo:
199199
case FormAuthType.MyInfo: {
200+
console.log('xxx', req.cookies)
200201
const jwtPayloadResult = await extractMyInfoLoginJwt(
201202
req.cookies,
202203
authType,
@@ -206,6 +207,7 @@ const submitEncryptModeForm = async (
206207
return uinFin
207208
})
208209
.mapErr((error) => {
210+
console.log('xxx2', error)
209211
logger.error({
210212
message: `Error verifying MyInfo${
211213
authType === FormAuthType.SGID_MyInfo ? '(over SGID)' : ''

src/app/modules/submission/encrypt-submission/encrypt-submission.service.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ import mongoose from 'mongoose'
33
import { err, ok, okAsync, Result, ResultAsync } from 'neverthrow'
44
import Mail from 'nodemailer/lib/mailer'
55

6-
import { AutoreplyPdfGenerationError } from '../../../services/mail/mail.errors'
7-
import {
8-
AutoReplyMailData,
9-
AutoreplySummaryRenderData,
10-
} from '../../../services/mail/mail.types'
11-
import { generateAutoreplyPdf } from '../../../services/mail/mail.utils'
12-
136
import {
147
DateString,
158
FormResponseMode,
@@ -26,7 +19,13 @@ import {
2619
import config from '../../../config/config'
2720
import { createLoggerWithLabel } from '../../../config/logger'
2821
import { getEncryptSubmissionModel } from '../../../models/submission.server.model'
22+
import { AutoreplyPdfGenerationError } from '../../../services/mail/mail.errors'
2923
import MailService from '../../../services/mail/mail.service'
24+
import {
25+
AutoReplyMailData,
26+
AutoreplySummaryRenderData,
27+
} from '../../../services/mail/mail.types'
28+
import { generateAutoreplyPdf } from '../../../services/mail/mail.utils'
3029
import { createQueryWithDateParam } from '../../../utils/date'
3130
import { getMongoErrorMessage } from '../../../utils/handle-mongo-error'
3231
import { DatabaseError, PossibleDatabaseError } from '../../core/core.errors'

src/app/modules/submission/submission.utils.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ import {
1313
} from 'lodash'
1414
import mongoose from 'mongoose'
1515
import { err, ok, Result } from 'neverthrow'
16-
import { handleAddressResponseDisplay } from '../../../../shared/utils/address'
17-
import { SIGNATURE_CAPTURED_STRING } from '../../../../shared/utils/signature'
18-
19-
import { convertToSignaturePngDataUri } from '../../utils/convert-vector-array-to-png'
2016

2117
import {
2218
CLIENT_CHECKBOX_OTHERS_INPUT_VALUE,
@@ -41,7 +37,9 @@ import {
4137
SubmittedStep,
4238
WorkflowStatus,
4339
} from '../../../../shared/types'
40+
import { handleAddressResponseDisplay } from '../../../../shared/utils/address'
4441
import * as FileValidation from '../../../../shared/utils/file-validation'
42+
import { SIGNATURE_CAPTURED_STRING } from '../../../../shared/utils/signature'
4543
import {
4644
EmailRespondentConfirmationField,
4745
FieldResponse,
@@ -83,6 +81,7 @@ import {
8381
VerifyTurnstileError,
8482
} from '../../services/turnstile/turnstile.errors'
8583
import { CreatePresignedPostError } from '../../utils/aws-s3'
84+
import { convertToSignaturePngDataUri } from '../../utils/convert-vector-array-to-png'
8685
import { genericMapRouteErrorTransform } from '../../utils/error'
8786
import {
8887
DatabaseConflictError,

0 commit comments

Comments
 (0)