fix: team invite links #10110

zomars · 2023-07-12T20:32:33Z

What does this PR do?

Fixes #10106

Type of change

Bug fix (non-breaking change which fixes an issue)

How should this be tested?

Create a team and bulk invite new members, on the DB all should have the teamID properly set.
Use the copy invite link button. There should be only one active token for it.

Mandatory Tasks

Make sure you have self-reviewed the code. A decent size PR without self-review might be rejected.

Checklist

I haven't added tests that prove my fix is effective or that my feature works

linear · 2023-07-12T20:32:35Z

CAL-2160 Team invites aren't working for non-users

Found a bug? Please fill out the sections below. 👍

Issue Summary

Introduced in #8355

Seems like invites to external users aren't being sent when there's more than one.

Steps to Reproduce

Create a team
Invite a non-Cal user (all good so far)
Try inviting another non-Cal user

Any other relevant information. For example, why do you consider this a bug and what did you expect to happen instead?

The current DB schema has a wrong unique constrain on teamID for VerificationToken, also seems like a Team can only have 1 active VerificationToken at a time.

Actual Results

There can only be 1 active invite at a time per team

Expected Results

A team should be able to have multiple invite tokens active

Technical details

Browser version, screen recording, console logs, network requests: You can make a recording with Bird Eats Bug.
Node.js version
Anything else that you think could be an issue.

Evidence

Created a team and bulk-invited 3 new memebers. Only the last one had a relationship with the team.

Source image

Invited a new one and this one got the relationship with the team now. So now previous invites are stuck in limbo.

Source image

vercel · 2023-07-12T20:32:39Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
api	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 12, 2023 8:37pm
cal	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 12, 2023 8:37pm
cal-staging	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 12, 2023 8:37pm
ui	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jul 12, 2023 8:37pm

github-actions · 2023-07-12T20:32:47Z

Thank you for following the naming conventions! 🙏

zomars

Ready for review

zomars · 2023-07-12T20:33:30Z

apps/web/pages/signup.tsx

@@ -83,7 +82,7 @@ export default function Signup({ prepopulateFormValues, token, orgSlug }: Signup
  };

  return (
-    <LicenseRequired>


LicenseRequired only works for logged in users. All users landing will be logged off.

we dont need this for this component anyway. great catch!

zomars · 2023-07-12T20:34:01Z

packages/lib/server/queries/teams/index.ts

@@ -114,7 +115,16 @@ export async function getTeamWithMembers(id?: number, slug?: string, userId?: nu
    ...eventType,
    metadata: EventTypeMetaDataSchema.parse(eventType.metadata),
  }));
-  return { ...team, metadata: teamMetadataSchema.parse(team.metadata), eventTypes, members };
+  /** Don't leak invite tokens to the frontend */
+  const { inviteTokens, ...teamWithoutInviteTokens } = team;


Also to keep previous frontend signature

zomars · 2023-07-12T20:34:22Z

packages/prisma/migrations/20230712192734_fixes_team_verification_tokens/migration.sql

@@ -0,0 +1,2 @@
+-- DropIndex
+DROP INDEX "VerificationToken_teamId_key";


A team can have multiple tokens. Dropped the unique requirement

zomars · 2023-07-12T20:34:35Z

packages/prisma/schema.prisma

@@ -270,7 +270,7 @@ model Team {
  parent              Team?                   @relation("organization", fields: [parentId], references: [id], onDelete: Cascade)
  children            Team[]                  @relation("organization")
  orgUsers            User[]                  @relation("scope")
-  inviteToken         VerificationToken?
+  inviteTokens        VerificationToken[]


A team may have multiple tokens

zomars · 2023-07-12T20:34:54Z

packages/prisma/schema.prisma

@@ -310,7 +310,7 @@ model VerificationToken {
  expiresInDays Int?
  createdAt     DateTime @default(now())
  updatedAt     DateTime @updatedAt
-  teamId        Int?     @unique
+  teamId        Int?


This was causing that only the most recent invite had the proper team relationship.

zomars · 2023-07-12T20:35:18Z

packages/trpc/server/routers/viewer/teams/createInvite.handler.ts

@@ -22,7 +22,7 @@ export const createInviteHandler = async ({ ctx, input }: CreateInviteOptions) =
  const token = randomBytes(32).toString("hex");
  await prisma.verificationToken.create({
    data: {
-      identifier: "",
+      identifier: "invite-link-for-teamId-" + teamId,


Only to distinguish the copy link token VS the each individual email.

alwaysmeticulous · 2023-07-12T20:37:18Z

🤖 Meticulous spotted visual differences in 46 of 180 screens tested: view and approve differences detected.

_{Last updated for commit c4b4892. This comment will update as new commits are pushed.}

github-actions · 2023-07-12T20:40:31Z

📦 Next.js Bundle Analysis for @calcom/web

This analysis was generated by the Next.js Bundle Analysis action. 🤖

This PR introduced no changes to the JavaScript bundle! 🙌

deploysentinel · 2023-07-12T20:41:50Z

Current Playwright Test Results Summary

✅ 88 Passing - ⚠️ 2 Flaky

Run may still be in progress, this comment will be updated as current testing workflow or job completes...

(Last updated on 07/12/2023 08:42:23pm UTC)

Run Details

Running Workflow PR Update on Github Actions

Commit: c4b4892

Started: 07/12/2023 08:40:35pm UTC

⚠️ Flakes

📄 apps/web/playwright/managed-event-types.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Managed Event Types tests Can create managed event type Retry 2 • Retry 1 • Initial Attempt	0.88% (3) 3 / 339 runs failed over last 7 days	12.09% (41) 41 / 339 runs flaked over last 7 days

📄 packages/embeds/embed-core/playwright/tests/action-based.e2e.ts • 1 Flake

Test Case Results

Test Case	Last 7 days Failures	Last 7 days Flakes
Popup Tests should be able to reschedule Retry 1 • Initial Attempt	2.38% (1) 1 / 42 run failed over last 7 days	97.62% (41) 41 / 42 runs flaked over last 7 days

View Detailed Build Results

alannnc

Code looks good!

zomars added 2 commits July 12, 2023 13:20

fix: team invite links

79b7f00

Typefixes

c4b4892

github-actions bot added High priority Created by Linear-GitHub Sync 🐛 bug Something isn't working ❗️ migrations contains migration files and removed 🐛 bug Something isn't working High priority Created by Linear-GitHub Sync labels Jul 12, 2023

zomars added the core area: core, team members only label Jul 12, 2023

vercel bot deployed to Preview – cal-staging July 12, 2023 20:35 View deployment

vercel bot deployed to Preview – ui July 12, 2023 20:35 View deployment

zomars commented Jul 12, 2023

View reviewed changes

zomars requested review from sean-brydon and a team July 12, 2023 20:35

vercel bot deployed to Preview – api July 12, 2023 20:36 View deployment

zomars added the Urgent Created by Linear-GitHub Sync label Jul 12, 2023

zomars requested a review from a team July 12, 2023 20:36

vercel bot deployed to Preview – cal July 12, 2023 20:37 View deployment

emrysal approved these changes Jul 12, 2023

View reviewed changes

alannnc approved these changes Jul 12, 2023

View reviewed changes

zomars merged commit 9b37d65 into main Jul 12, 2023
32 of 33 checks passed

zomars deleted the zomars/cal-2160-team-invites-arent-working-for-non-users branch July 12, 2023 21:24

fritterhoff pushed a commit to hm-edu/cal.com that referenced this pull request Jul 25, 2023

fix: team invite links (calcom#10110)

033c4f2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: team invite links #10110

fix: team invite links #10110

zomars commented Jul 12, 2023 •

edited

linear bot commented Jul 12, 2023

Issue Summary

Steps to Reproduce

Actual Results

Expected Results

Technical details

Evidence

vercel bot commented Jul 12, 2023 •

edited

github-actions bot commented Jul 12, 2023 •

edited

zomars left a comment

zomars Jul 12, 2023

PeerRich Jul 12, 2023

zomars Jul 12, 2023

zomars Jul 12, 2023

zomars Jul 12, 2023

zomars Jul 12, 2023

zomars Jul 12, 2023

alwaysmeticulous bot commented Jul 12, 2023 •

edited

github-actions bot commented Jul 12, 2023

deploysentinel bot commented Jul 12, 2023 •

edited

Test Case Results

Test Case Results

alannnc left a comment

		@@ -0,0 +1,2 @@
		-- DropIndex
		DROP INDEX "VerificationToken_teamId_key";

fix: team invite links #10110

fix: team invite links #10110

Conversation

zomars commented Jul 12, 2023 • edited

What does this PR do?

Type of change

How should this be tested?

Mandatory Tasks

Checklist

linear bot commented Jul 12, 2023

Issue Summary

Steps to Reproduce

Actual Results

Expected Results

Technical details

Evidence

vercel bot commented Jul 12, 2023 • edited

github-actions bot commented Jul 12, 2023 • edited

zomars left a comment

Choose a reason for hiding this comment

zomars Jul 12, 2023

Choose a reason for hiding this comment

PeerRich Jul 12, 2023

Choose a reason for hiding this comment

zomars Jul 12, 2023

Choose a reason for hiding this comment

zomars Jul 12, 2023

Choose a reason for hiding this comment

zomars Jul 12, 2023

Choose a reason for hiding this comment

zomars Jul 12, 2023

Choose a reason for hiding this comment

zomars Jul 12, 2023

Choose a reason for hiding this comment

alwaysmeticulous bot commented Jul 12, 2023 • edited

github-actions bot commented Jul 12, 2023

📦 Next.js Bundle Analysis for @calcom/web

deploysentinel bot commented Jul 12, 2023 • edited

Current Playwright Test Results Summary

⚠️ Flakes

Test Case Results

Test Case Results

alannnc left a comment

Choose a reason for hiding this comment

zomars commented Jul 12, 2023 •

edited

vercel bot commented Jul 12, 2023 •

edited

github-actions bot commented Jul 12, 2023 •

edited

alwaysmeticulous bot commented Jul 12, 2023 •

edited

deploysentinel bot commented Jul 12, 2023 •

edited