Add key to organization invite

Author: oatmilkcat

internal/email/templates/organization_invitation.go

@@ -68,7 +68,7 @@ const organizationInvitationTemplate = `
         <td>
           <a
             style="color: initial;"
-            href="https://joinimpact.org/dashboard/user/organizations/{{organizationID}}/invites/{{inviteID}}"
+            href="https://joinimpact.org/dashboard/user/organizations/{{organizationID}}/invites/{{inviteID}}?key={{key}}"
             >Click here to join {{organizationName}}</a
           >
         </td>
@@ -96,14 +96,15 @@ const organizationInvitationTemplate = `
 
 // OrganizationInvitationTemplate generates and returns a reset password email with the
 // provied name, email and key.
-func OrganizationInvitationTemplate(name, organizationName string, organizationID, inviteID int64) string {
+func OrganizationInvitationTemplate(name, organizationName string, organizationID, inviteID int64, key string) string {
 	template := organizationInvitationTemplate
 
 	// Replace the template variables with the provided params.
 	template = strings.Replace(template, `{{name}}`, name, -1)
 	template = strings.Replace(template, `{{organizationName}}`, organizationName, -1)
 	template = strings.Replace(template, `{{organizationID}}`, fmt.Sprintf("%d", organizationID), -1)
 	template = strings.Replace(template, `{{inviteID}}`, fmt.Sprintf("%d", inviteID), -1)
+	template = strings.Replace(template, `{{key}}`, fmt.Sprintf("%s", key), -1)
 
 	// Return the HTML string.
 	return template

internal/models/organization_membership_invite.go

@@ -9,8 +9,9 @@ type OrganizationMembershipInvite struct {
 	Invitee        User   `gorm:"foreignkey:InviteeID"`
 	OrganizationID int64  `json:"organizationId"`
 	Organization   Organization
-	InviterID      int64 `json:"inviterId"`
-	Inviter        User  `gorm:"foreignkey:InviterID"`
+	InviterID      int64  `json:"inviterId"`
+	Inviter        User   `gorm:"foreignkey:InviterID"`
+	Key            string `json:"-"` // the secret key which is sent to the invitee for authorization
 }
 
 // OrganizationMembershipInviteRepository represents the interface for a repository of membership invite entities.

internal/organizations/rand.go

@@ -0,0 +1,25 @@
+package organizations
+
+import (
+	"math/rand"
+	"time"
+)
+
+const charset = "abcdefghijklmnopqrstuvwxyz" +
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
+var seededRand *rand.Rand = rand.New(rand.NewSource(time.Now().UnixNano()))
+
+// stringWithCharset generates a random string using a charset.
+func stringWithCharset(length int, charset string) string {
+	b := make([]byte, length)
+	for i := range b {
+		b[i] = charset[seededRand.Intn(len(charset))]
+	}
+	return string(b)
+}
+
+// generateKey generates and returns a random string to use as a key.
+func generateKey() string {
+	return stringWithCharset(24, charset)
+}

internal/organizations/service.go

@@ -394,6 +394,7 @@ func (s *service) inviteByEmail(inviterID int64, organization *models.Organizati
 		InviteeEmail:   userEmail,
 		OrganizationID: organization.ID,
 		InviterID:      inviterID,
+		Key:            generateKey(),
 	})
 	if err != nil {
 		return NewErrServerError()
@@ -430,6 +431,7 @@ func (s *service) inviteByID(inviterID int64, organization *models.Organization,
 		InviteeID:      user.ID,
 		OrganizationID: organization.ID,
 		InviterID:      inviterID,
+		Key:            generateKey(),
 	})
 	if err != nil {
 		return NewErrServerError()