352 feature add clerk to handle authentication #359
Merged
Conversation
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
….tsx to deal with missing props
…code when user signsup
commit 774c4e7436fb2c1807065b7fd3c9af806c63245b Author: jesus doza <[email protected]> Date: Sat Sep 21 12:25:00 2024 -0500 clean up old files commit 578123c4dae6a22e80c679433d1ffd95e8107d8b Author: jesus doza <[email protected]> Date: Fri Sep 20 20:55:04 2024 -0500 change client/src/pages/signup/SignUpPage.tsx force redirect on signup to common page commit 3c0dfb61b4a65cbe60236c208b50b1a451aee862 Author: jesus doza <[email protected]> Date: Fri Sep 20 20:54:32 2024 -0500 refactor client/src/pages/signin/ClerkRedirectPage.tsx to handle both signin and sign up clerk flows commit 9902749b368e88d79789f9cbb2198710adf6cb71 Author: jesus doza <[email protected]> Date: Fri Sep 20 20:53:28 2024 -0500 Refactor verifyLogin() in authcontext to return boolean value commit b56be6dca132ce048042c378913ca433b8e3a2b8 Author: jesus doza <[email protected]> Date: Fri Sep 20 20:53:01 2024 -0500 refactor client/src/components/LoginSignUp/LoginSignupContainer.tsx commit 49e3e2eb46b3dfdfb66a7cbc60cf2aa0822e33ca Author: jesus doza <[email protected]> Date: Fri Sep 20 20:52:33 2024 -0500 change clerk signin page redirect commit b33ec57966b8dd4e907ac92441713e63fda051f8 Author: jesus doza <[email protected]> Date: Fri Sep 20 19:34:05 2024 -0500 FIX - verify login route not handling users that are not found
… handle when user email already in use
jesusdoza
temporarily deployed
to
352-feature-add-clerk-to-handle-authentication - repair-reports-dev PR #359
Render
Destroyed
jesusdoza
added a commit
that referenced
this pull request
Sep 22, 2024
* changed button hover stylings (#160) * Mono repo (#163) * add react ts scaffolding * react scaffold and router added * react scaffold with layout and router * add daisy ui to tailwind * add navbar component * add base routes * add react router dom links * add auth context * add login modal * add hooks directory * add api routes in backend * add login screen * added vite env vars * add login function to login modal * api login, logout, signup routes * add login and signup forms * add login signup form * add form * modal * add basic form validation * add login form * add api auth * no cookies * FIX session cookie no saving for passport session * client origin * add fetch data from api for repair data * add repair info page * fix api auth logout * add search component * search component * add search functionality * add limit parameter to api search * add base url to vite build * fix base vite path, add repairCard component * fix Vite dev server option `server.fs.deny` * add repari infor page * add repair info images and instructions * add comments and edit tools components files * fix authcontext add edit tools only for creater of post * react app being served * controller update * add build scripts for front end * build script * add types * add react to pages * add typescript * typescript * disable tsc before build * script * script * script * mono repo * serve react app * copy client to backend * get request for react * react index * route * add path * test * test2 * move to ejs * test image * react/dir * print file * fs * diff route * no concurently on install * hardcoded react * remove unused depen * copy env hack * vite command line * down vite to 4.1.0 * new lock * updated depend * change scripts * redid dependencies * missing scripts * vite 5.1.0 * removed extra vite * fix type module * plain build * no space * add node version * testing * gitignore update with /backend/public * client build path to backend/public * add edit page * Fix react build (#164) * client build script * add read me * Add edit page for repairs (#166) basic edit page for repair with ability to edit title and instructions wire frame * Add cloudinary widget to edit page (#168) * add camera button and preview * add camera preview and image capture for editImageCard * add file data to state variable to upload * add image data from camera capture * add useUpload hook with folder to upload to * add CameraPreview component * add port to vite dev * add dockerfile and tested image build * add image upload * update repair object model version 2 to fix image handling structure * add upload hook for cloudinary * add available options component and some styling * state changing with image upload correct * add edit image * add create repair page scaffold * update availableOptions component * use reducer state for editRepair page * add new repairformstate hook and repairform page * add repair form page and scaffold for new repair form * Add new repair form (#171) fix text render on single letter add new repair form add close camera media track function * New Repair form submit scaffold (#173) * update Repair schema to version 3 with search tags * Have login when 401 (#174) * add rolling session * on 401 trigger login * Add way to delete images on front end on new repair form (#175) ImageId is sent to back end to target specific image imageObj class now has a uuid() in the imageId field as default to be able to target when removing from form and image has not been uploaded yet when image is uploaded manual upload button is removed added /api/image endpoint to backend added useImageManager to handle image api interaction * fix image objects not updating imageId after upload on repair form (#178) useRepairFormState now updated the imageId correctly after uploading image * ADD images now sorted into folders of users ID (#181) user id is appended to requested folder image location to better organize images by user who uploaded them. In future if user is in multiple groups or organizations the desired folder can be used for sorting by org and user who uploaded image * fix when adding new procedure next to last will add to end, (#182) fix adding new procedure before last in list was adding to end instead of where intended small refactor to EditProcedureList to move generating procedure edit methods to its own function and out of the map function updated .env.example * 167 user submenu zindex below cards on latest page on the react client on ejs still working ok (#183) * fix z index on user menu * fix user menu * 185 delete images on repair form FRONTEND (#187) * add comments to state variables * add delete method * add prop for uploaded image obj to put into editimage card * remove comment * rename prop on editProcedure card component * return to null * 188 create delete images endpoint on server for front end to request an image be deleted (#189) * add axios package * fix images api url * add cloud url and deleteimage method ot imagesController * add troubleshoot commented code to EditImageCard from delete operation * refactor cloudinary signature renamed dir to utilities and not modules * add signature utility to images controller * rename directory modules to utilities and add cloudinary sdk * fix cloudinary sdk config, add delete error handling workig delete * fix old ejs front end to use new form controller for images * reenable auth on /api/images route * remove testing debug from EditImageCard add axios to backend package renamed directory modules to utilities added images controller renamed "./routes/form.js" to "./routes/formRouter.js" add imagesController updated old ejs backend for new image upload signature aka save images under user ids direcotory on cloudinary backend/public/js/repairformclient.js add cloudinary SDK to backend add delete images endpoint /api/images DELETE configure cloudinary SDK * 184 add way to remove a procedure on repair form (#192) - add id to Procedure class - change Repair class to use procedureArr: Procedure[] and not ProcedureT type - fix EditImageCard to remove not removing card when image is null - rename EditProcedureCard props, and use Procedure class as type instead of ProcedureT type - add removeProcedure method to procedureActions in EditProcedureList - add REMOVE_PROCEDURE reducer method to useRepairFormState - change RepairFormPage styles - update types.ts to include id on changeFormPayloadT * 190 client implement delete image hook (#193) * break out repair controller (#194) add repairs controller * add cleanup script for node modules on client directory (#198) * add cleanup script to delete un needed files after client build * moved client-cleanup to end of build script on root package.json * change copyfile.js to either copy env file from secrets or create one from environment variables depending on where it is hosted * add cleanupClient.js file that runs the clean up of files after building client * fixed react route to send index.html (#199) * fixed react route to send index.html * remove environment set up for old cyclic hosting service on copyfile.js * 200 react api - user id is not being saved to repair when saved in react app BACKEND (#201) Fixed user not being attached by their id when repair is created on backend api/repairsController * break out repairinfo page into container and component (#205) break out repairinfo page into container and component clean up RepairCard Component link to pass repair property in link state={{repair:data}} add getRepairById() functionality to useRepairApi.ts hook changed client/src/routes/index.tsx -/repair/:repair_id route to use * add api/repairs/:id endpoint for repair by id look up (#206) * add api/repairs/:id endpoint for repair by id look up * FIX - user repeated form request after initial submit (#207) added submitAllowed state to repair form in order to disable submit button on form added redirect to repair info page when successful form submit action * 209 fix older ejs app not correctly sending request for image signature to include folder desired (#210) * update formRoutes to be more clear * add POST signform to include req.body * add try catches to backend/public/js/repairformclient.js to better trouble shoot in future * form router now has a POST handler to use req.body backend/routes/formRouter.js * delete uneeded route and bring code back to working * fix ejs app editpage.js still pointing to wrong url for form signature (#214) - fix ejs app editpage.js still pointing to wrong url for form signature * 212 react app when creating a repair does not add a thumbnail link to the images obj (#215) add vitest add createThumbnail util create tests for createThumbnail util FIX thumbnail not being added to image objects when uploading clarified types definitions * 211 create user dashboard in react app base scaffold (#216) * dashboard repairs scafold * dashboard recieves repair reactnodes as prop to use instead of creating it * 218 create edit repair page scaffold (#219) * extract edit/create repair form for dual purpose * add route with id parameter * 220 modify create repair component to be able to define what function to call on submit to use for modifying and creating repairs (#221) add backend origin bypass depending on env variable NODE_ENV change\ client/src/components/RepairDisplay/RepairEditForm.tsx to have external props onSubmit, = function to call on submit submitType = string to display on button enabled = disable submit button edit repair page is container for edit repair form client/src/components/RepairDisplay/RepairEditForm.tsx takes external prop to enable and disable submit updated client/src/pages/RepairFormPage.tsx to use new editRepairForm backend/app.js - now checks for NODE_ENV for cors checking * image will be deleted if url is web based before inserting new image … (#223) * image will be deleted from database before inserting new image to preview * 224 add remove delete procedures on existing repair with edit form (#226) backend update repair schema to include _id property Frontend update procedure class to have an _id property for filtering added new ModalConfirm component to for user alerts add image delete on removal of entire procedure form repair form if already uploaded * updated ProcedureSchema on backend to include _id field for filtering * Procedures now use _id instead of id property to follow same template as mongodb * add modal component for alerting user * change button on create and update forms to bring up modal to confirm action * add alert when deleting entire procedure * 197 media queries when not in mobile screen sizes wrong (#230) * better md screen queries * print query for printing repair info * Restart form (#231) * add argument constructor to Repair class * add multi constructor to ProcedureClass * add initialize imageObj constructor util to ProcedureClass * add _id to ImageObjT * add multi constructor to ImageObj class * types update * add initialize data to client/src/components/RepairDisplay/RepairEditFormV2.tsx * wrap context around repairEdit form *client/src/components/ProcedureList/EditProcedureCard.tsx initializes its own id * RepairFormContext.tsx can now be initialized externally * update RepairDataT to include version field * fix backend not running tailwind on start script * add uuid to backend * add uuid to models * fix EditImageCard not tracking _id of data * fix repairEditFomrV2 on submit callback * 233 when images are uploaded the url should be added to images string array in the procedure aswell as the imageobjs array (#235) * Fix RepairFormContext when adding images not adding to string array * Fix Images array not syncing with imageObjs * fix tailwind build (#238) Fix tailwind script was using the watch flag never actually building the styles.css * 236 remove procedure not working on repaireditform (#237) * add removeProcedure formAction * add optional prop onremove prop on EditProcedureCard.tsx to be used as a callback when removing procedure card from dom * 227 do not allow submit on form if images have not been uploaded (#240) - repair is validated before submitting - errors in form are displayed - form shows error if images have a data: buffer url which means it has not been uploaded - add isValidForm util * fix remove procedure deleting only first id in list * 239 remove procedure in repairedit form not removing procedure (#241) * move isValidForm util to correct dir * add confirm on delete * fix remove procedure button not submitting correct id to remove modal was keeping scope of only the first repairs id in the dialog and all other components also had the same id when on click function was invoked * Get repairs dashboard (#242) * update useRepairhook * add getRepairsForUser method to api/repairsController * add new repair/user route GET * remove unused type * fix repairs/user route method * working display of user repairs * add limit to getting users repairs * add page and skip to getRepairsForUser Query * add dashboard pagination to users repairs * fix dashboard styling (#243) * Update README.md (#244) cyclic no longer exists * Filter dashboard (#245) * add display of filters available * add display of active filters * Fix images wont update edit (#246) * FIX Repair class did not have _id property * remove old repair page component * 249 create new invite code model to store invites in new invite collection (#250) * group model no longer needs to track invite codes * add Invite Model * 251 create new invite code endpoint (#252) add POST /api/invite route to create invites add GET /api/invite route to query all invites user has created update Invite model to have optional invitePassword * add invite code necessary when signup (#253) on signup invite code needs to be provided no group is created under users name anymore will be handled by invite code in the future * 254 group schema needs to be updated (#257) Fix - server port displaying incorrectly on start up Remove - group routes b/c not being used, removed group controller and routes files Remove - unused import on app * add Member schema (#258) create - new Member schema added to track group to user, role relationships * 259 update signup page to include invite code input (#260) change EJS signup view to include invite code input change react app signup page to include invite code change authContext signup method to take destructured object, instead of arguments * 261 add profile page (#262) add profile page scaffold add user info change form add invite tool add user stats * 265 add invite api hook to create invites (#267) create userInviteManager hook add getUserInvites method to useInviteManager hook add PostInvite method to useInviteManager password is optional on postInvite method of useInviteManager hook add handlePostInvite method to InviteToolContainer comp create invitelog comp update Invite model BACKEND add invite data fetch method to InviteToolContainer create type for invite data returned from server FRONTEND add status to Invite schema Invite tool allows multiple groups to be selected for invite add PostInvite method to inviteController update Member schema with group name field add refetch of users invites after Post invite * npm vulnerability fix (#270) * 269 add search to react app (#271) FEATURE - search for repairs ADD - BACKEND /api/repair/search endpoint FIX - client/src/components/RepairList/RepairList.tsx crash with no list prop REFACTOR - Search component moved to its own directory away from navbar directory FIX - client/src/hooks/useRepairApi.ts SearchRepair method to wrong address and add types to data returned ADD - SearchPage component to handle repair searches ADD - new /search route to react router to use search params instead of url params for search, page, lim * fix url incorrect for search (#272) * Add vitest (#273) ADD dev packages vitest, jsdom, @vitest/ui, @testing-library/jest-dom,@testing-library/react ADD test directory UPDATE tsconfig to include tests directory UPDATE older jest tests with vitest testing imports * add tests for available options (#275) add component tests for AvailableOptions-tests * Availaible options multi tests (#276) * fix repairform placeholder * add vitest globals to tsconfig * add setup file to vitest * add tests for availableOptionsMulti * update vitest config for setup file * Vitest coverage depen (#277) * update gitignore with coverage report directory * add coverage dependency package for vitest * update vitest config for code coverage * 268 add user group role verification (#284) * add /api/groups endpoint with groups controller * add groups query for user group membership * add hook to get user group memberships * add helper hook to deal with unauthorized error when user not logged in * add fetch userGroupData to useGetUserGroups hook * add hook to invite tool container * FIX client/src/hooks/useGetUserGroups.ts not returning groups data * add tests for useGetUserGroups hook * move creatThumbUrl.test to test directory * add isInviteAllowed utility to filter users groups for invite * styles and clean up of InviteTool component * Error boundary (#286) * add error boundary comp and add CameraPreview tests * FIX - import for createThumbUrl tests * Fix edit repair removing data (#288) * Fix Remove procedure not removing from form data * Add edit procedure list test (#289) ADD on remove procedure test ADD on add procedure test ADD display procedures test ADD testid to EditProcedureList component ADDtestid to procedureCard removeProcedure button * Break apart editimagecard (#287) * add error boundary inside EditImageCard * update error boundary to display component name * add default export * update EditImageCard imports * add test for render without props, test with image url * extract EditImageCard display into own component * add upload progress and status props to EditImageCard * add upload status test * Break apart editimagecard (#290) * add error boundary inside EditImageCard * update error boundary to display component name * update EditImageCard imports * add test for render without props, test with image url * extract EditImageCard view into own component * add upload progress and status props to EditImageCard * add common ImageCardPreview component * refactor EditImageCard and ProcedureCard to use ImagePreviewCard component * FIX-camera only faces towards user (#291) * add host option on vite to allow local net * remove camera button for more simple input for capture * exclude tests files from tsconfig * 274 verify log in (#292) ADD verifyLogin feature to allow user to refresh page and not have to login again FIX passport serializing user object * FIX - EditImageCard only allowing files to be picked and not accept camera capture (#293) input of type file will allow mobile phones to use camera or pick file * create EditImageCard and EditImageCardComponent to seperate logic from ui (#295) seperate EditImageCard into container add tests for editimagecard * Invite tool tests (#296) * Change inviteTool onPostInvite prop to be optional * FIX Form import was being used in place of html form tag * add tests for InviteTool * 299 create logincard tests (#301) * add jest types * FIX vitetest misconfig needed to mergeConfig with vite * Refactor login and sign up into own components * add login and signup form to container * add tests for loginContainer * 300 create navbar tests (#302) * organize test files * refactor layout and navbar * add testid to navebar profile menu * add navbar tests * FIX - user group data not returning (#303) FIX - user group data not returning * FIX server not parsing user id correctly * Refactor InviteTool onSubmit to follow form onsubmit * FIX group data _id not being parsed correctly * 285 when signing up a member record for user should be created according to invite code (#306) FIX - user not redirected on successful signup missing credentials FIX BACKEND - user not getting group membership from invite code and having no roles for any group in invite FIX - on signup response returning incorrect user object to client * 307 display users groups memberships (#308) add tests for UserStats refactor useGetUserGroups hook to remove useEffect to autofetch data refactor ProfilePage to use useGetUserGroups hook update useGetUserGroups tests removed unused redundant client/src/components/Profile/UserStats/UserStatsContainer.tsx Profile page is the container * add build local script (#310) * 309 profile page needs to get the total repairs user has created (#311) * FIX - repairs.Controller.getRepairsForUser() query params not being parsed as numbers for database aggregate * updated getRepairsforUser() to return results, metadata, limit and currentpage in response * add errorboundary to all pages * refactored DashboardPage filterMenu handles filtering not the page container * CHANGE response from /api/repairs/user * add profilePage load users total repairs data to display on userStats component * add display of user total repairs created on profile page * 304 create GitHub action to run tests on pr (#312) * add run-tests action * add colab image * style login/signup form * 313 create test for repairreportsapigetlatestrepairs (#315) * add defaults to client/src/api/RepairReportsApi.getLatestRepairs() * add test for default params, test for expected params * add mock env workaround for test enviroment * delete unused RepairReports Api file all api in useRepairApi * add useGetLatest hook tests * Home page (#316) * add image assets for home * add protectedRoute component * Change AuthContext to provide isAuth property * add HomePage Component * Refactor routes to assert isAuth logic to particular routes not entire app * UPDATE NavBar links for homepage * FIX login route redirect * Repair media queries (#317) * Refactor repair info page * update media queries on Procedure card to display images better * add InviteLog tests (#319) * update vulnerabiliities and update gitignore (#322) * 324 repaireditform tests (#325) * add test dir scaffold * remove console.log on imagePreviewCard * add display data test client/src/components/RepairDisplay/RepairEditFormV2.tsx * add test for submit button scaffold * remove unused post var in app.js * add testid on confirm modal * add test for calling fn, and arguments * add userEvent dep for testing-library * 321 create tool to pattern data records that exist (#326) * update gitignore * add dataProfile set up * set up vitest on backend * add data profile error tests * add engjne to package json * refactor to use readline parsing entire text with buffer cutoff error * add test for patterns arrays returned * FIX - unsorted properties would send to many patterns * refactor to display pattern statistics * add desired pattern argument * Profilepage tests (#327) * refactor home page with external links * add profile page tests * fix import jest issue with vitest Mock type * fix jest.mock import we are using vitest * 328 dataprofile tool should results to file (#329) * update dataProfile() * update test files location * add test files to run on * add test for ids * fix mongoose import on test * add modal component * 330 add supertest to backend (#332) * add supertest dependency * add homeroute test file * add mock env file for tests * add super test types * add basic test directory structure * add backend server tests action file * add mongo in memroy server for tests * 333 user submit invite code to join group (#335) * add profile link to dashboard * add join with invite routes and page * add hook for get invite withcode * fix tests for profile page and subcomponents * update client test action for tsc * add engines package property (#336) * add engines package property * add typescript build to actions client * FIX - edit crashing on old data format (#337) * add aggregate definition for parsing files on mongodb * fix edit repair crash on old formated data * add alert to user that data is not correct format * clean up RepairEditFormV2 * add new repair Context method replaceImageObjs for updating from old repair format on images * 334 add new server route apigroupjoin (#341) * update invite model to have null for password by default, for invite joining check for password on post request * add createGroupMemberEntries utility * add default roles to invite groupData * update Invite model to instantiate dynamically * update Member model to instantiate dynamically * add invite update existing membership * FIX invite api url * FIX invite page not using correct endpoint * add members/join endpoint * add package engine * fix client tests dependent on group roles * refactor invite model * fix member controller searching for undefined invite * add tests for membersController * Fix new user crash (#343) * FIX - no user repairs found crash * fix edit deleting images (#344) fix after editing images the current images would be gone * Fix invite password (#346) * add InviteT to types.d * added password to invite controller invite entry * Fix edit repair form not correctly saving images (#348) * add build-dev script * add procedure class static methods for initializing imageObjs * fix editprocedure card updating form state incorrectly * add editProcedure card handle old format repairs * remove usecallback from client/src/pages/EditRepairPageV2.tsx on handleUpdateRepair() * set folder hardcoded to cata * add check if in dev environment save images in dev folder * 350 delete repair (#351) * add deleteRepair method to repairsController * add deleteRepair to useRepairApi hook * add delete button to edit form * add edit tools component * add delete repair page * fix api delete controller method of repairs * Repair form context tests (#355) * add test for proper procedure insertion * add tests form addItem utility * remove image tests * add test repair object for repairform context tests * procedure remove test * reset git cache * 340 cors whitelist (#358) * update example env * update test scripts for single run * vulnerability FIX * update mock env for tests * update corsOptions Handler for test env * refactor how api env is used on client * 352 feature add clerk to handle authentication (#359) * add clerk dependency * add clerk sdk on backend * add clerkClient config * add backend clerk authentication * add clerk to ProtectedRoutes component * add clerk signout to logout page * add clerk provider * add clerk auth check to ProtectedRoute component * refactor middleware on api * add signup and signin pages for clerk * redirect on clerk auth in login page * add signup page redirect after signup success * add signupsetup page and signup page to index routes * update client/src/components/Invite/JoinWithInvite/JoinWithInviteForm.tsx to deal with missing props * FIX getInvite controller method for verifying invite * add client/src/pages/signup/SignupVerifyCodePage.tsx to check invite code when user signsup * add BACKEND /invite/verify/:invitecode * FIX typo in client/src/components/Invite/JoinWithInvite/JoinWithInviteForm.tsx * FIX getInvite() on client/src/hooks/useInviteManager.ts no correct api used * add "/signup/provider" route * update usermodel to be compatible with provider signup * add signUpWithProvider method to authcontext * add signupSetupPage to deal with 3rd party auth profile set up * update backend env example * remove old ejs routes and serve react * remove old asset files for EJS app * FIX backend package scripts no longer need tailwind in api server * FIX client/src/pages/signup/SignupSetupPage.tsx not redirecting when user signsup * add new dedicated clerk signin page * add clerk signin, signup and after signup routes * FIX - verify login route not handling users that are not found * add error display on client/src/pages/signin/ClerkRedirectPage.tsx to handle when user email already in use * V3 merge (#364) clean up
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.