Merge pull request #4698 from ParabolInc/fix-team-name-links

Fix security issue #46
ParabolInc · Mar 16, 2021 · bc4d07a · bc4d07a
2 parents 1af3a3d + 10f6ad5
commit bc4d07a
Show file tree

Hide file tree

Showing 15 changed files with 164 additions and 305 deletions.
diff --git a/packages/client/components/StageTimerModalTimeLimit.tsx b/packages/client/components/StageTimerModalTimeLimit.tsx
@@ -107,7 +107,7 @@ const StageTimerModalTimeLimit = (props: Props) => {
       <StyledButton onClick={startTimer}>
         {scheduledEndTime ? 'Add Time' : `Start ${MeetingLabels.TIMER}`}
       </StyledButton>
-      {error && <StyledError>{error}</StyledError>}
+      {error && <StyledError>{error.message}</StyledError>}
     </SetLimit>
   )
 }

diff --git a/packages/client/hooks/useForm.tsx b/packages/client/hooks/useForm.tsx
@@ -109,7 +109,7 @@ const useForm = (fieldInputDict: FieldInputDict, deps: any[] = []) => {
 
   const validate = useEventCallback((name: string, value: any) => {
     const validateField = fieldInputDict[name].validate
-    if (!validateField) return {error: undefined, value: state[name].value}
+    if (!validateField) return {error: undefined, value}
     const res: Legitity = validateField(value)
     dispatch({type: 'setError', name, error: res.error})
     return res

diff --git a/packages/client/modules/newTeam/NewTeam.tsx b/packages/client/modules/newTeam/NewTeam.tsx
@@ -74,7 +74,7 @@ const NewTeam = (props: Props) => {
   return (
     <NewTeamLayout>
       <NewTeamInner>
-        <NewTeamForm isNewOrganization={!defaultOrgId} organizations={organizations} />
+        <NewTeamForm isInitiallyNewOrg={!defaultOrgId} organizations={organizations} />
         {isDesktop && (
           <HelpLayout>
             <HelpBlock>