Merge remote-tracking branch 'test/main' into PFEH25-merge-it2main

Update LICENSE

LICENSE

@@ -2,6 +2,7 @@ MIT License
 
 Copyright (c) 2023 ETS-PFE004-Plateforme-sondage-minitest
 Copyright (c) 2024 Louis-Antoine Caron, Mathieu Roy, Mélanie St-Hilaire, Samy Waddah
+Copyright (c) 2024 Gabriel Moisan-Matte, Mathieu Sévigny-Lavallée, Jerry Kwok Hiu Fung, Bruno Roesner, Florent Serres
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

client/src/__tests__/components/QuestionsDisplay/MultipleChoiceQuestionDisplay/MultipleChoiceQuestionDisplay.test.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { render, screen, fireEvent } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { act } from 'react';
@@ -17,21 +17,30 @@ const question = questions[0];
 
 describe('MultipleChoiceQuestionDisplay', () => {
     const mockHandleOnSubmitAnswer = jest.fn();
-    const sampleProps = {
-        question: question,
-        handleOnSubmitAnswer: mockHandleOnSubmitAnswer,
-        showAnswer: false
+
+    const TestWrapper = ({ showAnswer }: { showAnswer: boolean }) => {
+        const [showAnswerState, setShowAnswerState] = useState(showAnswer);
+
+        const handleOnSubmitAnswer = (answer: string) => {
+            mockHandleOnSubmitAnswer(answer);
+            setShowAnswerState(true);
+        };
+
+        return (
+            <MemoryRouter>
+                <MultipleChoiceQuestionDisplay
+                    question={question}
+                    handleOnSubmitAnswer={handleOnSubmitAnswer}
+                    showAnswer={showAnswerState}
+                />
+            </MemoryRouter>
+        );
     };
 
     const choices = question.choices;
 
     beforeEach(() => {
-        render(
-            <MemoryRouter>
-                <MultipleChoiceQuestionDisplay
-                  {...sampleProps}
-                    />
-            </MemoryRouter>);
+        render(<TestWrapper showAnswer={false} />);
     });
 
     test('renders the question and choices', () => {
@@ -55,7 +64,6 @@ describe('MultipleChoiceQuestionDisplay', () => {
         act(() => {
             fireEvent.click(choiceButton);
         });
-
         const submitButton = screen.getByText('Répondre');
         act(() => {
             fireEvent.click(submitButton);
@@ -63,4 +71,51 @@ describe('MultipleChoiceQuestionDisplay', () => {
 
         expect(mockHandleOnSubmitAnswer).toHaveBeenCalledWith('Choice 1');
     });
-});
+
+    it('should show ✅ next to the correct answer and ❌ next to the wrong answers when showAnswer is true', async () => {
+        const choiceButton = screen.getByText('Choice 1').closest('button');
+        if (!choiceButton) throw new Error('Choice button not found');
+
+        // Click on choiceButton
+        act(() => {
+            fireEvent.click(choiceButton);
+        });
+
+        const button = screen.getByText("Répondre");
+
+        act(() => {
+            fireEvent.click(button);
+        });
+
+        // Wait for the DOM to update
+            const correctAnswer = screen.getByText("Choice 1").closest('button');
+            expect(correctAnswer).toBeInTheDocument();
+            expect(correctAnswer?.textContent).toContain('✅');
+
+            const wrongAnswer1 = screen.getByText("Choice 2").closest('button');
+            expect(wrongAnswer1).toBeInTheDocument();
+            expect(wrongAnswer1?.textContent).toContain('❌');
+    });
+
+    it('should not show ✅ or ❌ when repondre button is not clicked', async () => {
+        const choiceButton = screen.getByText('Choice 1').closest('button');
+        if (!choiceButton) throw new Error('Choice button not found');
+
+        // Click on choiceButton
+        act(() => {
+            fireEvent.click(choiceButton);
+        });
+
+        // Check for correct answer
+        const correctAnswer = screen.getByText("Choice 1").closest('button');
+        expect(correctAnswer).toBeInTheDocument();
+        expect(correctAnswer?.textContent).not.toContain('✅');
+
+        // Check for wrong answers
+        const wrongAnswer1 = screen.getByText("Choice 2");
+        expect(wrongAnswer1).toBeInTheDocument();
+        expect(wrongAnswer1?.textContent).not.toContain('❌');
+    });
+
+    });
+

client/src/__tests__/components/QuestionsDisplay/TrueFalseQuestionDisplay/TrueFalseQuestionDisplay.test.tsx

@@ -1,5 +1,5 @@
 // TrueFalseQuestion.test.tsx
-import React from 'react';
+import React, { useState } from 'react';
 import { render, fireEvent, screen, act } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { MemoryRouter } from 'react-router-dom';
@@ -9,20 +9,31 @@ import { parse, TrueFalseQuestion } from 'gift-pegjs';
 describe('TrueFalseQuestion Component', () => {
     const mockHandleSubmitAnswer = jest.fn();
     const sampleStem = 'Sample True False Question';
-    const trueFalseQuestion = 
+    const trueFalseQuestion =
         parse(`${sampleStem}{T}`)[0] as TrueFalseQuestion;
 
-    const sampleProps = {
-        question: trueFalseQuestion,
-        handleOnSubmitAnswer: mockHandleSubmitAnswer,
-        showAnswer: false
+
+    const TestWrapper = ({ showAnswer }: { showAnswer: boolean }) => {
+        const [showAnswerState, setShowAnswerState] = useState(showAnswer);
+
+        const handleOnSubmitAnswer = (answer: boolean) => {
+            mockHandleSubmitAnswer(answer);
+            setShowAnswerState(true);
+        };
+
+        return (
+            <MemoryRouter>
+                <TrueFalseQuestionDisplay
+                    question={trueFalseQuestion}
+                    handleOnSubmitAnswer={handleOnSubmitAnswer}
+                    showAnswer={showAnswerState}
+                />
+            </MemoryRouter>
+        );
     };
 
     beforeEach(() => {
-        render(
-            <MemoryRouter>
-                <TrueFalseQuestionDisplay {...sampleProps} />
-            </MemoryRouter>);
+        render(<TestWrapper showAnswer={false} />);
     });
 
     it('renders correctly', () => {
@@ -73,4 +84,50 @@ describe('TrueFalseQuestion Component', () => {
 
         expect(mockHandleSubmitAnswer).toHaveBeenCalledWith(false);
     });
+
+
+        it('should show ✅ next to the correct answer and ❌ next to the wrong answers when showAnswer is true', async () => {
+            const choiceButton = screen.getByText('Vrai').closest('button');
+            if (!choiceButton) throw new Error('T button not found');
+    
+            // Click on choiceButton
+            act(() => {
+                fireEvent.click(choiceButton);
+            });
+    
+            const button = screen.getByText("Répondre");
+    
+            act(() => {
+                fireEvent.click(button);
+            });
+    
+            // Wait for the DOM to update
+                const correctAnswer = screen.getByText("Vrai").closest('button');
+                expect(correctAnswer).toBeInTheDocument();
+                expect(correctAnswer?.textContent).toContain('✅');
+    
+                const wrongAnswer1 = screen.getByText("Faux").closest('button');
+                expect(wrongAnswer1).toBeInTheDocument();
+                expect(wrongAnswer1?.textContent).toContain('❌');
+        });
+    
+        it('should not show ✅ or ❌ when repondre button is not clicked', async () => {
+            const choiceButton = screen.getByText('Vrai').closest('button');
+            if (!choiceButton) throw new Error('Choice button not found');
+    
+            // Click on choiceButton
+            act(() => {
+                fireEvent.click(choiceButton);
+            });
+    
+            // Check for correct answer
+            const correctAnswer = screen.getByText("Vrai").closest('button');
+            expect(correctAnswer).toBeInTheDocument();
+            expect(correctAnswer?.textContent).not.toContain('✅');
+    
+            // Check for wrong answers
+            const wrongAnswer1 = screen.getByText("Faux");
+            expect(wrongAnswer1).toBeInTheDocument();
+            expect(wrongAnswer1?.textContent).not.toContain('❌');
+        });
 });

client/src/components/GIFTCheatSheet/GiftCheatSheet.tsx

@@ -153,7 +153,7 @@ const GiftCheatSheet: React.FC = () => {
                 </pre>
             </div>
 
-            <div className="question-type">
+            <div className="question-type" id="images-section">
                 <h4> 9. Images </h4>
                 <p>Il est possible d&apos;insérer une image dans une question, une réponse (choix multiple) et dans une rétroaction. D&apos;abord, <strong>le format de l&apos;élément doit être [markdown]</strong>. Ensuite utilisez la syntaxe suivante&nbsp;:</p>
                 <pre>
@@ -185,8 +185,7 @@ const GiftCheatSheet: React.FC = () => {
                     Attention: l&apos;ancienne fonctionnalité avec les balises <code>{'<img>'}</code> n&apos;est plus
                     supportée.
                 </p>
-            </div>
-
+                </div>
             <div className="question-type">
                 <h4> 10. Informations supplémentaires </h4>
                 <p>

client/src/components/QuestionsDisplay/MultipleChoiceQuestionDisplay/MultipleChoiceQuestionDisplay.tsx

@@ -12,10 +12,9 @@ interface Props {
 }
 
 const MultipleChoiceQuestionDisplay: React.FC<Props> = (props) => {
-  
     const { question, showAnswer, handleOnSubmitAnswer } = props;
     const [answer, setAnswer] = useState<string>();
-
+    
     useEffect(() => {
         setAnswer(undefined);
     }, [question]);
@@ -24,7 +23,6 @@ const MultipleChoiceQuestionDisplay: React.FC<Props> = (props) => {
         setAnswer(choice);
     };
 
-
     const alpha = Array.from(Array(26)).map((_e, i) => i + 65);
     const alphabet = alpha.map((x) => String.fromCharCode(x));
     return (
@@ -37,25 +35,23 @@ const MultipleChoiceQuestionDisplay: React.FC<Props> = (props) => {
                     const selected = answer === choice.formattedText.text ? 'selected' : '';
                     return (
                         <div key={choice.formattedText.text + i} className="choice-container">
-                                <Button
+                            <Button
                                 variant="text"
                                 className="button-wrapper"
-                                onClick={() => !showAnswer && handleOnClickAnswer(choice.formattedText.text)}
-                            >
-                                {choice.formattedFeedback === null &&
-                                    showAnswer &&
-                                    (choice.isCorrect ? '✅' : '❌')}
+                                onClick={() => !showAnswer && handleOnClickAnswer(choice.formattedText.text)}>
+                                {showAnswer? (<div> {(choice.isCorrect ? '✅' : '❌')}</div>)
+                                :``}
                                 <div className={`circle ${selected}`}>{alphabet[i]}</div>
                                 <div className={`answer-text ${selected}`}>
                                     <div dangerouslySetInnerHTML={{ __html: FormattedTextTemplate(choice.formattedText) }} />
                                 </div>
-                            </Button>
-                            {choice.formattedFeedback && showAnswer && (
+                                {choice.formattedFeedback && showAnswer && (
                                 <div className="feedback-container mb-1 mt-1/2">
-                                    {choice.isCorrect ? '✅' : '❌'}
                                     <div dangerouslySetInnerHTML={{ __html: FormattedTextTemplate(choice.formattedFeedback) }} />
                                 </div>
                             )}
+                            </Button>
+
                         </div>
                     );
                 })}

client/src/components/QuestionsDisplay/TrueFalseQuestionDisplay/TrueFalseQuestionDisplay.tsx

@@ -22,7 +22,6 @@ const TrueFalseQuestionDisplay: React.FC<Props> = (props) => {
 
     const selectedTrue = answer ? 'selected' : '';
     const selectedFalse = answer !== undefined && !answer ? 'selected' : '';
-    const correctAnswer = question.isTrue === answer;
     return (
         <div className="question-container">
             <div className="question content">
@@ -34,7 +33,7 @@ const TrueFalseQuestionDisplay: React.FC<Props> = (props) => {
                     onClick={() => !showAnswer && setAnswer(true)}
                     fullWidth
                 >
-                    {showAnswer && (correctAnswer ? '✅' : '❌')}
+                    {showAnswer? (<div> {(question.isTrue ? '✅' : '❌')}</div>):``}                    
                     <div className={`circle ${selectedTrue}`}>V</div>
                     <div className={`answer-text ${selectedTrue}`}>Vrai</div>
                 </Button>
@@ -43,7 +42,7 @@ const TrueFalseQuestionDisplay: React.FC<Props> = (props) => {
                     onClick={() => !showAnswer && setAnswer(false)}
                     fullWidth
                 >
-                    {showAnswer && (!correctAnswer ? '✅' : '❌')}
+                    {showAnswer? (<div> {(!question.isTrue ? '✅' : '❌')}</div>):``}                    
                     <div className={`circle ${selectedFalse}`}>F</div>
                     <div className={`answer-text ${selectedFalse}`}>Faux</div>
                 </Button>

client/src/pages/Teacher/EditorQuiz/EditorQuiz.tsx

@@ -61,6 +61,14 @@ const QuizForm: React.FC = () => {
         };
     }, []);
 
+    const scrollToImagesSection = (event: { preventDefault: () => void; }) => {
+        event.preventDefault();
+        const section = document.getElementById('images-section');
+        if (section) {
+            section.scrollIntoView({ behavior: 'smooth' });
+        }
+    };
+
     useEffect(() => {
         const fetchData = async () => {
             const userFolders = await ApiService.getUserFolders();
@@ -277,10 +285,18 @@ const QuizForm: React.FC = () => {
                         </div>
 
                         <h4>Mes images :</h4>
-
                         <div>
-                            <div>(Cliquez sur un lien pour le copier)</div>
-                            <ul>
+                                <div>
+                                <div style={{ display: "inline" }}>(Voir section </div>
+                                    <a href="#images-section"style={{ textDecoration: "none" }} onClick={scrollToImagesSection}>
+                                        <u><em><h4 style={{ display: "inline" }}> 9. Images </h4></em></u>
+                                    </a>
+                                <div style={{ display: "inline" }}> ci-dessous</div>
+                                <div style={{ display: "inline" }}>)</div>
+                                <br />
+                                <em> - Cliquez sur un lien pour le copier</em>
+                                </div>                            
+                                <ul>
                                 {imageLinks.map((link, index) => {
                                     const imgTag = `![alt_text](${escapeForGIFT(link)} "texte de l'infobulle")`;
                                     return (

server/__tests__/auth.test.js

@@ -1,4 +1,4 @@
-const request = require("supertest");
+
 const AuthConfig = require("../config/auth.js");
 const AuthManager = require("../auth/auth-manager.js");
 
@@ -115,7 +115,7 @@ describe(
     expressMock.get = () => {}
 
     let authConfigInstance;
-    let logSpy;
+    let authmanagerInstance;
 
     // Initialisez l'instance avec la configuration mockée
     beforeAll(() => {
@@ -158,6 +158,7 @@ describe(
       };
       authConfigInstance.loadConfigTest(validModule); // On injecte la configuration mockée
       authmanagerInstance = new AuthManager(expressMock,authConfigInstance.config);
+      authmanagerInstance.getUserModel();
       expect(logSpy).toHaveBeenCalledTimes(0);
       logSpy.mockClear();
     });
@@ -200,7 +201,7 @@ describe(
           };
         authConfigInstance.loadConfigTest(validModuleInvalidProvider); // On injecte la configuration mockée
         authmanagerInstance = new AuthManager(expressMock,authConfigInstance.config);
-        expect(logSpy).toHaveBeenCalledTimes(2);
+        expect(logSpy).toHaveBeenCalledTimes(4);
         logSpy.mockClear();
       });  
   })

server/app.js

@@ -103,8 +103,9 @@ app.use(session({
   cookie: { secure: process.env.NODE_ENV === 'production' }
 }));
 
-authManager = new AuthManager(app,null,userModel)
-app.use(errorHandler)
+let authManager = new AuthManager(app,null,userModel);
+authManager.getUserModel();
+app.use(errorHandler);
 
 // Start server
 async function start() {

server/auth/auth-manager.js

@@ -2,8 +2,10 @@ const fs = require('fs');
 const AuthConfig = require('../config/auth.js');
 const jwt = require('../middleware/jwtToken.js');
 const emailer = require('../config/email.js');
-const model = require('../controllers/users.js');
-
+const MISSING_REQUIRED_PARAMETER = {
+    message: 'Paramètre requis manquant.',
+    code: 400
+};
 class AuthManager{
     constructor(expressapp,configs=null,userModel){
         this.modules = []
@@ -33,7 +35,7 @@ class AuthManager{
             this.modules.push(new Module(this,this.configs.auth[name]));
             console.info(`Module d'authentification '${name}' ajouté`)
         } else{
-            console.error(`Le module d'authentification ${name} n'as pas été chargé car il est introuvable`)
+            console.error(`Le module d'authentification ${name} n'as pas été chargé car il est introuvable`);
         }
     }
 
@@ -42,12 +44,14 @@ class AuthManager{
             try{
                 module.registerAuth(this.app)
             } catch(error){
-                console.error(`L'enregistrement du module ${module} a échoué.`)
+                console.error(`L'enregistrement du module ${module} a échoué.`);
+                console.error(`Error: ${error} `);
             }
         }
     }
 
-    async login(userInfo,req,res,next){
+    // eslint-disable-next-line no-unused-vars
+    async login(userInfo,req,res,next){ //passport and simpleauth use next
         const tokenToSave = jwt.create(userInfo.email, userInfo._id,userInfo.roles);
         res.redirect(`/auth/callback?user=${tokenToSave}&username=${userInfo.name}`);
         console.info(`L'utilisateur '${userInfo.name}' vient de se connecter`)
@@ -55,7 +59,7 @@ class AuthManager{
 
     async register(userInfos){
         if (!userInfos.email || !userInfos.password) {
-            throw new AppError(MISSING_REQUIRED_PARAMETER);
+            throw MISSING_REQUIRED_PARAMETER;
         }
         const user = await this.simpleregister.register(userInfos);
         emailer.registerConfirmation(user.email)

server/auth/modules/passport-providers/oauth.js

@@ -2,7 +2,6 @@ var OAuth2Strategy = require('passport-oauth2')
 var authUserAssoc = require('../../../models/authUserAssociation')
 var users = require('../../../models/users')
 var { hasNestedValue } = require('../../../utils')
-var jwt = require('../../../middleware/jwtToken')
 
 class PassportOAuth {
     constructor(passportjs, auth_name) {

server/auth/modules/passport-providers/oidc.js

@@ -2,7 +2,6 @@ var OpenIDConnectStrategy = require('passport-openidconnect')
 var authUserAssoc = require('../../../models/authUserAssociation')
 var users = require('../../../models/users')
 var { hasNestedValue } = require('../../../utils')
-var jwt = require('../../../middleware/jwtToken')
 
 class PassportOpenIDConnect {
     constructor(passportjs, auth_name) {
@@ -15,7 +14,8 @@ class PassportOpenIDConnect {
             const config = await fetch(provider.OIDC_CONFIG_URL)
             return await config.json()
         } catch (error) {
-            console.error(`Les informations de connexions de la connexion OIDC ${name} n'ont pu être chargées.`)
+            console.error(`Les informations de connexions de la connexion OIDC ${name} n'ont pu être chargées.`);
+            console.error(`Error: ${error} `);
         }
     }
 
@@ -70,10 +70,11 @@ class PassportOpenIDConnect {
 
                     user_account.name = received_user.name
                     user_account.roles = received_user.roles
-                    await users.editUser(user_account)
+                    await users.editUser(user_account);
 
                     return done(null, user_account);
                 } catch (error) {
+                    console.error(`Error: ${error} `);
                 }
             }));
 

server/auth/modules/passportjs.js

@@ -24,7 +24,8 @@ class PassportJs{
                     this.registeredProviders[provider.type].register(expressapp,passport,this.endpoint,name,provider)
                     authprovider.create(auth_id)
                 } catch(error){
-                    console.error(`La connexion ${name} de type ${provider.type} n'as pu être chargé.`)
+                    console.error(`La connexion ${name} de type ${provider.type} n'as pu être chargé.`);
+                    console.error(`Error: ${error} `);
                 }
             }
         }
@@ -45,7 +46,8 @@ class PassportJs{
             this.registeredProviders[providerType]= new Provider(this,auth_id)
             console.info(`Le type de connexion '${providerType}' a été ajouté dans passportjs.`)
         } catch(error){
-            console.error(`Le type de connexion '${providerType}' n'as pas pu être chargé dans passportjs.`)
+            console.error(`Le type de connexion '${providerType}' n'as pas pu être chargé dans passportjs.`);
+            console.error(`Error: ${error} `);
         }
     }
 

server/auth/modules/simpleauth.js

@@ -15,12 +15,13 @@ class SimpleAuth {
 
     async registerAuth(expressapp) {
         try {
-            expressapp.post(`${this.endpoint}/register`, (req, res, next) => this.register(this, req, res));
-            expressapp.post(`${this.endpoint}/login`, (req, res, next) => this.authenticate(this, req, res));
-            expressapp.post(`${this.endpoint}/reset-password`, (req, res, next) => this.resetPassword(this, req, res));
-            expressapp.post(`${this.endpoint}/change-password`, jwt.authenticate, (req, res, next) => this.changePassword(this, req, res));
+            expressapp.post(`${this.endpoint}/register`, (req, res) => this.register(this, req, res));
+            expressapp.post(`${this.endpoint}/login`, (req, res, next) => this.authenticate(this, req, res, next));
+            expressapp.post(`${this.endpoint}/reset-password`, (req, res, next) => this.resetPassword(this, req, res, next));
+            expressapp.post(`${this.endpoint}/change-password`, jwt.authenticate, (req, res, next) => this.changePassword(this, req, res, next));
         } catch (error) {
-            console.error(`La connexion ${name} de type ${provider.type} n'as pu être chargé.`)
+            console.error(`La connexion ${name} de type ${this.providers.type} n'as pu être chargé.`);
+            console.error(`Error: ${error} `);
         }
     }
 

server/config/auth.js

@@ -16,7 +16,8 @@ class AuthConfig {
       this.config = JSON.parse(configData);
     } catch (error) {
       console.error("Erreur lors de la lecture du fichier de configuration. Ne pas se fier si vous n'avez pas mit de fichier de configuration.");
-      this.config = {}
+      this.config = {};
+      throw error;
     }
     return this.config
   }

server/controllers/auth.js

@@ -20,7 +20,7 @@ class authController {
         }
     }
 
-    async getRoomsRequireAuth(req, res, next) {
+    async getRoomsRequireAuth(req, res) {
         const authC = new AuthConfig();
         const roomsRequireAuth = authC.getRoomsRequireAuth();
 

server/models/authUserAssociation.js

@@ -19,7 +19,7 @@ class AuthUserAssociation {
       const collection = conn.collection('authUserAssociation');
       const provider_id = await authProvider.getId(provider_name)
 
-      const userAssociation = await collection.findOne({ authProvider_id: provider_id,auth_id,auth_id });
+      const userAssociation = await collection.findOne({ authProvider_id: provider_id, auth_id: auth_id });
       return userAssociation
     }
 

server/models/userAuthAssociation.js

@@ -1,13 +0,0 @@
-const db = require('../config/db.js')
-const { ObjectId } = require('mongodb');
-
-
-class AuthUserAssoc {
-    constructor(authProviderId, authId, userId) {
-      this._id = new ObjectId();
-      this.authProvider_id = authProviderId;
-      this.auth_id = authId;
-      this.user_id = userId;
-    }
-  }
-  

server/models/users.js

@@ -1,7 +1,6 @@
 const bcrypt = require("bcrypt");
 const AppError = require("../middleware/AppError.js");
 const { USER_ALREADY_EXISTS } = require("../constants/errorCodes");
-const Folders = require("../models/folders.js");
 
 class Users {
   
@@ -67,7 +66,7 @@ class Users {
 
     return user;
   }
-
+/*
   async login(email, password) {
     try {
       await this.db.connect();
@@ -96,7 +95,7 @@ class Users {
       throw error; 
     }
   }
-
+*/
   async resetPassword(email) {
     const newPassword = this.generatePassword();
 

server/routers/auth.js

@@ -1,6 +1,5 @@
 const express = require('express');
 const router = express.Router();
-const jwt = require('../middleware/jwtToken.js');
 
 const authController = require('../controllers/auth.js')