Merge pull request #734 from freeCodeCamp/main

Create a new pull request by comparing changes across two branches. If you

Author: GulajavaMinistudio

.github/CODEOWNERS

@@ -34,9 +34,10 @@ pnpm-lock.yaml
 # Files that need attention from Curriculum team
 # -------------------------------------------------
 
-/curriculum/challenges/_meta/* @freecodecamp/curriculum
 /curriculum/challenges/english/* @freecodecamp/curriculum
-/client/i18n/locales/english/* @freecodecamp/curriculum
+/curriculum/challenges/structure/* @freecodecamp/dev-team @freecodecamp/curriculum
+/client/i18n/locales/english/* @freecodecamp/dev-team @freecodecamp/curriculum
+/client/src/pages/learn/* @freecodecamp/dev-team @freecodecamp/curriculum
 
 # -------------------------------------------------
 # Files that need attention from i18n & dev team
@@ -52,3 +53,4 @@ pnpm-lock.yaml
 
 /curriculum/schema/challenge-schema.js @freeCodeCamp/dev-team @freeCodeCamp/mobile
 /client/src/redux/prop-types.ts @freeCodeCamp/dev-team @freeCodeCamp/mobile
+/client/tools/external-curriculum/* @freeCodeCamp/dev-team @freeCodeCamp/mobile

api/prisma/schema.prisma

@@ -134,6 +134,13 @@ model user {
   is2018DataVisCert              Boolean? // Undefined
   is2018FullStackCert            Boolean? // Undefined
   isCollegeAlgebraPyCertV8       Boolean? // Undefined
+  isFrontEndLibsCertV9           Boolean? // Undefined
+  isBackEndDevApisCertV9         Boolean? // Undefined
+  isFullStackDeveloperCertV9     Boolean? // Undefined
+  isB1EnglishCert              Boolean? // Undefined
+  isA2SpanishCert              Boolean? // Undefined
+  isA2ChineseCert              Boolean? // Undefined
+  isA1ChineseCert              Boolean? // Undefined
   // isUpcomingPythonCertV8         Boolean? // Undefined. It is in the db but has never been used.
   keyboardShortcuts              Boolean? // Undefined
   linkedin                       String? // Null | Undefined

api/src/app.ts

@@ -224,6 +224,7 @@ export const build = async (
 
   void fastify.register(function (fastify, _opts, done) {
     fastify.addHook('onRequest', fastify.authorizeExamEnvironmentToken);
+    fastify.addHook('onRequest', fastify.send401IfNoUser);
 
     void fastify.register(examEnvironmentValidatedTokenRoutes);
     done();

api/src/exam-environment/routes/exam-environment.ts

@@ -24,6 +24,20 @@ import { isObjectID } from '../../utils/validation.js';
  */
 export const examEnvironmentValidatedTokenRoutes: FastifyPluginCallbackTypebox =
   (fastify, _options, done) => {
+    fastify.setErrorHandler((error, req, res) => {
+      // If the error does not match the format {code: string; message: string}, coerce into:
+      if (
+        !Object.hasOwnProperty.call(error, 'code') ||
+        !Object.hasOwnProperty.call(error, 'message')
+      ) {
+        const logger = fastify.log.child({ req, res });
+        logger.error(error, 'Unhandled error in exam environment routes.');
+        const str = JSON.stringify(error);
+        res.code(500);
+        res.send(ERRORS.FCC_ERR_UNKNOWN_STATE(str));
+      }
+    });
+
     fastify.get(
       '/exam-environment/exams',
       {
@@ -182,7 +196,16 @@ async function postExamGeneratedExamHandler(
   reply: FastifyReply
 ) {
   const logger = this.log.child({ req });
-  logger.info({ userId: req.user?.id });
+  const user = req.user;
+
+  if (!user) {
+    logger.error('No user found in request.');
+    this.Sentry.captureException('No user found in request.');
+    void reply.code(500);
+    return reply.send(ERRORS.FCC_ERR_UNKNOWN_STATE('No user found.'));
+  }
+
+  logger.info({ userId: user.id });
   // Get exam from DB
   const examId = req.body.examId;
   const maybeExam = await mapErr(
@@ -218,7 +241,6 @@ async function postExamGeneratedExamHandler(
   }
 
   // Check user has completed prerequisites
-  const user = req.user!;
   const isExamPrerequisitesMet = checkPrerequisites(user, exam.prerequisites);
 
   if (!isExamPrerequisitesMet) {
@@ -521,10 +543,18 @@ async function postExamAttemptHandler(
   reply: FastifyReply
 ) {
   const logger = this.log.child({ req });
-  logger.info({ userId: req.user?.id });
-  const { attempt } = req.body;
+  const user = req.user;
 
-  const user = req.user!;
+  if (!user) {
+    logger.error('No user found in request.');
+    this.Sentry.captureException('No user found in request.');
+    void reply.code(500);
+    return reply.send(ERRORS.FCC_ERR_UNKNOWN_STATE('No user found.'));
+  }
+
+  logger.info({ userId: user.id });
+
+  const { attempt } = req.body;
 
   const maybeAttempts = await mapErr(
     this.prisma.examEnvironmentExamAttempt.findMany({
@@ -651,23 +681,25 @@ async function postExamAttemptHandler(
   );
 
   if (maybeValidExamAttempt.hasError) {
-    logger.warn(
-      { validExamAttemptError: maybeValidExamAttempt.error },
-      'Invalid exam attempt.'
-    );
-    // As attempt is invalid, create moderation record to investigate
-    await this.prisma.examEnvironmentExamModeration.create({
-      data: {
+    const message =
+      maybeValidExamAttempt.error instanceof Error
+        ? maybeValidExamAttempt.error.message
+        : 'Unknown attempt validation error';
+    logger.warn({ validExamAttemptError: message }, 'Invalid exam attempt.');
+    // As attempt is invalid, create moderation record to investigate or update existing record
+    await this.prisma.examEnvironmentExamModeration.upsert({
+      where: { examAttemptId: latestAttempt.id },
+      create: {
         examAttemptId: latestAttempt.id,
-        status: ExamEnvironmentExamModerationStatus.Pending
+        status: ExamEnvironmentExamModerationStatus.Pending,
+        feedback: message
+      },
+      update: {
+        feedback: message
       }
     });
 
     void reply.code(400);
-    const message =
-      maybeValidExamAttempt.error instanceof Error
-        ? maybeValidExamAttempt.error.message
-        : 'Unknown attempt validation error';
     return reply.send(ERRORS.FCC_EINVAL_EXAM_ENVIRONMENT_EXAM_ATTEMPT(message));
   }
 
@@ -704,9 +736,17 @@ export async function getExams(
   reply: FastifyReply
 ) {
   const logger = this.log.child({ req });
-  logger.info({ userId: req.user?.id });
+  const user = req.user;
+
+  if (!user) {
+    logger.error('No user found in request.');
+    this.Sentry.captureException('No user found in request.');
+    void reply.code(500);
+    return reply.send(ERRORS.FCC_ERR_UNKNOWN_STATE('No user found.'));
+  }
+
+  logger.info({ userId: user.id });
 
-  const user = req.user!;
   const maybeExams = await mapErr(
     this.prisma.examEnvironmentExam.findMany({
       where: {
@@ -869,9 +909,16 @@ export async function getExamAttemptsHandler(
   reply: FastifyReply
 ) {
   const logger = this.log.child({ req });
-  logger.info({ userId: req.user?.id });
+  const user = req.user;
 
-  const user = req.user!;
+  if (!user) {
+    logger.error('No user found in request.');
+    this.Sentry.captureException('No user found in request.');
+    void reply.code(500);
+    return reply.send(ERRORS.FCC_ERR_UNKNOWN_STATE('No user found.'));
+  }
+
+  logger.info({ userId: user.id });
 
   // Send all relevant exam attempts
   const envExamAttempts = [];
@@ -929,9 +976,16 @@ export async function getExamAttemptHandler(
   reply: FastifyReply
 ) {
   const logger = this.log.child({ req });
-  logger.info({ userId: req.user?.id });
+  const user = req.user;
+
+  if (!user) {
+    logger.error('No user found in request.');
+    this.Sentry.captureException('No user found in request.');
+    void reply.code(500);
+    return reply.send(ERRORS.FCC_ERR_UNKNOWN_STATE('No user found.'));
+  }
+  logger.info({ userId: user.id });
 
-  const user = req.user!;
   const { attemptId } = req.params;
 
   // If attempt id is given, only return that attempt
@@ -988,8 +1042,15 @@ export async function getExamAttemptsByExamIdHandler(
   reply: FastifyReply
 ) {
   const logger = this.log.child({ req });
+  const user = req.user;
+
+  if (!user) {
+    logger.error('No user found in request.');
+    this.Sentry.captureException('No user found in request.');
+    void reply.code(500);
+    return reply.send(ERRORS.FCC_ERR_UNKNOWN_STATE('No user found.'));
+  }
 
-  const user = req.user!;
   const { examId } = req.params;
 
   logger.info({ examId, userId: user.id });

api/src/exam-environment/utils/errors.ts

@@ -39,7 +39,8 @@ export const ERRORS = {
     'FCC_ENOENT_EXAM_ENVIRONMENT_GENERATED_EXAM',
     '%s'
   ),
-  FCC_EINVAL_EXAM_ID: createError('FCC_EINVAL_EXAM_ID', '%s')
+  FCC_EINVAL_EXAM_ID: createError('FCC_EINVAL_EXAM_ID', '%s'),
+  FCC_ERR_UNKNOWN_STATE: createError('FCC_ERR_UNKNOWN_STATE', '%s')
 };
 
 /**

api/src/plugins/__fixtures__/user.ts

@@ -56,6 +56,13 @@ export const newUser = (email: string) => ({
   isRespWebDesignCert: false,
   isRespWebDesignCertV9: false,
   isSciCompPyCertV7: false,
+  isFrontEndLibsCertV9: false,
+  isBackEndDevApisCertV9: false,
+  isFullStackDeveloperCertV9: false,
+  isB1EnglishCert: false,
+  isA2SpanishCert: false,
+  isA2ChineseCert: false,
+  isA1ChineseCert: false,
   keyboardShortcuts: false,
   linkedin: null,
   location: '',

api/src/plugins/auth.ts

@@ -156,9 +156,12 @@ const auth: FastifyPluginCallback = (fastify, _options, done) => {
       });
 
     if (!token) {
-      return {
-        message: 'Token not found'
-      };
+      void reply.code(403);
+      return reply.send(
+        ERRORS.FCC_ENOENT_EXAM_ENVIRONMENT_AUTHORIZATION_TOKEN(
+          'Provided token is revoked.'
+        )
+      );
     }
     // We're using token.userId since it's possible for the user record to be
     // malformed and for prisma to throw while trying to find the user.

api/src/routes/helpers/certificate-utils.ts

@@ -21,9 +21,7 @@ const fullStackCertificateIds = [
  * @param certSlug - The certification slug to check.
  * @returns True if the certification slug is known, otherwise false.
  */
-export function isKnownCertSlug(
-  certSlug: string
-): certSlug is keyof typeof certSlugTypeMap {
+export function isKnownCertSlug(certSlug: string): certSlug is Certification {
   return certSlug in certSlugTypeMap;
 }
 

api/src/routes/helpers/user-utils.ts

@@ -34,6 +34,13 @@ const nullableFlags = [
   'isRespWebDesignCertV9',
   'isSciCompPyCertV7',
   'isDataAnalysisPyCertV7',
+  'isFrontEndLibsCertV9',
+  'isBackEndDevApisCertV9',
+  'isFullStackDeveloperCertV9',
+  'isB1EnglishCert',
+  'isA2SpanishCert',
+  'isA2ChineseCert',
+  'isA1ChineseCert',
   // isUpcomingPythonCertV8 exists in the db, but is not returned by the api-server
   // TODO(Post-MVP): delete it from the db?
   'keyboardShortcuts'

api/src/routes/protected/certificate.test.ts

@@ -13,6 +13,7 @@ import {
   defaultUserEmail,
   defaultUserId,
   devLogin,
+  resetDefaultUser,
   setupServer,
   superRequest
 } from '../../../vitest.utils.js';
@@ -35,30 +36,13 @@ describe('certificate routes', () => {
 
     describe('PUT /certificate/verify', () => {
       beforeEach(async () => {
+        await resetDefaultUser();
         await fastifyTestInstance.prisma.user.updateMany({
           where: { email: defaultUserEmail },
           data: {
-            completedChallenges: [],
-            is2018DataVisCert: false,
-            isA2EnglishCert: false,
-            isApisMicroservicesCert: false,
-            isCollegeAlgebraPyCertV8: false,
-            isDataAnalysisPyCertV7: false,
-            isFoundationalCSharpCertV8: false,
-            isFrontEndLibsCert: false,
-            isInfosecCertV7: false,
-            isJsAlgoDataStructCert: false,
-            isJavascriptCertV9: false,
-            isMachineLearningPyCertV7: false,
-            isPythonCertV9: false,
-            isQaCertV7: false,
-            isRelationalDatabaseCertV8: false,
-            isRelationalDatabaseCertV9: false,
-            isRespWebDesignCert: false,
-            isRespWebDesignCertV9: false,
-            isSciCompPyCertV7: false,
             name: 'fcc',
-            username: 'fcc'
+            username: 'fcc',
+            completedChallenges: []
           }
         });
       });
@@ -174,7 +158,6 @@ describe('certificate routes', () => {
         await fastifyTestInstance.prisma.user.updateMany({
           where: { email: defaultUserEmail },
           data: {
-            completedChallenges: [],
             isRespWebDesignCert: true
           }
         });
@@ -309,29 +292,37 @@ describe('certificate routes', () => {
             }
           },
           isCertMap: {
-            isA2EnglishCert: false,
-            isRespWebDesignCert: true,
-            isRespWebDesignCertV9: false,
-            isJavascriptCertV9: false,
-            isJsAlgoDataStructCert: false,
-            isFrontEndLibsCert: false,
             is2018DataVisCert: false,
+            isA1ChineseCert: false,
+            isA2ChineseCert: false,
+            isA2EnglishCert: false,
+            isA2SpanishCert: false,
             isApisMicroservicesCert: false,
-            isInfosecQaCert: false,
-            isQaCertV7: false,
-            isInfosecCertV7: false,
-            isFrontEndCert: false,
+            isB1EnglishCert: false,
             isBackEndCert: false,
+            isBackEndDevApisCertV9: false,
+            isCollegeAlgebraPyCertV8: false,
+            isDataAnalysisPyCertV7: false,
             isDataVisCert: false,
+            isFoundationalCSharpCertV8: false,
+            isFrontEndCert: false,
+            isFrontEndLibsCert: false,
+            isFrontEndLibsCertV9: false,
             isFullStackCert: false,
-            isSciCompPyCertV7: false,
-            isDataAnalysisPyCertV7: false,
+            isFullStackDeveloperCertV9: false,
+            isInfosecCertV7: false,
+            isInfosecQaCert: false,
+            isJavascriptCertV9: false,
+            isJsAlgoDataStructCert: false,
+            isJsAlgoDataStructCertV8: false,
             isMachineLearningPyCertV7: false,
-            isRelationalDatabaseCertV8: false,
-            isCollegeAlgebraPyCertV8: false,
-            isFoundationalCSharpCertV8: false,
             isPythonCertV9: false,
-            isRelationalDatabaseCertV9: false
+            isQaCertV7: false,
+            isRelationalDatabaseCertV8: false,
+            isRelationalDatabaseCertV9: false,
+            isRespWebDesignCert: true,
+            isRespWebDesignCertV9: false,
+            isSciCompPyCertV7: false
           },
           completedChallenges: [
             {