Merge branch 'master' into fix/double-recaptcha

Author: ginkoid

client/src/components/ctftime-additional.js

@@ -1,4 +1,5 @@
 import Form from '../components/form'
+import useRecaptcha from '../components/recaptcha'
 import config from '../config'
 import withStyles from '../components/jss'
 import { register } from '../api/auth'
@@ -28,28 +29,28 @@ export default withStyles({
   const handleNameChange = useCallback(e => setName(e.target.value), [])
 
   const [errors, setErrors] = useState({})
+  const requestRecaptchaCode = useRecaptcha('register')
 
-  const handleRegister = useCallback(() => {
+  const handleRegister = useCallback(async () => {
     setDisabledButton(true)
 
-    register({
+    const { errors } = await register({
       ctftimeToken,
       name: name || undefined,
-      division
+      division,
+      recaptchaCode: await requestRecaptchaCode?.()
     })
-      .then(({ errors }) => {
-        setDisabledButton(false)
+    setDisabledButton(false)
 
-        if (!errors) {
-          return
-        }
-        if (errors.name) {
-          setShowName(true)
-        }
+    if (!errors) {
+      return
+    }
+    if (errors.name) {
+      setShowName(true)
+    }
 
-        setErrors(errors)
-      })
-  }, [ctftimeToken, name, division])
+    setErrors(errors)
+  }, [ctftimeToken, name, division, requestRecaptchaCode])
 
   const handleSubmit = useCallback(e => {
     e.preventDefault()

client/src/components/graph.js

@@ -38,12 +38,13 @@ const pointsToPolyline = ({ id, name, currentScore, points, maxX, minX, maxY, wi
 
 const getXLabels = ({ minX, maxX, width }) => {
   const labels = []
+  const step = Math.ceil((maxX - minX) / width * 200 / day) * day
   let labelStart = new Date(minX).setHours(0, 0, 0, 0)
-  if (labelStart % day !== 0) {
-    labelStart += day
+  if (labelStart % step !== 0) {
+    labelStart += step
   }
 
-  for (let label = labelStart; label <= maxX; label += day) {
+  for (let label = labelStart; label <= maxX; label += step) {
     labels.push({
       label: new Date(label).toLocaleDateString(),
       x: timeToX({ minX, maxX, time: label, width })

server/app.js

@@ -41,7 +41,8 @@ app.register(helmet, {
     directives: {
       defaultSrc: ['\'none\''],
       styleSrc: ['\'unsafe-inline\'', '\'self\''],
-      scriptSrc: ['\'self\'', 'https://www.google-analytics.com'],
+      scriptSrc: ['\'self\'', 'https://www.google-analytics.com', 'https://www.google.com/recaptcha/', 'https://www.gstatic.com/recaptcha/'],
+      frameSrc: ['https://www.google.com/recaptcha/'],
       connectSrc: ['\'self\'', 'https://www.google-analytics.com'],
       imgSrc: ['*', 'data:']
     }