diff --git a/api/src/exam-environment/routes/exam-environment.test.ts b/api/src/exam-environment/routes/exam-environment.test.ts index d8f853e090c..b0ccb5f2f28 100644 --- a/api/src/exam-environment/routes/exam-environment.test.ts +++ b/api/src/exam-environment/routes/exam-environment.test.ts @@ -21,7 +21,7 @@ jest.mock('../../utils/env', () => { return { ...jest.requireActual('../../utils/env'), FCC_ENABLE_EXAM_ENVIRONMENT: 'true', - DEPLOYMENT_ENV: 'production' + DEPLOYMENT_ENV: 'org' }; }); diff --git a/api/src/routes/protected/user.test.ts b/api/src/routes/protected/user.test.ts index 0ac38b9ddc4..c686cbc5dd8 100644 --- a/api/src/routes/protected/user.test.ts +++ b/api/src/routes/protected/user.test.ts @@ -29,7 +29,7 @@ import { getMsTranscriptApiUrl } from './user'; const mockedFetch = jest.fn(); jest.spyOn(globalThis, 'fetch').mockImplementation(mockedFetch); -let mockDeploymentEnv = 'staging'; +let mockDeploymentEnv = 'dev'; jest.mock('../../utils/env', () => { const actualEnv = jest.requireActual('../../utils/env'); // eslint-disable-next-line @typescript-eslint/no-unsafe-return @@ -1287,11 +1287,11 @@ Thanks and regards, describe('/user/exam-environment/token', () => { beforeEach(() => { - mockDeploymentEnv = 'production'; + mockDeploymentEnv = 'org'; }); afterAll(() => { - mockDeploymentEnv = 'staging'; + mockDeploymentEnv = 'dev'; }); afterEach(async () => { @@ -1359,14 +1359,14 @@ Thanks and regards, test('POST does not generate a new token in non-production environments for non-staff', async () => { // Override deployment environment for this test - mockDeploymentEnv = 'development'; + mockDeploymentEnv = 'dev'; const response = await superPost('/user/exam-environment/token'); expect(response.status).toBe(403); }); test('POST does generate a new token in non-production environments for staff', async () => { // Override deployment environment for this test - mockDeploymentEnv = 'staging'; + mockDeploymentEnv = 'dev'; await fastifyTestInstance.prisma.user.update({ where: { id: defaultUserId diff --git a/api/src/routes/protected/user.ts b/api/src/routes/protected/user.ts index a1b80ab50e7..37e4ef5277d 100644 --- a/api/src/routes/protected/user.ts +++ b/api/src/routes/protected/user.ts @@ -519,7 +519,7 @@ async function examEnvironmentTokenHandler( // In non-production environments, only staff are allowed to generate a token if ( - DEPLOYMENT_ENV !== 'production' && + DEPLOYMENT_ENV !== 'org' && (!req.user?.email?.endsWith('@freecodecamp.org') || !req.user?.emailVerified) ) {