invite via email

Author: tdjsnelling

api/src/controllers/torrent.js

@@ -9,6 +9,8 @@ import Comment from '../schema/comment'
 import { hexToBinary } from '../middleware/announce'
 
 export const embellishTorrentsWithTrackerScrape = async (torrents) => {
+  if (!torrents.length) return []
+
   const infoHashes = torrents.map((torrent) => hexToBinary(torrent.infoHash))
   const query = qs.stringify(
     { info_hash: infoHashes },

api/src/controllers/user.js

@@ -11,7 +11,7 @@ const sendVerificationEmail = async (address, token) => {
   await mail.sendMail({
     from: `"${process.env.SQ_SITE_NAME}" <${process.env.SQ_MAIL_FROM_ADDRESS}>`,
     to: address,
-    subject: 'Verify you email address',
+    subject: 'Verify your email address',
     text: `Thank you for joining ${process.env.SQ_SITE_NAME}. Please follow the link below to verify your email address.
         
 ${process.env.SQ_BASE_URL}/verify-email?token=${token}`,
@@ -47,7 +47,7 @@ export const register = async (req, res) => {
         const { id } = decoded
 
         invite = await Invite.findOne({ _id: id }).lean()
-        const { claimed, validUntil, invitingUser } = invite
+        const { claimed, validUntil, invitingUser, email } = invite
 
         if (claimed) {
           res.status(403).send('Invitation has already been claimed')
@@ -59,17 +59,18 @@ export const register = async (req, res) => {
           return
         }
 
+        if (email !== req.body.email) {
+          res
+            .status(403)
+            .send('Email address does not match invited email address')
+          return
+        }
+
         const inviter = User.findOne({ _id: invitingUser }).lean()
         if (!inviter || inviter.banned) {
           res.status(403).send('Inviting user doesn’t exist or has been banned')
           return
         }
-
-        await Invite.findOneAndUpdate({ _id: id }, { $set: { claimed: true } })
-        await User.findOneAndUpdate(
-          { _id: invite.invitingUser },
-          { $inc: { remainingInvites: -1 } }
-        )
       } catch (err) {
         res.status(500).send(`Error verifying invitation: ${err.message}`)
         return
@@ -118,6 +119,22 @@ export const register = async (req, res) => {
         await sendVerificationEmail(req.body.email, emailVerificationToken)
 
         if (createdUser) {
+          if (req.body.invite) {
+            const decoded = jwt.verify(
+              req.body.invite,
+              process.env.SQ_JWT_SECRET
+            )
+            const { id } = decoded
+            await Invite.findOneAndUpdate(
+              { _id: id },
+              { $set: { claimed: true } }
+            )
+            await User.findOneAndUpdate(
+              { _id: invite.invitingUser },
+              { $inc: { remainingInvites: -1 } }
+            )
+          }
+
           res.send({
             token: jwt.sign(
               {
@@ -186,34 +203,47 @@ export const login = async (req, res) => {
 }
 
 export const generateInvite = async (req, res) => {
-  const user = await User.findOne({ _id: req.userId }).lean()
+  if (req.body.email && req.body.role) {
+    const user = await User.findOne({ _id: req.userId }).lean()
 
-  if (user.remainingInvites < 1) {
-    res.status(403).send('You do not have any remaining invites')
-  }
+    if (user.remainingInvites < 1) {
+      res.status(403).send('You do not have any remaining invites')
+    }
 
-  const created = Date.now()
-  const validUntil = created + 48 * 60 * 60 * 1000
+    const created = Date.now()
+    const validUntil = created + 48 * 60 * 60 * 1000
 
-  const { role } = req.query
+    const { email, role } = req.body
 
-  const invite = new Invite({
-    invitingUser: req.userId,
-    created,
-    validUntil,
-    claimed: false,
-    role: role || 'user',
-  })
+    const invite = new Invite({
+      invitingUser: req.userId,
+      created,
+      validUntil,
+      claimed: false,
+      email,
+      role: role || 'user',
+    })
 
-  invite.token = jwt.sign(
-    { id: invite._id, validUntil },
-    process.env.SQ_JWT_SECRET
-  )
+    invite.token = jwt.sign(
+      { id: invite._id, validUntil },
+      process.env.SQ_JWT_SECRET
+    )
 
-  const createdInvite = await invite.save()
+    const createdInvite = await invite.save()
 
-  if (createdInvite) {
-    res.send(createdInvite)
+    if (createdInvite) {
+      mail.sendMail({
+        from: `"${process.env.SQ_SITE_NAME}" <${process.env.SQ_MAIL_FROM_ADDRESS}>`,
+        to: email,
+        subject: 'Invite',
+        text: `You have been invited to join ${process.env.SQ_SITE_NAME}. Please follow the link below to register.
+        
+${process.env.SQ_BASE_URL}/register?token=${createdInvite.token}`,
+      })
+      res.send(createdInvite)
+    }
+  } else {
+    res.status(400).send('Request must include email, role')
   }
 }
 

api/src/index.js

@@ -144,7 +144,7 @@ app.use(auth)
 
 // user/account routes
 app.get('/account/invites', fetchInvites)
-app.get('/account/generate-invite', generateInvite)
+app.post('/account/generate-invite', generateInvite)
 app.post('/account/change-password', changePassword)
 app.get('/account/get-role', getUserRole)
 app.get('/account/get-verified', getUserVerifiedEmailStatus)

api/src/schema/invite.js

@@ -6,6 +6,7 @@ const Invite = new mongoose.Schema({
   validUntil: Number,
   claimed: Boolean,
   token: String,
+  email: String,
   role: String,
 })
 

client/pages/account.js

@@ -14,9 +14,11 @@ import Select from '../components/Select'
 import Button from '../components/Button'
 import List from '../components/List'
 import { NotificationContext } from '../components/Notifications'
+import Modal from '../components/Modal'
 
 const Account = ({ token, invites = [], user, userRole }) => {
   const [invitesList, setInvitesList] = useState(invites)
+  const [showInviteModal, setShowInviteModal] = useState(false)
 
   const { addNotification } = useContext(NotificationContext)
 
@@ -29,16 +31,17 @@ const Account = ({ token, invites = [], user, userRole }) => {
     const form = new FormData(e.target)
 
     try {
-      const inviteRes = await fetch(
-        `${SQ_API_URL}/account/generate-invite?role=${
-          form.get('role') || 'user'
-        }`,
-        {
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
-        }
-      )
+      const inviteRes = await fetch(`${SQ_API_URL}/account/generate-invite`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${token}`,
+        },
+        body: JSON.stringify({
+          role: form.get('role') || 'user',
+          email: form.get('email'),
+        }),
+      })
 
       if (inviteRes.status !== 200) {
         const reason = await inviteRes.text()
@@ -52,9 +55,11 @@ const Account = ({ token, invites = [], user, userRole }) => {
         return currentInvitesList
       })
 
-      addNotification('success', 'Invite generated successfully')
+      addNotification('success', 'Invite sent successfully')
+
+      setShowInviteModal(false)
     } catch (e) {
-      addNotification('error', `Could not generate invite: ${e.message}`)
+      addNotification('error', `Could not send invite: ${e.message}`)
       console.error(e)
     }
   }
@@ -109,43 +114,42 @@ const Account = ({ token, invites = [], user, userRole }) => {
         mb={4}
       >
         <Text as="h2">Invites</Text>
-        <form onSubmit={handleGenerateInvite}>
-          <Box
-            display="flex"
-            alignItems="center"
-            border="1px solid"
-            borderColor="border"
-            borderRadius={1}
-            p={2}
-            pl={4}
+        <Box
+          display="flex"
+          alignItems="center"
+          border="1px solid"
+          borderColor="border"
+          borderRadius={1}
+          p={2}
+          pl={4}
+        >
+          <Text color="grey" mr={4}>
+            {user.remainingInvites || 0} remaining
+          </Text>
+          <Button
+            onClick={() => setShowInviteModal(true)}
+            disabled={(user.remainingInvites || 0) < 1}
           >
-            <Text color="grey" mr={4}>
-              {user.remainingInvites || 0} remaining
-            </Text>
-            {userRole === 'admin' && (
-              <Select name="role" required mr={3}>
-                <option value="user">Role: user</option>
-                <option value="admin">Role: admin</option>
-              </Select>
-            )}
-            <Button disabled={(user.remainingInvites || 0) < 1}>
-              Generate invite
-            </Button>
-          </Box>
-        </form>
+            Send invite
+          </Button>
+        </Box>
       </Box>
       <List
         data={invitesList}
         columns={[
           {
-            header: 'Token',
-            accessor: 'token',
-            cell: ({ value }) => (
-              <Text fontFamily="monospace">
-                ...{value.slice(value.length - 16)}
+            header: 'Email',
+            accessor: 'email',
+            cell: ({ value, row }) => (
+              <Text
+                _css={{
+                  textDecoration: row.claimed ? 'line-through' : 'none',
+                }}
+              >
+                {value}
               </Text>
             ),
-            gridWidth: '1fr',
+            gridWidth: '1.75fr',
           },
           {
             header: 'Claimed',
@@ -158,7 +162,7 @@ const Account = ({ token, invites = [], user, userRole }) => {
             accessor: 'validUntil',
             cell: ({ value }) => (
               <Text
-                style={{
+                _css={{
                   textDecoration: value < Date.now() ? 'line-through' : 'none',
                 }}
               >
@@ -173,7 +177,7 @@ const Account = ({ token, invites = [], user, userRole }) => {
             cell: ({ value }) => (
               <Text>{moment(value).format('HH:mm Do MMM YYYY')}</Text>
             ),
-            gridWidth: '1fr',
+            gridWidth: '1.2fr',
           },
           {
             header: 'Role',
@@ -184,7 +188,7 @@ const Account = ({ token, invites = [], user, userRole }) => {
             gridWidth: '0.6fr',
           },
           {
-            header: 'Copy',
+            header: 'Copy link',
             cell: ({ row }) => {
               return (
                 <Button
@@ -207,7 +211,7 @@ const Account = ({ token, invites = [], user, userRole }) => {
               )
             },
             rightAlign: true,
-            gridWidth: '42px',
+            gridWidth: '80px',
           },
         ]}
         mb={5}
@@ -233,6 +237,34 @@ const Account = ({ token, invites = [], user, userRole }) => {
         />
         <Button>Change password</Button>
       </form>
+      {showInviteModal && (
+        <Modal close={() => setShowInviteModal(false)}>
+          <Text mb={5}>
+            Enter an email address to send an invite. The invited user will need
+            to sign up with the same email address. Once the invite is
+            generated, you can also copy a direct invite link.
+          </Text>
+          <form onSubmit={handleGenerateInvite}>
+            <Input name="email" type="email" label="Email" mb={4} required />
+            {userRole === 'admin' && (
+              <Select name="role" mb={4} required>
+                <option value="user">Role: user</option>
+                <option value="admin">Role: admin</option>
+              </Select>
+            )}
+            <Box display="flex" justifyContent="flex-end">
+              <Button
+                onClick={() => setShowInviteModal(false)}
+                variant="secondary"
+                mr={3}
+              >
+                Cancel
+              </Button>
+              <Button>Send invite</Button>
+            </Box>
+          </form>
+        </Modal>
+      )}
     </>
   )
 }