feat: orgs conferencing apps by ibex088 · Pull Request #22211 · calcom/cal.com

ibex088 · 2025-07-02T12:13:53Z

What does this PR do?

This pull request introduces support for installing conferencing applications at the team/organization level.

Benefits

No individual setup required: Users within a team or organization no longer need to connect their personal accounts to Zoom or other conferencing apps.

Shared credentials: Once installed by a team admin, the conferencing app credentials are available for all sub-teams and users within the org.

Users can leverage the shared team/org-installed credentials when creating personal events, as well as sub-team events.

Reduced redundancy: Instead of every user configuring the same app, the admin installs it once and all members can use it seamlessly.

…nts and hooks

github-actions · 2025-07-02T12:14:02Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Feat/orgs conferencing apps". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

graphite-app · 2025-07-02T12:15:11Z

Graphite Automations

"Add consumer team as reviewer" took an action on this PR • (07/02/25)

1 reviewer was added to this PR based on Keith Williams's automation.

delve-auditor · 2025-07-02T12:17:57Z

✅ No security or compliance issues detected. Reviewed everything up to b270660.

Security Overview

🔎 Scanned files: 34 changed file(s)

Detected Code Changes

Change Type	Relevant files
Enhancement	► atoms.conferencing-apps.controller.ts Add Organization Conferencing Apps List Endpoint ► conferencing-atom.service.ts Include Team Installed Apps Option ► conferencing.controller.ts Add Default Conferencing App with Credential ID ► organizations-conferencing.controller.ts Implement Organization Level Conferencing Apps ► organizations-teams-conferencing.controller.ts Implement Team Level Conferencing Apps
Refactor	► conferencing.repository.ts Update Team Conferencing Apps Query ► conferencing.service.ts Refactor Conferencing App Logic ► user.repository.ts Add Profile Skip Platform Check Method
Configuration changes	► package.json Update Platform Libraries Version

Reply to this PR with @delve-auditor followed by a description of what change you want and we'll auto-submit a change to this PR to implement it.

cubic-dev-ai

cubic found 9 issues across 22 files. Review them in cubic.dev

_{React with 👍 or 👎 to teach cubic. Tag @cubic-dev-ai to give specific feedback.}

cubic-dev-ai · 2025-07-02T12:19:44Z

packages/platform/atoms/connect/conferencing-apps/hooks/useAtomsGetInstalledConferencingApps.ts

 export const QUERY_KEY = "get-installed-conferencing-apps";

-export const useAtomsGetInstalledConferencingApps = (teamId?: number) => {
+export const useAtomsGetInstalledConferencingApps = (teamId?: number, orgId?: number) => {


The function signature now allows both teamId and orgId, but the logic does not handle the case where both are provided. This could lead to ambiguous or unintended API calls. Consider validating that only one of teamId or orgId is provided at a time.

cubic-dev-ai · 2025-07-02T12:19:44Z

packages/app-store/server.ts

      },
    });
+
+    if (user?.organizationId) {


When the user belongs to an organization this branch replaces the previous { userId } filter with { teamId: { in: [user.organizationId] } }, causing personal credentials owned by the user to be ignored. As a result users who are part of an org will no longer see their own conferencing credentials in the location selector.

packages/platform/atoms/connect/conferencing-apps/hooks/useConnect.ts

apps/api/v2/src/modules/atoms/controllers/atoms.conferencing-apps.controller.ts

cubic-dev-ai · 2025-07-02T12:19:44Z

apps/api/v2/src/modules/conferencing/controllers/conferencing.controller.ts

          const fallbackUrl = decodedCallbackState.onErrorReturnTo || "";
          return { url: fallbackUrl };
        }
+      } else if (decodedCallbackState.orgId) {


This new branch repeats almost the same logic as the preceding team-level branch (building the same params / headers, performing the same axios call, and handling identical success & error flows). Copy-pasting this block increases maintenance cost and risks future inconsistencies. Extract the shared logic into a reusable helper instead of duplicating it.

packages/platform/atoms/connect/conferencing-apps/hooks/useGetDefaultConferencingApp.ts

packages/lib/server/repository/user.ts

packages/features/users/repositories/UserRepository.ts

vercel · 2025-07-02T12:43:07Z

The latest updates on your projects. Learn more about Vercel for GitHub.

2 Skipped Deployments

Project	Deployment	Preview	Comments	Updated (UTC)
cal	Ignored	Preview		Oct 31, 2025 11:06am
cal-eu	Ignored	Preview		Oct 31, 2025 11:06am

This reverts commit 82db763.

supalarry

couple small comments, besides that like discussed in Slack we need a how to guide for customers how to use this

supalarry · 2025-09-30T13:23:17Z

apps/api/v2/src/modules/conferencing/outputs/get-default-conferencing-app.output.ts

+
+  @IsNumber()
+  @IsOptional()
+  @Expose()


I think that the properties in DefaultConferencingAppsOutputDto won't show up in v2 docs because missing ApiProperty - we need to add it so customers know what data to expect.

supalarry · 2025-09-30T13:24:24Z

apps/api/v2/src/modules/conferencing/repositories/conferencing.repository.ts

  }

  async findTeamConferencingApps(teamId: number) {
+    const parentTeam = await this.dbRead.prisma.team.findUnique({


shouldn't this be just const team because we then check ?.parentId

supalarry · 2025-09-30T13:24:54Z

apps/api/v2/src/modules/conferencing/repositories/conferencing.repository.ts

    });
  }
+
+  async findMultipleTeamsConferencingApp(teamIds: number[], app: string) {


Why in findTeamConferencingApps we check parentId and here not?

supalarry · 2025-09-30T13:26:45Z

packages/app-store/server.ts

-          if (!existingOption) {
-            apps[groupByCategory] = [...apps[groupByCategory], option];
-          }
+          // const existingOption = apps[groupByCategory].find((o) => o.value === option.value);


can delete comments

…DTOs

coderabbitai

Actionable comments posted: 1

🧹 Nitpick comments (1)

apps/api/v2/src/modules/users/users.repository.ts (1)
309-318: Consider a more explicit null check.

The condition typeof metadata === "object" evaluates to true for null due to a JavaScript quirk. While spreading null results in an empty object (matching the else branch behavior), a more explicit check would improve clarity.

Apply this diff to make the intent clearer:
       metadata:
-        typeof metadata === "object"
+        metadata && typeof metadata === "object"
           ? {
               ...metadata,

📜 Review details

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Disabled knowledge base sources:

Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

📥 Commits

Reviewing files that changed from the base of the PR and between b613d75 and d9e12fb.

📒 Files selected for processing (3)

apps/api/v2/src/modules/conferencing/outputs/get-default-conferencing-app.output.ts (2 hunks)
apps/api/v2/src/modules/teams/teams/teams.repository.ts (2 hunks)
apps/api/v2/src/modules/users/users.repository.ts (2 hunks)

🚧 Files skipped from review as they are similar to previous changes (2)

apps/api/v2/src/modules/conferencing/outputs/get-default-conferencing-app.output.ts
apps/api/v2/src/modules/teams/teams/teams.repository.ts

🧰 Additional context used

📓 Path-based instructions (4)

**/*.{service,repository}.ts

📄 CodeRabbit inference engine (.cursor/rules/review.mdc)

Avoid dot-suffixes like .service.ts or .repository.ts for new files; reserve .test.ts, .spec.ts, .types.ts for their specific purposes

Files:

apps/api/v2/src/modules/users/users.repository.ts

**/*.ts

📄 CodeRabbit inference engine (.cursor/rules/review.mdc)

**/*.ts: For Prisma queries, only select data you need; never use include, always use select
Ensure the credential.key field is never returned from tRPC endpoints or APIs

Files:

apps/api/v2/src/modules/users/users.repository.ts

**/*.{ts,tsx}

📄 CodeRabbit inference engine (.cursor/rules/review.mdc)

Flag excessive Day.js use in performance-critical code; prefer native Date or Day.js .utc() in hot paths like loops

Files:

apps/api/v2/src/modules/users/users.repository.ts

**/*.{ts,tsx,js,jsx}

⚙️ CodeRabbit configuration file

Flag default exports and encourage named exports. Named exports provide better tree-shaking, easier refactoring, and clearer imports. Exempt main components like pages, layouts, and components that serve as the primary export of a module.

Files:

apps/api/v2/src/modules/users/users.repository.ts

🧬 Code graph analysis (1)

apps/api/v2/src/modules/users/users.repository.ts (2)

packages/platform/libraries/index.ts (1)

userMetadata (73-73)

packages/prisma/zod-utils.ts (1)

userMetadata (327-349)

🔇 Additional comments (2)

apps/api/v2/src/modules/users/users.repository.ts (2)

10-10: LGTM!

The import of userMetadata is necessary for type-safe metadata parsing and aligns with the PR's introduction of credentialId support.

297-297: LGTM!

The addition of the optional credentialId parameter correctly extends the method to support credential-specific default conferencing apps, aligning with the PR objectives.

apps/api/v2/src/modules/users/users.repository.ts

…ccess

ibex088 added 10 commits June 21, 2025 15:25

feat: implement organization-level conferencing app management endpoi…

402c357

…nts and hooks

Merge branch 'main' into feat/orgs-conferencing-apps

58e02de

Merge branch 'main' into feat/orgs-conferencing-apps

069da95

Merge branch 'main' into feat/orgs-conferencing-apps

022a921

fix: Org conferencing app not visible as a location in user event types

4b8df31

Merge branch 'main' into feat/orgs-conferencing-apps

22e0288

Merge branch 'main' into feat/orgs-conferencing-apps

8b041e5

Merge branch 'main' into feat/orgs-conferencing-apps

3cd6935

Merge branch 'main' into feat/orgs-conferencing-apps

219766e

Merge branch 'main' into feat/orgs-conferencing-apps

2e9e6ff

ibex088 requested a review from a team July 2, 2025 12:13

ibex088 requested a review from a team as a code owner July 2, 2025 12:13

graphite-app bot requested a review from a team July 2, 2025 12:14

keithwillcode added core area: core, team members only platform Anything related to our platform plan labels Jul 2, 2025

dosubot bot added the ✨ feature New feature or request label Jul 2, 2025

cubic-dev-ai bot reviewed Jul 2, 2025

View reviewed changes

fix: atoms typescript locally

82db763

vercel bot temporarily deployed to Preview – api July 2, 2025 12:43 Inactive

vercel bot temporarily deployed to Preview – cal July 2, 2025 12:43 Inactive

vercel bot deployed to Preview – dev July 2, 2025 13:17 View deployment

Merge branch 'main' into feat/orgs-conferencing-apps

ea302a2

vercel bot deployed to Preview – dev July 3, 2025 07:06 View deployment

Revert "fix: atoms typescript locally"

7b772cb

This reverts commit 82db763.

vercel bot temporarily deployed to Preview – api July 3, 2025 12:27 Inactive

vercel bot temporarily deployed to Preview – cal July 3, 2025 12:27 Inactive

Merge branch 'main' into feat/orgs-conferencing-apps

12dfa90

pull-request-size bot added the size/XL label Sep 26, 2025

vercel bot deployed to Preview – dev September 26, 2025 08:52 View deployment

ibex088 added 2 commits September 26, 2025 15:54

Update AppList.tsx

b613d75

Merge branch 'main' into feat/orgs-conferencing-apps

81bd404

vercel bot deployed to Preview – dev September 26, 2025 12:35 View deployment

supalarry reviewed Sep 30, 2025

View reviewed changes

ibex088 self-assigned this Oct 6, 2025

fix: add missing API property decorators for conferencing app output …

fda04a8

…DTOs

ibex088 requested a review from a team as a code owner October 6, 2025 08:07

Merge branch 'main' into feat/orgs-conferencing-apps

d9e12fb

coderabbitai bot reviewed Oct 6, 2025

View reviewed changes

apps/api/v2/src/modules/users/users.repository.ts Show resolved Hide resolved

vercel bot deployed to Preview – dev October 6, 2025 08:38 View deployment

fix: move user metadata parse after existence check to prevent null a…

01c6a6b

…ccess

vercel bot deployed to Preview – dev October 6, 2025 09:25 View deployment

refactor: remove commented out check

7144577

vercel bot deployed to Preview – dev October 6, 2025 09:57 View deployment

Merge branch 'main' into feat/orgs-conferencing-apps

cdffc6d

vercel bot deployed to Preview – dev October 30, 2025 10:01 View deployment

ibex088 added 2 commits October 30, 2025 15:37

feat: add team credentials support for calendar delegation

1c464a8

feat: add team and org-level conferencing app installation docs

1f5266b

pull-request-size bot added size/XXL and removed size/XL labels Oct 30, 2025

vercel bot had a problem deploying to Preview – dev October 30, 2025 11:48 Failure

Merge branch 'main' into feat/orgs-conferencing-apps

f05b20b

vercel bot deployed to Preview – dev October 31, 2025 13:42 View deployment

supalarry self-requested a review November 4, 2025 15:07

supalarry approved these changes Nov 4, 2025

View reviewed changes

graphite-app bot added the community Created by Linear-GitHub Sync label Nov 23, 2025

keithwillcode closed this Dec 18, 2025

Conversation

ibex088 commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Uh oh!

github-actions bot commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

graphite-app bot commented Jul 2, 2025

Graphite Automations

Uh oh!

delve-auditor bot commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cubic-dev-ai bot Jul 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vercel bot commented Jul 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

supalarry left a comment

Choose a reason for hiding this comment

Uh oh!

supalarry Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

supalarry Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

supalarry Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

supalarry Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

coderabbitai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ibex088 commented Jul 2, 2025 •

edited

Loading

github-actions bot commented Jul 2, 2025 •

edited

Loading

delve-auditor bot commented Jul 2, 2025 •

edited

Loading

vercel bot commented Jul 2, 2025 •

edited

Loading