-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1631 from govuk-one-login/origin/AUT-2164/Create_…
…code_for_a_new_endpoint_on_the_Auth_Internal_API AUT-2164: Add service for checking fraud emails and feature switch
- Loading branch information
Showing
15 changed files
with
153 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
src/components/check-email-fraud-block/checkEmailFraudBlockService.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
import { | ||
createApiResponse, | ||
getRequestConfig, | ||
Http, | ||
http, | ||
} from "../../utils/http"; | ||
import { API_ENDPOINTS } from "../../app.constants"; | ||
import { ApiResponseResult } from "../../types"; | ||
import { | ||
CheckEmailFraudBlockInterface, | ||
CheckEmailFraudBlockResponse, | ||
} from "./types"; | ||
|
||
export function checkEmailFraudBlockService( | ||
axios: Http = http | ||
): CheckEmailFraudBlockInterface { | ||
const checkEmailFraudBlock = async function ( | ||
email: string, | ||
sessionId: string, | ||
sourceIp: string, | ||
clientSessionId: string, | ||
persistentSessionId: string | ||
): Promise<ApiResponseResult<CheckEmailFraudBlockResponse>> { | ||
const response = await axios.client.post<CheckEmailFraudBlockResponse>( | ||
API_ENDPOINTS.CHECK_EMAIL_FRAUD_BLOCK, | ||
{ | ||
email: email.toLowerCase(), | ||
}, | ||
getRequestConfig({ | ||
sessionId: sessionId, | ||
sourceIp: sourceIp, | ||
clientSessionId: clientSessionId, | ||
persistentSessionId: persistentSessionId, | ||
}) | ||
); | ||
return createApiResponse<CheckEmailFraudBlockResponse>(response); | ||
}; | ||
return { | ||
checkEmailFraudBlock, | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { ApiResponseResult, DefaultApiResponse } from "../../types"; | ||
|
||
export interface CheckEmailFraudBlockInterface { | ||
checkEmailFraudBlock: ( | ||
email: string, | ||
sessionId: string, | ||
sourceIp: string, | ||
clientSessionId: string, | ||
persistentSessionId: string | ||
) => Promise<ApiResponseResult<CheckEmailFraudBlockResponse>>; | ||
} | ||
|
||
export interface CheckEmailFraudBlockResponse extends DefaultApiResponse { | ||
email: string; | ||
isBlockedStatus: string; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,13 +16,27 @@ import { SendNotificationServiceInterface } from "../../common/send-notification | |
import { mockResponse, RequestOutput, ResponseOutput } from "mock-req-res"; | ||
import { CheckReauthServiceInterface } from "../../check-reauth-users/types"; | ||
import { createMockRequest } from "../../../../test/helpers/mock-request-helper"; | ||
import { CheckEmailFraudBlockInterface } from "../../check-email-fraud-block/types"; | ||
|
||
describe("enter email controller", () => { | ||
let req: RequestOutput; | ||
let res: ResponseOutput; | ||
let clock: sinon.SinonFakeTimers; | ||
const date = new Date(Date.UTC(2024, 1, 1)); | ||
|
||
const checkReauthSuccessfulFakeService: CheckReauthServiceInterface = { | ||
checkReauthUsers: sinon.fake.returns({ | ||
success: true, | ||
}), | ||
} as unknown as CheckReauthServiceInterface; | ||
|
||
const checkEmailFraudFakeSuccessfulService: CheckEmailFraudBlockInterface = { | ||
checkEmailFraudBlock: sinon.fake.returns({ | ||
success: true, | ||
data: { email: "[email protected]", isBlockedStatus: "Pending" }, | ||
}), | ||
} as unknown as CheckEmailFraudBlockInterface; | ||
|
||
beforeEach(() => { | ||
res = mockResponse(); | ||
clock = sinon.useFakeTimers({ | ||
|
@@ -145,7 +159,11 @@ describe("enter email controller", () => { | |
req.body.email = "test.test.com"; | ||
res.locals.sessionId = "dsad.dds"; | ||
|
||
await enterEmailPost(fakeService)(req as Request, res as Response); | ||
await enterEmailPost( | ||
fakeService, | ||
checkReauthSuccessfulFakeService, | ||
checkEmailFraudFakeSuccessfulService | ||
)(req as Request, res as Response); | ||
|
||
expect(fakeService.userExists).to.have.been.calledOnce; | ||
expect(res.redirect).to.have.calledWith(PATH_NAMES.ENTER_PASSWORD); | ||
|
@@ -162,7 +180,11 @@ describe("enter email controller", () => { | |
req.body.email = "test.test.com"; | ||
res.locals.sessionId = "sadl990asdald"; | ||
|
||
await enterEmailPost(fakeService)(req as Request, res as Response); | ||
await enterEmailPost( | ||
fakeService, | ||
checkReauthSuccessfulFakeService, | ||
checkEmailFraudFakeSuccessfulService | ||
)(req as Request, res as Response); | ||
|
||
expect(res.redirect).to.have.calledWith(PATH_NAMES.ACCOUNT_NOT_FOUND); | ||
expect(fakeService.userExists).to.have.been.calledOnce; | ||
|
@@ -190,7 +212,11 @@ describe("enter email controller", () => { | |
req.body.email = "[email protected]"; | ||
res.locals.sessionId = "sadl990asdald"; | ||
|
||
await enterEmailPost(fakeService)(req as Request, res as Response); | ||
await enterEmailPost( | ||
fakeService, | ||
checkReauthSuccessfulFakeService, | ||
checkEmailFraudFakeSuccessfulService | ||
)(req as Request, res as Response); | ||
|
||
const expectedLockTime = new Date( | ||
date.getTime() + lockTTlInSeconds * 1000 | ||
|
@@ -450,16 +476,11 @@ describe("enter email controller", () => { | |
}), | ||
} as unknown as EnterEmailServiceInterface; | ||
|
||
const successfulFakeService: CheckReauthServiceInterface = { | ||
checkReauthUsers: sinon.fake.returns({ | ||
success: true, | ||
}), | ||
} as unknown as CheckReauthServiceInterface; | ||
|
||
await enterEmailPost(fakeService, successfulFakeService)( | ||
req as Request, | ||
res as Response | ||
); | ||
await enterEmailPost( | ||
fakeService, | ||
checkReauthSuccessfulFakeService, | ||
checkEmailFraudFakeSuccessfulService | ||
)(req as Request, res as Response); | ||
|
||
expect(res.redirect).to.have.calledWith(PATH_NAMES.ENTER_PASSWORD); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,6 @@ | ||
import request from "supertest"; | ||
import { describe } from "mocha"; | ||
import { expect, sinon } from "../../../../test/utils/test-utils"; | ||
import nock = require("nock"); | ||
import * as cheerio from "cheerio"; | ||
import decache from "decache"; | ||
import { | ||
|
@@ -13,6 +12,7 @@ import { CheckReauthServiceInterface } from "../../check-reauth-users/types"; | |
import { AxiosResponse } from "axios"; | ||
import { createApiResponse } from "../../../utils/http"; | ||
import { DefaultApiResponse } from "../../../types"; | ||
import nock = require("nock"); | ||
|
||
describe("Integration::enter email", () => { | ||
let token: string | string[]; | ||
|
@@ -21,6 +21,7 @@ describe("Integration::enter email", () => { | |
let baseApi: string; | ||
|
||
before(async () => { | ||
process.env.SUPPORT_CHECK_EMAIL_FRAUD = "1"; | ||
decache("../../../app"); | ||
decache("../../../middleware/session-middleware"); | ||
const sessionMiddleware = require("../../../middleware/session-middleware"); | ||
|
@@ -167,6 +168,13 @@ describe("Integration::enter email", () => { | |
email: "[email protected]", | ||
doesUserExist: true, | ||
}); | ||
nock(baseApi) | ||
.post(API_ENDPOINTS.CHECK_EMAIL_FRAUD_BLOCK) | ||
.once() | ||
.reply(HTTP_STATUS_CODES.OK, { | ||
email: "[email protected]", | ||
isBlockedStatus: "Pending", | ||
}); | ||
|
||
request(app) | ||
.post(PATH_NAMES.ENTER_EMAIL_SIGN_IN) | ||
|
@@ -185,6 +193,13 @@ describe("Integration::enter email", () => { | |
email: "[email protected]", | ||
doesUserExist: false, | ||
}); | ||
nock(baseApi) | ||
.post(API_ENDPOINTS.CHECK_EMAIL_FRAUD_BLOCK) | ||
.once() | ||
.reply(HTTP_STATUS_CODES.OK, { | ||
email: "[email protected]", | ||
isBlockedStatus: "Pending", | ||
}); | ||
|
||
request(app) | ||
.post(PATH_NAMES.ENTER_EMAIL_SIGN_IN) | ||
|
@@ -236,6 +251,14 @@ describe("Integration::enter email", () => { | |
doesUserExist: true, | ||
}); | ||
|
||
nock(baseApi) | ||
.post(API_ENDPOINTS.CHECK_EMAIL_FRAUD_BLOCK) | ||
.once() | ||
.reply(HTTP_STATUS_CODES.OK, { | ||
email: "[email protected]", | ||
isBlockedStatus: "Pending", | ||
}); | ||
|
||
request(app) | ||
.post(PATH_NAMES.ENTER_EMAIL_SIGN_IN) | ||
.type("form") | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters