From beb7b3eee37b01783ea042abe7bfa83442eecd14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Mur=C3=A7a?= Date: Tue, 22 Nov 2022 21:34:02 -0300 Subject: [PATCH] Update login and register mocked users --- src/context/auth.js | 5 ++--- src/services/mocks.js | 22 ++++++++++++++++++++-- src/services/user-service.js | 17 +++++++++++------ 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/context/auth.js b/src/context/auth.js index 655b8d1..bed6354 100644 --- a/src/context/auth.js +++ b/src/context/auth.js @@ -35,10 +35,9 @@ function AuthProvider(props) { const login = (email, password) => { setState({ ...state, status: 'pending' }); - let shouldFail = email !== 'teste@teste.com' || password !== '#teste1234'; - return getUser(shouldFail).then(data => { - if (shouldFail) { + return getUser(email, password).then(data => { + if (data.message) { return setState({ status: 'error', user: null, error: data }); } else { return setState({ status: 'success', user: data, error: null }); diff --git a/src/services/mocks.js b/src/services/mocks.js index a00ebd3..a3bfb97 100644 --- a/src/services/mocks.js +++ b/src/services/mocks.js @@ -534,7 +534,7 @@ const allPeople = [ }, ]; -const user = { +const studentUser = { id: '123', ra: '0021123', username: 'ronaldosilva', @@ -551,6 +551,23 @@ const user = { role: 'STUDENT', }; +const professorUser = { + id: '321', + ra: '0021123', + username: 'cazalbe', + email: 'carlos.junior@ifmg.edu.br', + password: '#carlos1234', // TODO: Remove this! + firstName: 'Carlos', + lastName: 'Severiano', + token: 'xkhfb9458hnsdfsi9q8345bsdf9b834yr', + phone: '31111111111', + avatar: 'https://i.pravatar.cc/300?img=61', + course: 0, + termsAgreed: true, + year: 2018, + role: 'PROFESSOR', +}; + const authFailure = { message: 'Falha na autenticaĆ§Ć£o', }; @@ -561,7 +578,8 @@ export { allClassroomAnnouncements, allPeople, faq, - user, + studentUser, + professorUser, authFailure, allUpcomingAssignments, }; diff --git a/src/services/user-service.js b/src/services/user-service.js index d256832..998d760 100644 --- a/src/services/user-service.js +++ b/src/services/user-service.js @@ -3,7 +3,8 @@ import { allClassrooms, allAssignments, faq, - user, + studentUser, + professorUser, authFailure, allClassroomAnnouncements, allUpcomingAssignments, @@ -84,14 +85,18 @@ const getFaq = () => }; }); -const getUser = shouldFail => +const getUser = (email, password) => sleep(300).then(() => { - if (shouldFail) { - return authFailure; + let user; + if (email === 'p@test.com' && password === 'p123') { + user = professorUser; + } else if (email === 's@test.com' && password === 's123') { + user = studentUser; } else { - window.localStorage.setItem('$USER', JSON.stringify(user)); - return user; + return authFailure; } + window.localStorage.setItem('$USER', JSON.stringify(user)); + return user; }); const registerUser = (data, shouldFail) =>