chore: v4.3.1 (#15817 )

feat: Salesforce - Disable creating new contacts (#15780 )
Co-authored-by: zomars <zomars@me.com>
2024-07-18 13:09:30 +02:00 · 2024-07-18 10:50:42 +00:00 · 2024-07-18 10:20:03 +00:00 · 2024-07-18 07:27:34 +00:00 · 2024-07-18 03:43:20 +00:00 · 2024-07-17 12:56:37 +00:00
174 changed files with 3867 additions and 2232 deletions
@@ -74,7 +74,7 @@ branch are tagged into a release monthly.

 To develop locally:

-1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your
+1. [Fork](https://github.com/calcom/cal.com/fork/) this repository to your
   own GitHub account and then
   [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:
@@ -1,21 +0,0 @@
-BACKEND_URL=http://localhost:3002/api
-# BACKEND_URL=https://api.cal.com/v1
-FRONTEND_URL=http://localhost:3000
-# FRONTEND_URL=https://cal.com
-
-APP_ID=cal-ai
-APP_URL=http://localhost:3000/apps/cal-ai
-
-# This is for the onboard route. Which domain should we send emails from?
-SENDER_DOMAIN=cal.ai
-
-# Used to verify requests from sendgrid. You can generate a new one with: `openssl rand -hex 32`
-PARSE_KEY=
-
-OPENAI_API_KEY=
-
-# Optionally trace completions at https://smith.langchain.com
-# LANGCHAIN_TRACING_V2=true
-# LANGCHAIN_ENDPOINT=
-# LANGCHAIN_API_KEY=
-# LANGCHAIN_PROJECT=
@@ -1,68 +0,0 @@
-# Cal.ai
-
-Welcome to [Cal.ai](https://cal.ai)!
-
-This app lets you chat with your calendar via email:
-
- Turn informal emails into bookings eg. forward "wanna meet tmrw at 2pm?"
- List and rearrange your bookings eg. "clear my afternoon"
- Answer basic questions about your busiest times eg. "how does my Tuesday look?"
-
-The core logic is contained in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts). Here, a [LangChain Agent Executor](https://docs.langchain.com/docs/components/agents/agent-executor) is tasked with following your instructions. Given your last-known timezone, working hours, and busy times, it attempts to CRUD your bookings.
-
-_The AI agent can only choose from a set of tools, without ever seeing your API key._
-
-Emails are cleaned and routed in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts) using [MailParser](https://nodemailer.com/extras/mailparser/).
-
-Incoming emails are routed by email address. Addresses are verified by [DKIM record](https://support.google.com/a/answer/174124?hl=en), making them hard to spoof.
-
-## Recognition
-
-<a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-cal&#0045;ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=419860&theme=light&period=daily" alt="Cal&#0046;ai - World&#0039;s&#0032;first&#0032;open&#0032;source&#0032;AI&#0032;scheduling&#0032;assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/cal-ai?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cal&#0045;ai" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=419860&theme=light" alt="Cal&#0046;ai - World&#0039;s&#0032;first&#0032;open&#0032;source&#0032;AI&#0032;scheduling&#0032;assistant | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-
-## Getting Started
-
-### Development
-
-If you haven't yet, please run the [root setup](/README.md) steps.
-
-Before running the app, please see [env.mjs](./src/env.mjs) for all required environment variables. Run `cp .env.example .env` in this folder to get started. You'll need:
-
- An [OpenAI API key](https://platform.openai.com/account/api-keys) with access to GPT-4
- A [SendGrid API key](https://app.sendgrid.com/settings/api_keys)
- A default sender email (for example, `me@dev.example.com`)
- The Cal.ai app's ID and URL (see [add.ts](/packages/app-store/cal-ai/api/index.ts))
- A unique value for `PARSE_KEY` with `openssl rand -hex 32`
-
-To stand up the API and AI apps simultaneously, simply run `yarn dev:ai`.
-
-### Agent Architecture
-
-The scheduling agent in [agent/route.ts](/apps/ai/src/app/api/agent/route.ts) calls an LLM (in this case, GPT-4) in a loop to accomplish a multi-step task. We use an [OpenAI Functions agent](https://js.langchain.com/docs/modules/agents/agent_types/openai_functions_agent), which is fine-tuned to output text suited for passing to tools.
-
-Tools (eg. [`createBooking`](/apps/ai/src/tools/createBooking.ts)) are simply JavaScript methods wrapped by Zod schemas, telling the agent what format to output.
-
-Here is the full architecture:
-
-![Cal.ai architecture](/apps/ai/src/public/architecture.png)
-
-### Email Router
-
-To expose the AI app, you can use either [Tunnelmole](https://github.com/robbie-cahill/tunnelmole-client), an open source tunnelling tool; or [nGrok](https://ngrok.com/), a popular closed source tunnelling tool. 
-
-For Tunnelmole, run `tmole 3005` (or the AI app's port number) in a new terminal. Please replace `3005` with the port number if it is different. In the output, you'll see two URLs, one http and a https (we recommend using the https url for privacy and security). To install Tunnelmole, use `curl -O https://install.tunnelmole.com/8dPBw/install && sudo bash install`. (On Windows, download [tmole.exe](https://tunnelmole.com/downloads/tmole.exe))
-
-For nGrok, run `ngrok http 3005` (or the AI app's port number) in a new terminal. You may need to install nGrok first.
-
-To forward incoming emails to the serverless function at `/agent`, we use [SendGrid's Inbound Parse](https://docs.sendgrid.com/for-developers/parsing-email/setting-up-the-inbound-parse-webhook).
-
-1.  Ensure you have a [SendGrid account](https://signup.sendgrid.com/)
-2.  Ensure you have an authenticated domain. Go to Settings > Sender Authentication > Authenticate. For DNS host, select `I'm not sure`. Click Next and add your domain, eg. `example.com`. Choose Manual Setup. You'll be given three CNAME records to add to your DNS settings, eg. in [Vercel Domains](https://vercel.com/dashboard/domains). After adding those records, click Verify. To troubleshoot, see the [full instructions](https://docs.sendgrid.com/ui/account-and-settings/how-to-set-up-domain-authentication).
-3.  Authorize your domain for email with MX records: one with name `[your domain].com` and value `mx.sendgrid.net.`, and another with name `bounces.[your domain].com` and value `feedback-smtp.us-east-1.amazonses.com`. Set the priority to `10` if prompted.
-4.  Go to Settings > [Inbound Parse](https://app.sendgrid.com/settings/parse) > Add Host & URL. Choose your authenticated domain.
-5.  In the Destination URL field, use the Tunnelmole or ngrok URL from above along with the path, `/api/receive`, and one param, `parseKey`, which lives in [this app's .env](/apps/ai/.env.example) under `PARSE_KEY`. The full URL should look like `https://abc.tunnelmole.net/api/receive?parseKey=ABC-123` or `https://abc.ngrok.io/api/receive?parseKey=ABC-123`.
-6.  Activate "POST the raw, full MIME message".
-7.  Send an email to `[anyUsername]@example.com`. You should see a ping on the Tunnelmole or ngrok listener and server.
-8.  Adjust the logic in [receive/route.ts](/apps/ai/src/app/api/receive/route.ts), save to hot-reload, and send another email to test the behaviour.
-
-Please feel free to improve any part of this architecture!
@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
@@ -1,24 +0,0 @@
-const withBundleAnalyzer = require("@next/bundle-analyzer");
-
-const plugins = [];
-plugins.push(withBundleAnalyzer({ enabled: process.env.ANALYZE === "true" }));
-
-/** @type {import("next").NextConfig} */
-const nextConfig = {
-  async redirects() {
-    return [
-      {
-        source: "/",
-        destination: "https://cal.com/ai",
-        permanent: true,
-      },
-    ];
-  },
-  i18n: {
-    defaultLocale: "en",
-    locales: ["en"],
-  },
-  reactStrictMode: true,
-};
-
-module.exports = () => plugins.reduce((acc, next) => next(acc), nextConfig);
@@ -1,28 +0,0 @@
-{
-  "name": "@calcom/ai",
-  "version": "1.2.1",
-  "private": true,
-  "author": "Cal.com Inc.",
-  "dependencies": {
-    "@calcom/prisma": "*",
-    "@langchain/core": "^0.1.26",
-    "@langchain/openai": "^0.0.14",
-    "@t3-oss/env-nextjs": "^0.6.1",
-    "langchain": "^0.1.17",
-    "mailparser": "^3.6.5",
-    "next": "^13.5.4",
-    "supports-color": "8.1.1",
-    "zod": "^3.22.4"
-  },
-  "devDependencies": {
-    "@types/mailparser": "^3.4.0"
-  },
-  "scripts": {
-    "build": "next build",
-    "dev": "next dev -p 3005",
-    "format": "npx prettier . --write",
-    "lint": "eslint . --ext .ts,.js,.tsx,.jsx",
-    "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
-    "start": "next start"
-  }
-}
@@ -1,55 +0,0 @@
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-
-import agent from "../../../utils/agent";
-import sendEmail from "../../../utils/sendEmail";
-import { verifyParseKey } from "../../../utils/verifyParseKey";
-
-// Allow agent loop to run for up to 5 minutes
-export const maxDuration = 300;
-
-/**
- * Launches a LangChain agent to process an incoming email,
- * then sends the response to the user.
- */
-export const POST = async (request: NextRequest) => {
-  const verified = verifyParseKey(request.url);
-
-  if (!verified) {
-    return new NextResponse("Unauthorized", { status: 401 });
-  }
-
-  const json = await request.json();
-
-  const { apiKey, userId, message, subject, user, users, replyTo: agentEmail } = json;
-
-  if ((!message && !subject) || !user) {
-    return new NextResponse("Missing fields", { status: 400 });
-  }
-
-  try {
-    const response = await agent(`${subject}\n\n${message}`, { ...user }, users, apiKey, userId, agentEmail);
-
-    // Send response to user
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: response.replace(/(?:\r\n|\r|\n)/g, "\n"),
-      to: user.email,
-      from: agentEmail,
-    });
-
-    return new NextResponse("ok");
-  } catch (error) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! We're experiencing high demand and can't currently process your request. Please try again later.",
-      to: user.email,
-      from: agentEmail,
-    });
-
-    return new NextResponse(
-      (error as Error).message || "Something went wrong. Please try again or reach out for help.",
-      { status: 500 }
-    );
-  }
-};
@@ -1,44 +0,0 @@
-import type { NextRequest } from "next/server";
-
-import prisma from "@calcom/prisma";
-
-import { env } from "../../../env.mjs";
-import sendEmail from "../../../utils/sendEmail";
-
-export const POST = async (request: NextRequest) => {
-  const { userId } = await request.json();
-
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-      name: true,
-      username: true,
-    },
-    where: {
-      id: userId,
-    },
-  });
-
-  if (!user) {
-    return new Response("User not found", { status: 404 });
-  }
-
-  await sendEmail({
-    subject: "Welcome to Cal AI",
-    to: user.email,
-    from: `${user.username}@${env.SENDER_DOMAIN}`,
-    text: `Hi ${
-      user.name || `@${user.username}`
-    },\n\nI'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.\n\nHere are some things you can ask me:\n\n- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)\n- "What meetings do I have today?" (I'll show you your schedule)\n- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)\n\nI'm still learning, so if you have any feedback, please tweet it to @calcom!\n\nRemember, you can always reach me here, at ${
-      user.username
-    }@${
-      env.SENDER_DOMAIN
-    }.\n\nLooking forward to working together (:\n\n- Cal AI, Your personal booking assistant`,
-    html: `Hi ${
-      user.name || `@${user.username}`
-    },<br><br>I'm Cal AI, your personal booking assistant! I'll be here, 24/7 to help manage your busy schedule and find times to meet with the people you care about.<br><br>Here are some things you can ask me:<br><br>- "Book a meeting with @someone" (The @ symbol lets you tag Cal.com users)<br>- "What meetings do I have today?" (I'll show you your schedule)<br>- "Find a time for coffee with someone@gmail.com" (I'll intro and send them some good times)<br><br>I'm still learning, so if you have any feedback, please send it to <a href="https://twitter.com/calcom">@calcom</a> on X!<br><br>Remember, you can always reach me here, at ${
-      user.username
-    }@${env.SENDER_DOMAIN}.<br><br>Looking forward to working together (:<br><br>- Cal AI`,
-  });
-  return new Response("OK", { status: 200 });
-};
@@ -1,186 +0,0 @@
-import type { ParsedMail, Source } from "mailparser";
-import { simpleParser } from "mailparser";
-import type { NextRequest } from "next/server";
-import { NextResponse } from "next/server";
-
-import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError";
-import prisma from "@calcom/prisma";
-
-import { env } from "../../../env.mjs";
-import { fetchAvailability } from "../../../tools/getAvailability";
-import { fetchEventTypes } from "../../../tools/getEventTypes";
-import { extractUsers } from "../../../utils/extractUsers";
-import getHostFromHeaders from "../../../utils/host";
-import now from "../../../utils/now";
-import sendEmail from "../../../utils/sendEmail";
-import { verifyParseKey } from "../../../utils/verifyParseKey";
-
-// Allow receive loop to run for up to 30 seconds
-// Why so long? the rate determining API call (getAvailability, getEventTypes) can take up to 15 seconds at peak times so we give it a little extra time to complete.
-export const maxDuration = 30;
-
-/**
- * Verifies email signature and app authorization,
- * then hands off to booking agent.
- */
-export const POST = async (request: NextRequest) => {
-  const verified = verifyParseKey(request.url);
-
-  if (!verified) {
-    return new NextResponse("Unauthorized", { status: 401 });
-  }
-
-  const formData = await request.formData();
-  const body = Object.fromEntries(formData);
-  const envelope = JSON.parse(body.envelope as string);
-
-  const aiEmail = envelope.to[0];
-  const subject = body.subject || "";
-
-  try {
-    await checkRateLimitAndThrowError({
-      identifier: `ai:email:${envelope.from}`,
-      rateLimitingType: "ai",
-    });
-  } catch (error) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! You've reached your daily limit. Please try again tomorrow.",
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("Exceeded rate limit", { status: 200 }); // Don't return 429 to avoid triggering retry logic in SendGrid
-  }
-
-  // Parse email from mixed MIME type
-  const parsed: ParsedMail = await simpleParser(body.email as Source);
-
-  if (!parsed.text && !parsed.subject) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Thanks for using Cal.ai! It looks like you forgot to include a message. Please try again.",
-      to: envelope.from,
-      from: aiEmail,
-    });
-    return new NextResponse("Email missing text and subject", { status: 400 });
-  }
-
-  const user = await prisma.user.findUnique({
-    select: {
-      email: true,
-      id: true,
-      username: true,
-      timeZone: true,
-      credentials: {
-        select: {
-          appId: true,
-          key: true,
-        },
-      },
-    },
-    where: { email: envelope.from },
-  });
-
-  // body.dkim looks like {@domain-com.22222222.gappssmtp.com : pass}
-  const signature = (body.dkim as string).includes(" : pass");
-
-  // User is not a cal.com user or is using an unverified email.
-  if (!signature || !user) {
-    await sendEmail({
-      html: `Thanks for your interest in Cal.ai! To get started, Make sure you have a <a href="https://cal.com/signup" target="_blank">cal.com</a> account with this email address and then install Cal.ai here: <a href="https://go.cal.com/ai" target="_blank">go.cal.com/ai</a>.`,
-      subject: `Re: ${subject}`,
-      text: `Thanks for your interest in Cal.ai! To get started, Make sure you have a cal.com account with this email address. You can sign up for an account at: https://cal.com/signup`,
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("ok");
-  }
-
-  const credential = user.credentials.find((c) => c.appId === env.APP_ID)?.key;
-
-  // User has not installed the app from the app store. Direct them to install it.
-  if (!(credential as { apiKey: string })?.apiKey) {
-    const url = env.APP_URL;
-
-    await sendEmail({
-      html: `Thanks for using Cal.ai! To get started, the app must be installed. <a href=${url} target="_blank">Click this link</a> to install it.`,
-      subject: `Re: ${subject}`,
-      text: `Thanks for using Cal.ai! To get started, the app must be installed. Click this link to install the Cal.ai app: ${url}`,
-      to: envelope.from,
-      from: aiEmail,
-    });
-
-    return new NextResponse("ok");
-  }
-
-  const { apiKey } = credential as { apiKey: string };
-
-  // Pre-fetch data relevant to most bookings.
-  const [eventTypes, availability, users] = await Promise.all([
-    fetchEventTypes({
-      apiKey,
-    }),
-    fetchAvailability({
-      apiKey,
-      userId: user.id,
-      dateFrom: now(user.timeZone),
-      dateTo: now(user.timeZone),
-    }),
-    extractUsers(`${parsed.text} ${parsed.subject}`),
-  ]);
-
-  if ("error" in availability) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Sorry, there was an error fetching your availability. Please try again.",
-      to: user.email,
-      from: aiEmail,
-    });
-    console.error(availability.error);
-    return new NextResponse("Error fetching availability. Please try again.", { status: 400 });
-  }
-
-  if ("error" in eventTypes) {
-    await sendEmail({
-      subject: `Re: ${subject}`,
-      text: "Sorry, there was an error fetching your event types. Please try again.",
-      to: user.email,
-      from: aiEmail,
-    });
-    console.error(eventTypes.error);
-    return new NextResponse("Error fetching event types. Please try again.", { status: 400 });
-  }
-
-  const { workingHours } = availability;
-
-  const appHost = getHostFromHeaders(request.headers);
-
-  // Hand off to long-running agent endpoint to handle the email. (don't await)
-  fetch(`${appHost}/api/agent?parseKey=${env.PARSE_KEY}`, {
-    body: JSON.stringify({
-      apiKey,
-      userId: user.id,
-      message: parsed.text || "",
-      subject: parsed.subject || "",
-      replyTo: aiEmail,
-      user: {
-        email: user.email,
-        eventTypes,
-        username: user.username,
-        timeZone: user.timeZone,
-        workingHours,
-      },
-      users,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-  });
-
-  await new Promise((r) => setTimeout(r, 1000));
-
-  return new NextResponse("ok");
-};
@@ -1,47 +0,0 @@
-import { createEnv } from "@t3-oss/env-nextjs";
-import { z } from "zod";
-
-export const env = createEnv({
-  /**
-   * Specify your client-side environment variables schema here. This way you can ensure the app
-   * isn't built with invalid env vars. To expose them to the client, prefix them with
-   * `NEXT_PUBLIC_`.
-   */
-  client: {
-    // NEXT_PUBLIC_CLIENTVAR: z.string().min(1),
-  },
-
-  /**
-   * You can't destruct `process.env` as a regular object in the Next.js edge runtimes (e.g.
-   * middlewares) or client-side so we need to destruct manually.
-   */
-  runtimeEnv: {
-    BACKEND_URL: process.env.BACKEND_URL,
-    FRONTEND_URL: process.env.FRONTEND_URL,
-    APP_ID: process.env.APP_ID,
-    APP_URL: process.env.APP_URL,
-    SENDER_DOMAIN: process.env.SENDER_DOMAIN,
-    PARSE_KEY: process.env.PARSE_KEY,
-    NODE_ENV: process.env.NODE_ENV,
-    OPENAI_API_KEY: process.env.OPENAI_API_KEY,
-    SENDGRID_API_KEY: process.env.SENDGRID_API_KEY,
-    DATABASE_URL: process.env.DATABASE_URL,
-  },
-
-  /**
-   * Specify your server-side environment variables schema here. This way you can ensure the app
-   * isn't built with invalid env vars.
-   */
-  server: {
-    BACKEND_URL: z.string().url(),
-    FRONTEND_URL: z.string().url(),
-    APP_ID: z.string().min(1),
-    APP_URL: z.string().url(),
-    SENDER_DOMAIN: z.string().min(1),
-    PARSE_KEY: z.string().min(1),
-    NODE_ENV: z.enum(["development", "test", "production"]),
-    OPENAI_API_KEY: z.string().min(1),
-    SENDGRID_API_KEY: z.string().min(1),
-    DATABASE_URL: z.string().url(),
-  },
-});
@@ -1,121 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import type { UserList } from "~/src/types/user";
-
-import { env } from "../env.mjs";
-
-/**
- * Creates a booking for a user by event type, times, and timezone.
- */
-const createBooking = async ({
-  apiKey,
-  userId,
-  users,
-  eventTypeId,
-  start,
-  end,
-  timeZone,
-  language,
-  invite,
-}: {
-  apiKey: string;
-  userId: number;
-  users: UserList;
-  eventTypeId: number;
-  start: string;
-  end: string;
-  timeZone: string;
-  language: string;
-  invite: number;
-  title?: string;
-  status?: string;
-}): Promise<string | Error | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
-
-  const user = users.find((u) => u.id === invite);
-
-  if (!user) {
-    return { error: `User with id ${invite} not found to invite` };
-  }
-
-  const responses = {
-    id: invite.toString(),
-    name: user.username,
-    email: user.email,
-  };
-
-  const response = await fetch(url, {
-    body: JSON.stringify({
-      end,
-      eventTypeId,
-      language,
-      metadata: {},
-      responses,
-      start,
-      timeZone,
-    }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "POST",
-  });
-
-  // Let GPT handle this. This will happen when wrong event type id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return {
-      error: data.message,
-    };
-  }
-
-  return "Booking created";
-};
-
-const createBookingTool = (apiKey: string, userId: number, users: UserList) => {
-  return new DynamicStructuredTool({
-    description: "Creates a booking on the primary user's calendar.",
-    func: async ({ eventTypeId, start, end, timeZone, language, invite, title, status }) => {
-      return JSON.stringify(
-        await createBooking({
-          apiKey,
-          userId,
-          users,
-          end,
-          eventTypeId,
-          language,
-          invite,
-          start,
-          status,
-          timeZone,
-          title,
-        })
-      );
-    },
-    name: "createBooking",
-    schema: z.object({
-      end: z
-        .string()
-        .describe("This should correspond to the event type's length, unless otherwise specified."),
-      eventTypeId: z.number(),
-      language: z.string(),
-      invite: z.number().describe("External user id to invite."),
-      start: z.string(),
-      status: z.string().optional().describe("ACCEPTED, PENDING, CANCELLED or REJECTED"),
-      timeZone: z.string(),
-      title: z.string().optional(),
-    }),
-  });
-};
-
-export default createBookingTool;
@@ -1,66 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-
-/**
- * Cancels a booking for a user by ID with reason.
- */
-const cancelBooking = async ({
-  apiKey,
-  id,
-  reason,
-}: {
-  apiKey: string;
-  id: string;
-  reason: string;
-}): Promise<string | { error: string }> => {
-  const params = {
-    apiKey,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings/${id}/cancel?${urlParams.toString()}`;
-
-  const response = await fetch(url, {
-    body: JSON.stringify({ reason }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "DELETE",
-  });
-
-  // Let GPT handle this. This will happen when wrong booking id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return "Booking cancelled";
-};
-
-const cancelBookingTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Cancel a booking",
-    func: async ({ id, reason }) => {
-      return JSON.stringify(
-        await cancelBooking({
-          apiKey,
-          id,
-          reason,
-        })
-      );
-    },
-    name: "cancelBooking",
-    schema: z.object({
-      id: z.string(),
-      reason: z.string(),
-    }),
-  });
-};
-
-export default cancelBookingTool;
@@ -1,77 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { Availability } from "../types/availability";
-
-/**
- * Fetches availability for a user by date range and event type.
- */
-export const fetchAvailability = async ({
-  apiKey,
-  userId,
-  dateFrom,
-  dateTo,
-}: {
-  apiKey: string;
-  userId: number;
-  dateFrom: string;
-  dateTo: string;
-}): Promise<Partial<Availability> | { error: string }> => {
-  const params: { [k: string]: string } = {
-    apiKey,
-    userId: userId.toString(),
-    dateFrom,
-    dateTo,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/availability?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return {
-    busy: data.busy,
-    dateRanges: data.dateRanges,
-    timeZone: data.timeZone,
-    workingHours: data.workingHours,
-  };
-};
-
-const getAvailabilityTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Get availability of users within range.",
-    func: async ({ userIds, dateFrom, dateTo }) => {
-      return JSON.stringify(
-        await Promise.all(
-          userIds.map(
-            async (userId) =>
-              await fetchAvailability({
-                userId: userId,
-                apiKey,
-                dateFrom,
-                dateTo,
-              })
-          )
-        )
-      );
-    },
-    name: "getAvailability",
-    schema: z.object({
-      userIds: z.array(z.number()).describe("The users to fetch availability for."),
-      dateFrom: z.string(),
-      dateTo: z.string(),
-    }),
-  });
-};
-
-export default getAvailabilityTool;
@@ -1,75 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { Booking } from "../types/booking";
-import { BOOKING_STATUS } from "../types/booking";
-
-/**
- * Fetches bookings for a user by date range.
- */
-const fetchBookings = async ({
-  apiKey,
-  userId,
-  from,
-  to,
-}: {
-  apiKey: string;
-  userId: number;
-  from: string;
-  to: string;
-}): Promise<Booking[] | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-    dateFrom: from,
-    dateTo: to,
-  };
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  const bookings: Booking[] = data.bookings
-    .filter((booking: Booking) => {
-      const notCancelled = booking.status !== BOOKING_STATUS.CANCELLED;
-
-      return notCancelled;
-    })
-    .map(({ endTime, eventTypeId, id, startTime, status, title }: Booking) => ({
-      endTime,
-      eventTypeId,
-      id,
-      startTime,
-      status,
-      title,
-    }));
-
-  return bookings;
-};
-
-const getBookingsTool = (apiKey: string, userId: number) => {
-  return new DynamicStructuredTool({
-    description: "Get bookings for the primary user between two dates.",
-    func: async ({ from, to }) => {
-      return JSON.stringify(await fetchBookings({ apiKey, userId, from, to }));
-    },
-    name: "getBookings",
-    schema: z.object({
-      from: z.string().describe("ISO 8601 datetime string"),
-      to: z.string().describe("ISO 8601 datetime string"),
-    }),
-  });
-};
-
-export default getBookingsTool;
@@ -1,59 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-import type { EventType } from "../types/eventType";
-
-/**
- * Fetches event types by user ID.
- */
-export const fetchEventTypes = async ({ apiKey, userId }: { apiKey: string; userId?: number }) => {
-  const params: Record<string, string> = {
-    apiKey,
-  };
-
-  if (userId) {
-    params["userId"] = userId.toString();
-  }
-
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/event-types?${urlParams.toString()}`;
-
-  const response = await fetch(url);
-
-  if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return data.event_types.map((eventType: EventType) => ({
-    id: eventType.id,
-    slug: eventType.slug,
-    length: eventType.length,
-    title: eventType.title,
-  }));
-};
-
-const getEventTypesTool = (apiKey: string) => {
-  return new DynamicStructuredTool({
-    description: "Get a user's event type IDs. Usually necessary to book a meeting.",
-    func: async ({ userId }) => {
-      return JSON.stringify(
-        await fetchEventTypes({
-          apiKey,
-          userId,
-        })
-      );
-    },
-    name: "getEventTypes",
-    schema: z.object({
-      userId: z.number().optional().describe("The user ID. Defaults to the primary user's ID."),
-    }),
-  });
-};
-
-export default getEventTypesTool;
@@ -1,124 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "~/src/env.mjs";
-import type { User, UserList } from "~/src/types/user";
-import sendEmail from "~/src/utils/sendEmail";
-
-export const sendBookingEmail = async ({
-  user,
-  agentEmail,
-  subject,
-  to,
-  message,
-  eventTypeSlug,
-  slots,
-  date,
-}: {
-  apiKey: string;
-  user: User;
-  users: UserList;
-  agentEmail: string;
-  subject: string;
-  to: string;
-  message: string;
-  eventTypeSlug: string;
-  slots?: {
-    time: string;
-    text: string;
-  }[];
-  date: {
-    date: string;
-    text: string;
-  };
-}) => {
-  // const url = `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date}`;
-  const timeUrls = slots?.map(({ time, text }) => {
-    return {
-      url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?slot=${time}`,
-      text,
-    };
-  });
-
-  const dateUrl = {
-    url: `${env.FRONTEND_URL}/${user.username}/${eventTypeSlug}?date=${date.date}`,
-    text: date.text,
-  };
-
-  await sendEmail({
-    subject,
-    to,
-    cc: user.email,
-    from: agentEmail,
-    text: message
-      .split("[[[Slots]]]")
-      .join(timeUrls?.map(({ url, text }) => `${text}: ${url}`).join("\n"))
-      .split("[[[Link]]]")
-      .join(`${dateUrl.text}: ${dateUrl.url}`),
-    html: message
-      .split("\n")
-      .join("<br>")
-      .split("[[[Slots]]]")
-      .join(timeUrls?.map(({ url, text }) => `<a href="${url}">${text}</a>`).join("<br>"))
-      .split("[[[Link]]]")
-      .join(`<a href="${dateUrl.url}">${dateUrl.text}</a>`),
-  });
-
-  return "Booking link sent";
-};
-
-const sendBookingEmailTool = (apiKey: string, user: User, users: UserList, agentEmail: string) => {
-  return new DynamicStructuredTool({
-    description:
-      "Send a booking link via email. Useful for scheduling with non cal users. Be confident, suggesting a good date/time with a fallback to a link to select a date/time.",
-    func: async ({ message, subject, to, eventTypeSlug, slots, date }) => {
-      return JSON.stringify(
-        await sendBookingEmail({
-          apiKey,
-          user,
-          users,
-          agentEmail,
-          subject,
-          to,
-          message,
-          eventTypeSlug,
-          slots,
-          date,
-        })
-      );
-    },
-    name: "sendBookingEmail",
-
-    schema: z.object({
-      message: z
-        .string()
-        .describe(
-          "A polite and professional email with an intro and signature at the end. Specify you are the AI booking assistant of the primary user. Use [[[Slots]]] and a fallback [[[Link]]] to inject good times and 'see all times' into messages"
-        ),
-      subject: z.string(),
-      to: z
-        .string()
-        .describe("email address to send the booking link to. Primary user is automatically CC'd"),
-      eventTypeSlug: z.string().describe("the slug of the event type to book"),
-      slots: z
-        .array(
-          z.object({
-            time: z.string().describe("YYYY-MM-DDTHH:mm in UTC"),
-            text: z.string().describe("minimum readable label. Ex. 4pm."),
-          })
-        )
-        .optional()
-        .describe("Time slots the external user can click"),
-      date: z
-        .object({
-          date: z.string().describe("YYYY-MM-DD"),
-          text: z.string().describe('"See all times" or similar'),
-        })
-        .describe(
-          "A booking link that allows the external user to select a date / time. Should be a fallback to time slots"
-        ),
-    }),
-  });
-};
-
-export default sendBookingEmailTool;
@@ -1,85 +0,0 @@
-import { DynamicStructuredTool } from "@langchain/core/tools";
-import { z } from "zod";
-
-import { env } from "../env.mjs";
-
-/**
- * Edits a booking for a user by booking ID with new times, title, description, or status.
- */
-const editBooking = async ({
-  apiKey,
-  userId,
-  id,
-  startTime, // In the docs it says start, but it's startTime: https://cal.com/docs/enterprise-features/api/api-reference/bookings#edit-an-existing-booking.
-  endTime, // Same here: it says end but it's endTime.
-  title,
-  description,
-  status,
-}: {
-  apiKey: string;
-  userId: number;
-  id: string;
-  startTime?: string;
-  endTime?: string;
-  title?: string;
-  description?: string;
-  status?: string;
-}): Promise<string | { error: string }> => {
-  const params = {
-    apiKey,
-    userId: userId.toString(),
-  };
-  const urlParams = new URLSearchParams(params);
-
-  const url = `${env.BACKEND_URL}/bookings/${id}?${urlParams.toString()}`;
-
-  const response = await fetch(url, {
-    body: JSON.stringify({ description, endTime, startTime, status, title }),
-    headers: {
-      "Content-Type": "application/json",
-    },
-    method: "PATCH",
-  });
-
-  // Let GPT handle this. This will happen when wrong booking id is used.
-  // if (response.status === 401) throw new Error("Unauthorized");
-
-  const data = await response.json();
-
-  if (response.status !== 200) {
-    return { error: data.message };
-  }
-
-  return "Booking edited";
-};
-
-const editBookingTool = (apiKey: string, userId: number) => {
-  return new DynamicStructuredTool({
-    description: "Edit a booking",
-    func: async ({ description, endTime, id, startTime, status, title }) => {
-      return JSON.stringify(
-        await editBooking({
-          apiKey,
-          userId,
-          description,
-          endTime,
-          id,
-          startTime,
-          status,
-          title,
-        })
-      );
-    },
-    name: "editBooking",
-    schema: z.object({
-      description: z.string().optional(),
-      endTime: z.string().optional(),
-      id: z.string(),
-      startTime: z.string().optional(),
-      status: z.string().optional(),
-      title: z.string().optional(),
-    }),
-  });
-};
-
-export default editBookingTool;
@@ -1,25 +0,0 @@
-export type Availability = {
-  busy: {
-    start: string;
-    end: string;
-    title?: string;
-  }[];
-  timeZone: string;
-  dateRanges: {
-    start: string;
-    end: string;
-  }[];
-  workingHours: {
-    days: number[];
-    startTime: number;
-    endTime: number;
-    userId: number;
-  }[];
-  dateOverrides: {
-    date: string;
-    startTime: number;
-    endTime: number;
-    userId: number;
-  };
-  currentSeats: number;
-};
@@ -1,23 +0,0 @@
-export enum BOOKING_STATUS {
-  ACCEPTED = "ACCEPTED",
-  PENDING = "PENDING",
-  CANCELLED = "CANCELLED",
-  REJECTED = "REJECTED",
-}
-
-export type Booking = {
-  id: number;
-  userId: number;
-  description: string | null;
-  eventTypeId: number;
-  uid: string;
-  title: string;
-  startTime: string;
-  endTime: string;
-  attendees: { email: string; name: string; timeZone: string; locale: string }[] | null;
-  user: { email: string; name: string; timeZone: string; locale: string }[] | null;
-  payment: { id: number; success: boolean; paymentOption: string }[];
-  metadata: object | null;
-  status: BOOKING_STATUS;
-  responses: { email: string; name: string; location: string } | null;
-};
@@ -1,13 +0,0 @@
-export type EventType = {
-  id: number;
-  title: string;
-  length: number;
-  metadata: object;
-  slug: string;
-  hosts: {
-    userId: number;
-    isFixed: boolean;
-  }[];
-  hidden: boolean;
-  // ...
-};
@@ -1,18 +0,0 @@
-import type { EventType } from "./eventType";
-import type { WorkingHours } from "./workingHours";
-
-export type User = {
-  id: number;
-  email: string;
-  username: string;
-  timeZone: string;
-  eventTypes: EventType[];
-  workingHours: WorkingHours[];
-};
-
-export type UserList = {
-  id?: number;
-  email?: string;
-  username?: string;
-  type: "fromUsername" | "fromEmail";
-}[];
@@ -1,5 +0,0 @@
-export type WorkingHours = {
-  days: number[];
-  startTime: number;
-  endTime: number;
-};
@@ -1,122 +0,0 @@
-import { ChatPromptTemplate } from "@langchain/core/prompts";
-import { ChatOpenAI } from "@langchain/openai";
-import { AgentExecutor, createOpenAIFunctionsAgent } from "langchain/agents";
-
-import { env } from "../env.mjs";
-import createBookingIfAvailable from "../tools/createBooking";
-import deleteBooking from "../tools/deleteBooking";
-import getAvailability from "../tools/getAvailability";
-import getBookings from "../tools/getBookings";
-import sendBookingEmail from "../tools/sendBookingEmail";
-import updateBooking from "../tools/updateBooking";
-import type { EventType } from "../types/eventType";
-import type { User, UserList } from "../types/user";
-import type { WorkingHours } from "../types/workingHours";
-import now from "./now";
-
-const gptModel = "gpt-4-0125-preview";
-
-/**
- * Core of the Cal.ai booking agent: a LangChain Agent Executor.
- * Uses a toolchain to book meetings, list available slots, etc.
- * Uses OpenAI functions to better enforce JSON-parsable output from the LLM.
- */
-const agent = async (
-  input: string,
-  user: User,
-  users: UserList,
-  apiKey: string,
-  userId: number,
-  agentEmail: string
-) => {
-  const tools = [
-    // getEventTypes(apiKey),
-    getAvailability(apiKey),
-    getBookings(apiKey, userId),
-    createBookingIfAvailable(apiKey, userId, users),
-    updateBooking(apiKey, userId),
-    deleteBooking(apiKey),
-    sendBookingEmail(apiKey, user, users, agentEmail),
-  ];
-
-  const model = new ChatOpenAI({
-    modelName: gptModel,
-    openAIApiKey: env.OPENAI_API_KEY,
-    temperature: 0,
-  });
-
-  /**
-   * Initialize the agent executor with arguments.
-   */
-  const prompt =
-    ChatPromptTemplate.fromTemplate(`You are Cal.ai - a bleeding edge scheduling assistant that interfaces via email.
-  Make sure your final answers are definitive, complete and well formatted.
-  Sometimes, tools return errors. In this case, try to handle the error intelligently or ask the user for more information.
-  Tools will always handle times in UTC, but times sent to users should be formatted per that user's timezone.
-  In responses to users, always summarize necessary context and open the door to follow ups. For example "I have booked your chat with @username for 3pm on Wednesday, December 20th, 2023 EST. Please let me know if you need to reschedule."
-  If you can't find a referenced user, ask the user for their email or @username. Make sure to specify that usernames require the @username format. Users don't know other users' userIds.
-  
-  The primary user's id is: ${userId}
-  The primary user's username is: ${user.username}
-  The current time in the primary user's timezone is: ${now(user.timeZone, {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-    hour: "numeric",
-    minute: "numeric",
-  })}
-  The primary user's time zone is: ${user.timeZone}
-  The primary user's event types are: ${user.eventTypes
-    .map((e: EventType) => `ID: ${e.id}, Slug: ${e.slug}, Title: ${e.title}, Length: ${e.length};`)
-    .join("\n")}
-  The primary user's working hours are: ${user.workingHours
-    .map(
-      (w: WorkingHours) =>
-        `Days: ${w.days.join(", ")}, Start Time (minutes in UTC): ${
-          w.startTime
-        }, End Time (minutes in UTC): ${w.endTime};`
-    )
-    .join("\n")}
-  ${
-    users.length
-      ? `The email references the following @usernames and emails: ${users
-          .map(
-            (u) =>
-              `${
-                (u.id ? `, id: ${u.id}` : "id: (non user)") +
-                (u.username
-                  ? u.type === "fromUsername"
-                    ? `, username: @${u.username}`
-                    : ", username: REDACTED"
-                  : ", (no username)") +
-                (u.email
-                  ? u.type === "fromEmail"
-                    ? `, email: ${u.email}`
-                    : ", email: REDACTED"
-                  : ", (no email)")
-              };`
-          )
-          .join("\n")}`
-      : ""
-  }`);
-  const agent = await createOpenAIFunctionsAgent({
-    llm: model,
-    prompt,
-    tools,
-  });
-
-  const executor = new AgentExecutor({
-    agent,
-    tools,
-    returnIntermediateSteps: env.NODE_ENV === "development",
-    verbose: env.NODE_ENV === "development",
-  });
-
-  const result = await executor.invoke({ input });
-  const { output } = result;
-
-  return output;
-};
-
-export default agent;
@@ -1 +0,0 @@
-export const context = { apiKey: "", userId: "" };
@@ -1,85 +0,0 @@
-import prisma from "@calcom/prisma";
-
-import type { UserList } from "../types/user";
-
-/*
- * Extracts usernames (@Example) and emails (hi@example.com) from a string
- */
-export const extractUsers = async (text: string) => {
-  const usernames = text
-    .match(/(?<![a-zA-Z0-9_.])@[a-zA-Z0-9_]+/g)
-    ?.map((username) => username.slice(1).toLowerCase());
-  const emails = text
-    .match(/[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+/g)
-    ?.map((email) => email.toLowerCase());
-
-  const dbUsersFromUsernames = usernames
-    ? await prisma.user.findMany({
-        select: {
-          id: true,
-          username: true,
-          email: true,
-        },
-        where: {
-          username: {
-            in: usernames,
-          },
-        },
-      })
-    : [];
-
-  const usersFromUsernames = usernames
-    ? usernames.map((username) => {
-        const user = dbUsersFromUsernames.find((u) => u.username === username);
-        return user
-          ? {
-              username,
-              id: user.id,
-              email: user.email,
-              type: "fromUsername",
-            }
-          : {
-              username,
-              id: null,
-              email: null,
-              type: "fromUsername",
-            };
-      })
-    : [];
-
-  const dbUsersFromEmails = emails
-    ? await prisma.user.findMany({
-        select: {
-          id: true,
-          email: true,
-          username: true,
-        },
-        where: {
-          email: {
-            in: emails,
-          },
-        },
-      })
-    : [];
-
-  const usersFromEmails = emails
-    ? emails.map((email) => {
-        const user = dbUsersFromEmails.find((u) => u.email === email);
-        return user
-          ? {
-              email,
-              id: user.id,
-              username: user.username,
-              type: "fromEmail",
-            }
-          : {
-              email,
-              id: null,
-              username: null,
-              type: "fromEmail",
-            };
-      })
-    : [];
-
-  return [...usersFromUsernames, ...usersFromEmails] as UserList;
-};
@@ -1,7 +0,0 @@
-import type { NextRequest } from "next/server";
-
-const getHostFromHeaders = (headers: NextRequest["headers"]): string => {
-  return `https://${headers.get("host")}`;
-};
-
-export default getHostFromHeaders;
@@ -1,6 +0,0 @@
-export default function now(timeZone: string, options: Intl.DateTimeFormatOptions = {}) {
-  return new Date().toLocaleString("en-US", {
-    timeZone,
-    ...options,
-  });
-}
@@ -1,43 +0,0 @@
-import mail from "@sendgrid/mail";
-
-const sendgridAPIKey = process.env.SENDGRID_API_KEY as string;
-
-/**
- * Simply send an email by address, subject, and body.
- */
-const send = async ({
-  subject,
-  to,
-  cc,
-  from,
-  text,
-  html,
-}: {
-  subject: string;
-  to: string | string[];
-  cc?: string | string[];
-  from: string;
-  text: string;
-  html?: string;
-}): Promise<boolean> => {
-  mail.setApiKey(sendgridAPIKey);
-
-  const msg = {
-    to,
-    cc,
-    from: {
-      email: from,
-      name: "Cal.ai",
-    },
-    text,
-    html,
-    subject,
-  };
-
-  const res = await mail.send(msg);
-  const success = !!res;
-
-  return success;
-};
-
-export default send;
@@ -1,13 +0,0 @@
-import type { NextRequest } from "next/server";
-
-import { env } from "../env.mjs";
-
-/**
- * Verifies that the request contains the correct parse key.
- * env.PARSE_KEY must be configured as a query param in the sendgrid inbound parse settings.
- */
-export const verifyParseKey = (url: NextRequest["url"]) => {
-  const verified = new URL(url).searchParams.get("parseKey") === env.PARSE_KEY;
-
-  return verified;
-};
@@ -1,24 +0,0 @@
-{
-  "extends": "@calcom/tsconfig/nextjs.json",
-  "compilerOptions": {
-    "strict": true,
-    "jsx": "preserve",
-    "baseUrl": ".",
-    "paths": {
-      "~/*": ["*"]
-    },
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ]
-  },
-  "include": [
-    "next-env.d.ts",
-    "**/*.ts",
-    "**/*.tsx",
-    ".next/types/**/*.ts",
-    "../../packages/types/window.d.ts"
-  ],
-  "exclude": ["node_modules"]
-}
@@ -25,12 +25,8 @@
  },
  "dependencies": {
    "@calcom/platform-constants": "*",
-    "@calcom/platform-libraries-0.0.13": "npm:@calcom/platform-libraries@0.0.13",
-    "@calcom/platform-libraries-0.0.14": "npm:@calcom/platform-libraries@0.0.14",
-    "@calcom/platform-libraries-0.0.15": "npm:@calcom/platform-libraries@0.0.15",
-    "@calcom/platform-libraries-0.0.17": "npm:@calcom/platform-libraries@0.0.17",
+    "@calcom/platform-libraries-0.0.18": "npm:@calcom/platform-libraries@0.0.18",
    "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
-    "@calcom/platform-libraries-0.0.4": "npm:@calcom/platform-libraries@0.0.4",
    "@calcom/platform-types": "*",
    "@calcom/platform-utils": "*",
    "@calcom/prisma": "*",
@@ -19,7 +19,7 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository
 import { withApiAuth } from "test/utils/withApiAuth";

 import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
-import { handleNewBooking } from "@calcom/platform-libraries-0.0.2";
+import { handleNewBooking } from "@calcom/platform-libraries-0.0.18";
 import { ApiSuccessResponse, ApiResponse } from "@calcom/platform-types";

 describe("Bookings Endpoints", () => {
@@ -35,20 +35,18 @@ import { NextApiRequest } from "next/types";

 import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
 import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
-import {
-  getAllUserBookings,
-  getBookingInfo,
-  handleCancelBooking,
-  getBookingForReschedule,
-} from "@calcom/platform-libraries-0.0.2";
 import {
  handleNewBooking,
  BookingResponse,
  HttpError,
  handleNewRecurringBooking,
  handleInstantMeeting,
-} from "@calcom/platform-libraries-0.0.2";
-import { handleMarkNoShow } from "@calcom/platform-libraries-0.0.17";
+  handleMarkNoShow,
+  getAllUserBookings,
+  getBookingInfo,
+  handleCancelBooking,
+  getBookingForReschedule,
+} from "@calcom/platform-libraries-0.0.18";
 import { GetBookingsInput, CancelBookingInput, Status } from "@calcom/platform-types";
 import { ApiResponse } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
@@ -1,7 +1,7 @@
 import { CreateBookingInput } from "@/ee/bookings/inputs/create-booking.input";
 import { IsBoolean, IsNumber, IsOptional } from "class-validator";

-import type { AppsStatus } from "@calcom/platform-libraries-0.0.2";
+import type { AppsStatus } from "@calcom/platform-libraries-0.0.18";

 export class CreateRecurringBookingInput extends CreateBookingInput {
  @IsBoolean()
@@ -5,7 +5,7 @@ import { BadRequestException, UnauthorizedException } from "@nestjs/common";
 import { Injectable } from "@nestjs/common";

 import { SUCCESS_STATUS, APPLE_CALENDAR_TYPE, APPLE_CALENDAR_ID } from "@calcom/platform-constants";
-import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries-0.0.14";
+import { symmetricEncrypt, CalendarService } from "@calcom/platform-libraries-0.0.18";

@Injectable()
 export class AppleCalendarService implements CredentialSyncCalendarApp {
@@ -17,8 +17,7 @@ import { User } from "@prisma/client";
 import { DateTime } from "luxon";
 import { z } from "zod";

-import { getConnectedDestinationCalendars } from "@calcom/platform-libraries-0.0.2";
-import { getBusyCalendarTimes } from "@calcom/platform-libraries-0.0.2";
+import { getConnectedDestinationCalendars, getBusyCalendarTimes } from "@calcom/platform-libraries-0.0.18";
 import { Calendar } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";

@@ -35,7 +35,7 @@ import {
  EventTypesPublic,
  eventTypeBookingFields,
  eventTypeLocations,
-} from "@calcom/platform-libraries-0.0.2";
+} from "@calcom/platform-libraries-0.0.18";
 import { ApiSuccessResponse } from "@calcom/platform-types";

 describe("Event types Endpoints", () => {
@@ -39,8 +39,7 @@ import {
 import { ApiTags as DocsTags } from "@nestjs/swagger";

 import { EVENT_TYPE_READ, EVENT_TYPE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
-import { getPublicEvent } from "@calcom/platform-libraries-0.0.2";
-import { getEventTypesByViewer } from "@calcom/platform-libraries-0.0.2";
+import { getPublicEvent, getEventTypesByViewer } from "@calcom/platform-libraries-0.0.18";
 import { PrismaClient } from "@calcom/prisma";

@Controller({
@@ -4,7 +4,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";

-import { getEventTypeById } from "@calcom/platform-libraries-0.0.2";
+import { getEventTypeById } from "@calcom/platform-libraries-0.0.18";
 import type { PrismaClient } from "@calcom/prisma";

@Injectable()
@@ -9,8 +9,12 @@ import { SelectedCalendarsRepository } from "@/modules/selected-calendars/select
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";

-import { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.2";
-import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.2";
+import {
+  createEventType,
+  updateEventType,
+  EventTypesPublic,
+  getEventTypesPublic,
+} from "@calcom/platform-libraries-0.0.18";
 import { EventType } from "@calcom/prisma/client";

@Injectable()
@@ -56,6 +60,7 @@ export class EventTypesService_2024_04_15 {
    const profileId = user.movedToProfile?.id || null;
    return {
      id: user.id,
+      role: user.role,
      organizationId: user.organizationId,
      organization: { isOrgAdmin },
      profile: { id: profileId },
@@ -77,7 +77,6 @@ export class EventTypesController_2024_06_14 {
  }

  @Get("/")
-  @Permissions([EVENT_TYPE_READ])
  async getEventTypes(
    @Query() queryParams: GetEventTypesQuery_2024_06_14
  ): Promise<GetEventTypesOutput_2024_06_14> {
@@ -7,7 +7,7 @@ import {
  getEventTypeById,
  transformApiEventTypeBookingFields,
  transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.13";
+} from "@calcom/platform-libraries-0.0.18";
 import { CreateEventTypeInput_2024_06_14 } from "@calcom/platform-types";
 import type { PrismaClient } from "@calcom/prisma";

@@ -9,9 +9,9 @@ import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";

-import { createEventType, updateEventType } from "@calcom/platform-libraries";
-import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries";
-import { dynamicEvent } from "@calcom/platform-libraries-0.0.13";
+import { createEventType, updateEventType } from "@calcom/platform-libraries-0.0.18";
+import { getEventTypesPublic, EventTypesPublic } from "@calcom/platform-libraries-0.0.18";
+import { dynamicEvent } from "@calcom/platform-libraries-0.0.18";
 import {
  CreateEventTypeInput_2024_06_14,
  UpdateEventTypeInput_2024_06_14,
@@ -94,6 +94,7 @@ export class EventTypesService_2024_06_14 {
    const profileId = user.movedToProfile?.id || null;
    return {
      id: user.id,
+      role: user.role,
      organizationId: user.organizationId,
      organization: { isOrgAdmin },
      profile: { id: profileId },
@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import {
  transformApiEventTypeBookingFields,
  transformApiEventTypeLocations,
-} from "@calcom/platform-libraries-0.0.13";
+} from "@calcom/platform-libraries-0.0.18";
 import { CreateEventTypeInput_2024_06_14, UpdateEventTypeInput_2024_06_14 } from "@calcom/platform-types";

@Injectable()
@@ -9,7 +9,7 @@ import {
  parseRecurringEvent,
  TransformedLocationsSchema,
  BookingFieldsSchema,
-} from "@calcom/platform-libraries-0.0.13";
+} from "@calcom/platform-libraries-0.0.18";

 type EventTypeRelations = { users: User[]; schedule: Schedule | null };
 type DatabaseEventType = EventType & EventTypeRelations;
@@ -3,7 +3,7 @@ import { Injectable } from "@nestjs/common";
 import {
  transformApiScheduleOverrides,
  transformApiScheduleAvailability,
-} from "@calcom/platform-libraries-0.0.4";
+} from "@calcom/platform-libraries-0.0.18";
 import { CreateScheduleInput_2024_06_11, ScheduleAvailabilityInput_2024_06_11 } from "@calcom/platform-types";
 import { ScheduleOverrideInput_2024_06_11 } from "@calcom/platform-types";

@@ -2,7 +2,7 @@ import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
 import { Request } from "express";

 import { ERROR_STATUS } from "@calcom/platform-constants";
-import { TRPCError } from "@calcom/platform-libraries-0.0.2";
+import { TRPCError } from "@calcom/platform-libraries-0.0.18";
 import { Response } from "@calcom/platform-types";

@Catch(TRPCError)
@@ -0,0 +1,44 @@
+export enum Locales {
+  AR = "ar",
+  CA = "ca",
+  DE = "de",
+  ES = "es",
+  EU = "eu",
+  HE = "he",
+  ID = "id",
+  JA = "ja",
+  LV = "lv",
+  PL = "pl",
+  RO = "ro",
+  SR = "sr",
+  TH = "th",
+  VI = "vi",
+  AZ = "az",
+  CS = "cs",
+  EL = "el",
+  ES_419 = "es-419",
+  FI = "fi",
+  HR = "hr",
+  IT = "it",
+  KM = "km",
+  NL = "nl",
+  PT = "pt",
+  RU = "ru",
+  SV = "sv",
+  TR = "tr",
+  ZH_CN = "zh-CN",
+  BG = "bg",
+  DA = "da",
+  EN = "en",
+  ET = "et",
+  FR = "fr",
+  HU = "hu",
+  IW = "iw",
+  KO = "ko",
+  NO = "no",
+  PT_BR = "pt-BR",
+  SK = "sk",
+  TA = "ta",
+  UK = "uk",
+  ZH_TW = "zh-TW",
+}
@@ -0,0 +1,33 @@
+import { ExecutionContext } from "@nestjs/common";
+import { createParamDecorator } from "@nestjs/common";
+
+import { Membership } from "@calcom/prisma/client";
+
+export type GetMembershipReturnType = Membership;
+
+export const GetMembership = createParamDecorator<
+  keyof GetMembershipReturnType | (keyof GetMembershipReturnType)[],
+  ExecutionContext
+>((data, ctx) => {
+  const request = ctx.switchToHttp().getRequest();
+  const membership = request.membership as GetMembershipReturnType;
+
+  if (!membership) {
+    throw new Error("GetMembership decorator : Membership not found");
+  }
+
+  if (Array.isArray(data)) {
+    return data.reduce((prev, curr) => {
+      return {
+        ...prev,
+        [curr]: membership[curr],
+      };
+    }, {});
+  }
+
+  if (data) {
+    return membership[data];
+  }
+
+  return membership;
+});
@@ -0,0 +1,42 @@
+import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
+import {
+  Injectable,
+  CanActivate,
+  ExecutionContext,
+  ForbiddenException,
+  NotFoundException,
+} from "@nestjs/common";
+import { Request } from "express";
+
+import { Membership } from "@calcom/prisma/client";
+
+@Injectable()
+export class IsMembershipInOrg implements CanActivate {
+  constructor(private organizationsMembershipRepository: OrganizationsMembershipRepository) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest<Request & { membership: Membership }>();
+    const membershipId: string = request.params.membershipId;
+    const orgId: string = request.params.orgId;
+
+    if (!orgId) {
+      throw new ForbiddenException("No org id found in request params.");
+    }
+
+    if (!membershipId) {
+      throw new ForbiddenException("No membership id found in request params.");
+    }
+
+    const membership = await this.organizationsMembershipRepository.findOrgMembership(
+      Number(orgId),
+      Number(membershipId)
+    );
+
+    if (!membership) {
+      throw new NotFoundException(`Membership (${membershipId}) not found.`);
+    }
+
+    request.membership = membership;
+    return true;
+  }
+}
@@ -0,0 +1,11 @@
+import { Global, Module } from "@nestjs/common";
+
+import { EmailService } from "./email.service";
+
+@Global()
+@Module({
+  imports: [],
+  providers: [EmailService],
+  exports: [EmailService],
+})
+export class EmailModule {}
@@ -0,0 +1,32 @@
+import { UserWithProfile } from "@/modules/users/users.repository";
+import { Injectable } from "@nestjs/common";
+
+import { sendSignupToOrganizationEmail, getTranslation } from "@calcom/platform-libraries-0.0.18";
+
+@Injectable()
+export class EmailService {
+  public async sendSignupToOrganizationEmail({
+    usernameOrEmail,
+    orgName,
+    orgId,
+    locale,
+    inviterName,
+  }: {
+    usernameOrEmail: string;
+    orgName: string;
+    orgId: number;
+    locale: string | null;
+    inviterName: string;
+  }) {
+    const translation = await getTranslation(locale || "en", "common");
+
+    await sendSignupToOrganizationEmail({
+      usernameOrEmail,
+      team: { name: orgName, parent: null },
+      inviterName: inviterName,
+      isOrg: true,
+      teamId: orgId,
+      translation,
+    });
+  }
+}
@@ -1,6 +1,8 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { Injectable } from "@nestjs/common";

+import { MembershipRole } from "@calcom/prisma/client";
+
@Injectable()
 export class MembershipsRepository {
  constructor(private readonly dbRead: PrismaReadService) {}
@@ -47,4 +49,16 @@ export class MembershipsRepository {

    return !!adminMembership;
  }
+
+  async createMembership(teamId: number, userId: number, role: MembershipRole) {
+    const membership = await this.dbRead.prisma.membership.create({
+      data: {
+        role,
+        teamId,
+        userId,
+      },
+    });
+
+    return membership;
+  }
 }
@@ -3,6 +3,7 @@ import { AppModule } from "@/app.module";
 import { DEFAULT_EVENT_TYPES } from "@/ee/event-types/event-types_2024_04_15/constants/constants";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
 import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
+import { Locales } from "@/lib/enums/locales";
 import {
  CreateUserResponse,
  UserReturned,
@@ -141,6 +142,7 @@ describe("OAuth Client Users Endpoints", () => {
        timeZone: userTimeZone,
        weekStart: "Monday",
        timeFormat: 24,
+        locale: Locales.FR,
      };

      const response = await request(app.getHttpServer())
@@ -163,6 +165,7 @@ describe("OAuth Client Users Endpoints", () => {
      expect(responseBody.data.user.timeZone).toEqual(requestBody.timeZone);
      expect(responseBody.data.user.weekStart).toEqual(requestBody.weekStart);
      expect(responseBody.data.user.timeFormat).toEqual(requestBody.timeFormat);
+      expect(responseBody.data.user.locale).toEqual(requestBody.locale);
      expect(responseBody.data.accessToken).toBeDefined();
      expect(responseBody.data.refreshToken).toBeDefined();

@@ -234,7 +237,7 @@ describe("OAuth Client Users Endpoints", () => {

    it(`/PUT/:id`, async () => {
      const userUpdatedEmail = "pineapple-pizza@gmail.com";
-      const body: UpdateManagedUserInput = { email: userUpdatedEmail };
+      const body: UpdateManagedUserInput = { email: userUpdatedEmail, locale: Locales.PT_BR };

      const response = await request(app.getHttpServer())
        .patch(`/api/v2/oauth-clients/${oAuthClient.id}/users/${postResponseData.user.id}`)
@@ -248,6 +251,7 @@ describe("OAuth Client Users Endpoints", () => {
      expect(responseBody.status).toEqual(SUCCESS_STATUS);
      expect(responseBody.data).toBeDefined();
      expect(responseBody.data.email).toEqual(getOAuthUserEmail(oAuthClient.id, userUpdatedEmail));
+      expect(responseBody.data.locale).toEqual(Locales.PT_BR);
    });

    it(`/DELETE/:id`, () => {
@@ -1,4 +1,5 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { Locales } from "@/lib/enums/locales";
 import { CreateManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/create-managed-user.output";
 import { GetManagedUserOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-user.output";
 import { GetManagedUsersOutput } from "@/modules/oauth-clients/controllers/oauth-client-users/outputs/get-managed-users.output";
@@ -191,6 +192,7 @@ export class OAuthClientUsersController {
      createdDate: user.createdDate,
      timeFormat: user.timeFormat,
      defaultScheduleId: user.defaultScheduleId,
+      locale: user.locale as Locales,
    };
  }
 }
@@ -1,5 +1,7 @@
+import { Locales } from "@/lib/enums/locales";
 import { ApiProperty } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
+import { IsEnum, IsOptional } from "class-validator";

 export class ManagedUserOutput {
  @ApiProperty({ example: 1 })
@@ -26,4 +28,9 @@ export class ManagedUserOutput {

  @ApiProperty({ example: null })
  defaultScheduleId!: number | null;
+
+  @IsEnum(Locales)
+  @IsOptional()
+  @ApiProperty({ example: Locales.EN, enum: Locales })
+  locale?: Locales;
 }
@@ -7,7 +7,7 @@ import { UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, Injectable } from "@nestjs/common";
 import { User } from "@prisma/client";

-import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries-0.0.15";
+import { createNewUsersConnectToOrgIfExists, slugify } from "@calcom/platform-libraries-0.0.18";

@Injectable()
 export class OAuthClientUsersService {
@@ -59,7 +59,11 @@ export class OAuthClientUsersService {
        })
      )[0];
      await this.userRepository.addToOAuthClient(user.id, oAuthClientId);
-      await this.userRepository.update(user.id, { name: body.name ?? user.username ?? undefined });
+      const updatedUser = await this.userRepository.update(user.id, {
+        name: body.name ?? user.username ?? undefined,
+        locale: body.locale,
+      });
+      user.locale = updatedUser.locale;
    }

    const { accessToken, refreshToken, accessTokenExpiresAt } = await this.tokensRepository.createOAuthTokens(
@@ -0,0 +1,311 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { User } from "@prisma/client";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { ApiSuccessResponse } from "@calcom/platform-types";
+import { Membership, Team } from "@calcom/prisma/client";
+
+import { UpdateOrgMembershipDto } from "../../inputs/update-organization-membership.input";
+
+describe("Organizations Memberships Endpoints", () => {
+  describe("User Authentication - User is Org Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let membership: Membership;
+    let membership2: Membership;
+    let membershipCreatedViaApi: Membership;
+
+    const userEmail = "org-admin-membership-controller-e2e@api.com";
+    const userEmail2 = "org-member-membership-controller-e2e@api.com";
+
+    const invitedUserEmail = "org-member-invited-membership-controller-e2e@api.com";
+
+    let user: User;
+    let user2: User;
+
+    let userToInviteViaApi: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+      user2 = await userRepositoryFixture.create({
+        email: userEmail2,
+        username: userEmail2,
+      });
+
+      userToInviteViaApi = await userRepositoryFixture.create({
+        email: invitedUserEmail,
+        username: invitedUserEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      membership = await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      membership2 = await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user2.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should get all the memberships of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(membership.id);
+          expect(responseBody.data[1].id).toEqual(membership2.id);
+        });
+    });
+
+    it("should get all the memberships of the org paginated", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships?skip=1&take=1`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership[]> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data[0].id).toEqual(membership2.id);
+          expect(responseBody.data[0].userId).toEqual(user2.id);
+        });
+    });
+
+    it("should fail if org does not exist", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/120494059/memberships`).expect(403);
+    });
+
+    it("should get the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(membership.id);
+          expect(responseBody.data.userId).toEqual(user.id);
+        });
+    });
+
+    it("should create the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/memberships`)
+        .send({
+          userId: userToInviteViaApi.id,
+          accepted: true,
+          role: "MEMBER",
+        } satisfies CreateOrgMembershipDto)
+        .expect(201)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          membershipCreatedViaApi = responseBody.data;
+          expect(membershipCreatedViaApi.teamId).toEqual(org.id);
+          expect(membershipCreatedViaApi.role).toEqual("MEMBER");
+          expect(membershipCreatedViaApi.userId).toEqual(userToInviteViaApi.id);
+        });
+    });
+
+    it("should update the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/memberships/${membershipCreatedViaApi.id}`)
+        .send({
+          role: "OWNER",
+        } satisfies UpdateOrgMembershipDto)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          membershipCreatedViaApi = responseBody.data;
+          expect(membershipCreatedViaApi.role).toEqual("OWNER");
+        });
+    });
+
+    it("should delete the membership of the org we created via api", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/memberships/${membershipCreatedViaApi.id}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: ApiSuccessResponse<Membership> = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.id).toEqual(membershipCreatedViaApi.id);
+        });
+    });
+
+    it("should fail to get the membership of the org we just deleted", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/${membershipCreatedViaApi.id}`)
+        .expect(404);
+    });
+
+    it("should fail if the membership does not exist", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/123132145`)
+        .expect(404);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await userRepositoryFixture.deleteByEmail(userToInviteViaApi.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});
+
+describe("Organizations Memberships Endpoints", () => {
+  describe("User Authentication - User is Org Member", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let membership: Membership;
+
+    const userEmail = "org-member-memberships-controller-e2e@api.com";
+    let user: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test Organization",
+        isOrganization: true,
+      });
+
+      membership = await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should deny get all the memberships of the org", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/memberships`).expect(403);
+    });
+
+    it("should deny get all the memberships of the org paginated", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships?skip=1&take=1`)
+        .expect(403);
+    });
+
+    it("should deny get the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .expect(403);
+    });
+
+    it("should deny create the membership for the org", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/memberships`)
+        .send({
+          role: "OWNER",
+          userId: user.id,
+          accepted: true,
+        } satisfies CreateOrgMembershipDto)
+        .expect(403);
+    });
+
+    it("should deny update the membership of the org", async () => {
+      return request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .send({
+          role: "MEMBER",
+        } satisfies Partial<CreateOrgMembershipDto>)
+        .expect(403);
+    });
+
+    it("should deny delete the membership of the org we created via api", async () => {
+      return request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/memberships/${membership.id}`)
+        .expect(403);
+    });
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});
@@ -0,0 +1,127 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { GetMembership } from "@/modules/auth/decorators/get-membership/get-membership.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { IsMembershipInOrg } from "@/modules/auth/guards/memberships/is-membership-in-org.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { UpdateOrgMembershipDto } from "@/modules/organizations/inputs/update-organization-membership.input";
+import { CreateOrgMembershipOutput } from "@/modules/organizations/outputs/organization-membership/create-membership.output";
+import { DeleteOrgMembership } from "@/modules/organizations/outputs/organization-membership/delete-membership.output";
+import { GetAllOrgMemberships } from "@/modules/organizations/outputs/organization-membership/get-all-memberships.output";
+import { GetOrgMembership } from "@/modules/organizations/outputs/organization-membership/get-membership.output";
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { UpdateOrgMembership } from "@/modules/organizations/outputs/organization-membership/update-membership.output";
+import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Param,
+  ParseIntPipe,
+  Query,
+  Delete,
+  Patch,
+  Post,
+  Body,
+  HttpCode,
+  HttpStatus,
+} from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { SkipTakePagination } from "@calcom/platform-types";
+import { Membership } from "@calcom/prisma/client";
+
+@Controller({
+  path: "/v2/organizations/:orgId/memberships",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@DocsTags("Organizations Memberships")
+export class OrganizationsMembershipsController {
+  constructor(private organizationsMembershipService: OrganizationsMembershipService) {}
+
+  @Roles("ORG_ADMIN")
+  @Get("/")
+  @HttpCode(HttpStatus.OK)
+  async getAllMemberships(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() queryParams: SkipTakePagination
+  ): Promise<GetAllOrgMemberships> {
+    const { skip, take } = queryParams;
+    const memberships = await this.organizationsMembershipService.getPaginatedOrgMemberships(
+      orgId,
+      skip ?? 0,
+      take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: memberships.map((membership) =>
+        plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" })
+      ),
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @Post("/")
+  @HttpCode(HttpStatus.CREATED)
+  async createMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Body() body: CreateOrgMembershipDto
+  ): Promise<CreateOrgMembershipOutput> {
+    const membership = await this.organizationsMembershipService.createOrgMembership(orgId, body);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsMembershipInOrg)
+  @Get("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  async getUserSchedule(@GetMembership() membership: Membership): Promise<GetOrgMembership> {
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsMembershipInOrg)
+  @Delete("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  async deleteMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number
+  ): Promise<DeleteOrgMembership> {
+    const membership = await this.organizationsMembershipService.deleteOrgMembership(orgId, membershipId);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+
+  @UseGuards(IsMembershipInOrg)
+  @Roles("ORG_ADMIN")
+  @Patch("/:membershipId")
+  @HttpCode(HttpStatus.OK)
+  async updateMembership(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("membershipId", ParseIntPipe) membershipId: number,
+    @Body() body: UpdateOrgMembershipDto
+  ): Promise<UpdateOrgMembership> {
+    const membership = await this.organizationsMembershipService.updateOrgMembership(
+      orgId,
+      membershipId,
+      body
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(OrgMembershipOutputDto, membership, { strategy: "excludeAll" }),
+    };
+  }
+}
@@ -135,12 +135,17 @@ describe("Organizations Team Endpoints", () => {
          name: "Team created via API",
        } satisfies CreateOrgTeamDto)
        .expect(201)
-        .then((response) => {
+        .then(async (response) => {
          const responseBody: ApiSuccessResponse<Team> = response.body;
          expect(responseBody.status).toEqual(SUCCESS_STATUS);
          teamCreatedViaApi = responseBody.data;
          expect(teamCreatedViaApi.name).toEqual("Team created via API");
          expect(teamCreatedViaApi.parentId).toEqual(org.id);
+          const membership = await membershipsRepositoryFixture.getUserMembershipByTeamId(
+            user.id,
+            teamCreatedViaApi.id
+          );
+          expect(membership?.role ?? "").toEqual("OWNER");
        });
    });

@@ -1,5 +1,6 @@
 import { API_VERSIONS_VALUES } from "@/lib/api-versions";
 import { GetTeam } from "@/modules/auth/decorators/get-team/get-team.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
@@ -12,6 +13,7 @@ import {
  OrgTeamsOutputResponseDto,
 } from "@/modules/organizations/outputs/organization-team.output";
 import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+import { UserWithProfile } from "@/modules/users/users.repository";
 import {
  Controller,
  UseGuards,
@@ -99,14 +101,14 @@ export class OrganizationsTeamsController {
  }

  @Post()
-  @UseGuards()
  @Roles("ORG_ADMIN")
  @ApiOperation({ summary: "Create a team for an organization." })
  async createTeam(
    @Param("orgId", ParseIntPipe) orgId: number,
-    @Body() body: CreateOrgTeamDto
+    @Body() body: CreateOrgTeamDto,
+    @GetUser() user: UserWithProfile
  ): Promise<OrgTeamOutputResponseDto> {
-    const team = await this.organizationsTeamsService.createOrgTeam(orgId, body);
+    const team = await this.organizationsTeamsService.createOrgTeam(orgId, body, user);
    return {
      status: SUCCESS_STATUS,
      data: plainToClass(OrgTeamOutputDto, team, { strategy: "excludeAll" }),
@@ -0,0 +1,115 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { GetOrg } from "@/modules/auth/decorators/get-org/get-org.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { IsUserInOrg } from "@/modules/auth/guards/users/is-user-in-org.guard";
+import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
+import { GetOrganizationsUsersInput } from "@/modules/organizations/inputs/get-organization-users.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { GetOrganizationUsersOutput } from "@/modules/organizations/outputs/get-organization-users.output";
+import { GetOrganizationUserOutput } from "@/modules/organizations/outputs/get-organization-users.output";
+import { OrganizationsUsersService } from "@/modules/organizations/services/organizations-users-service";
+import { GetUserOutput } from "@/modules/users/outputs/get-users.output";
+import { UserWithProfile } from "@/modules/users/users.repository";
+import {
+  Controller,
+  UseGuards,
+  Get,
+  Post,
+  Patch,
+  Delete,
+  Param,
+  ParseIntPipe,
+  Body,
+  UseInterceptors,
+  Query,
+} from "@nestjs/common";
+import { ClassSerializerInterceptor } from "@nestjs/common";
+import { ApiTags as DocsTags } from "@nestjs/swagger";
+import { plainToInstance } from "class-transformer";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { Team } from "@calcom/prisma/client";
+
+@Controller({
+  path: "/v2/organizations/:orgId/users",
+  version: API_VERSIONS_VALUES,
+})
+@UseInterceptors(ClassSerializerInterceptor)
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard)
+@UseGuards(IsOrgGuard)
+@DocsTags("Organizations Users")
+export class OrganizationsUsersController {
+  constructor(private readonly organizationsUsersService: OrganizationsUsersService) {}
+
+  @Get()
+  @Roles("ORG_ADMIN")
+  async getOrganizationsUsers(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Query() query: GetOrganizationsUsersInput
+  ): Promise<GetOrganizationUsersOutput> {
+    const users = await this.organizationsUsersService.getUsers(
+      orgId,
+      query.emails,
+      query.skip ?? 0,
+      query.take ?? 250
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: users.map((user) => plainToInstance(GetUserOutput, user, { strategy: "excludeAll" })),
+    };
+  }
+
+  @Post()
+  @Roles("ORG_ADMIN")
+  async createOrganizationUser(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @GetOrg() org: Team,
+    @Body() input: CreateOrganizationUserInput,
+    @GetUser() inviter: UserWithProfile
+  ): Promise<GetOrganizationUserOutput> {
+    const user = await this.organizationsUsersService.createUser(
+      org,
+      input,
+      inviter.name ?? inviter.username ?? inviter.email
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(GetUserOutput, user, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Patch("/:userId")
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  async updateOrganizationUser(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("userId", ParseIntPipe) userId: number,
+    @GetOrg() org: Team,
+    @Body() input: UpdateOrganizationUserInput
+  ): Promise<GetOrganizationUserOutput> {
+    const user = await this.organizationsUsersService.updateUser(orgId, userId, input);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(GetUserOutput, user, { strategy: "excludeAll" }),
+    };
+  }
+
+  @Delete("/:userId")
+  @Roles("ORG_ADMIN")
+  @UseGuards(IsUserInOrg)
+  async deleteOrganizationUser(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("userId", ParseIntPipe) userId: number
+  ): Promise<GetOrganizationUserOutput> {
+    const user = await this.organizationsUsersService.deleteUser(orgId, userId);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToInstance(GetUserOutput, user, { strategy: "excludeAll" }),
+    };
+  }
+}
@@ -0,0 +1,347 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { EmailService } from "@/modules/email/email.service";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import * as request from "supertest";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { User, Team, Membership } from "@calcom/prisma/client";
+
+describe("Organizations Users Endpoints", () => {
+  describe("Member role", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipFixtures: MembershipRepositoryFixture;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+
+    const userEmail = "member1@org.com";
+    let user: User;
+    let org: Team;
+    let membership: Membership;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipFixtures = new MembershipRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test org 3",
+        isOrganization: true,
+      });
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        organization: { connect: { id: org.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${user.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+      });
+
+      membership = await membershipFixtures.addUserToOrg(user, org, "MEMBER", true);
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should not be able to find org users", async () => {
+      return request(app.getHttpServer()).get(`/v2/organizations/${org.id}/users`).expect(403);
+    });
+
+    it("should not be able to create a new org user", async () => {
+      return request(app.getHttpServer()).post(`/v2/organizations/${org.id}/users`).expect(403);
+    });
+
+    it("should not be able to update an org user", async () => {
+      return request(app.getHttpServer()).patch(`/v2/organizations/${org.id}/users/${user.id}`).expect(403);
+    });
+
+    it("should not be able to delete an org user", async () => {
+      return request(app.getHttpServer()).delete(`/v2/organizations/${org.id}/users/${user.id}`).expect(403);
+    });
+
+    afterAll(async () => {
+      // await membershipFixtures.delete(membership.id);
+      await Promise.all([userRepositoryFixture.deleteByEmail(user.email)]);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+
+      await app.close();
+    });
+  });
+  describe("Admin role", () => {
+    let app: INestApplication;
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: TeamRepositoryFixture;
+    let membershipFixtures: MembershipRepositoryFixture;
+
+    const userEmail = "admin1@org.com";
+    const nonMemberEmail = "non-member@test.com";
+    let user: User;
+    let org: Team;
+    let createdUser: User;
+
+    const orgMembersData = [
+      {
+        email: "member1@org.com",
+        username: "member1@org.com",
+      },
+      {
+        email: "member2@org.com",
+        username: "member2@org.com",
+      },
+      {
+        email: "member3@org.com",
+        username: "member3@org.com",
+      },
+    ];
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+
+      organizationsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipFixtures = new MembershipRepositoryFixture(moduleRef);
+
+      org = await organizationsRepositoryFixture.create({
+        name: "Test org 2",
+        isOrganization: true,
+      });
+
+      await userRepositoryFixture.create({
+        email: nonMemberEmail,
+        username: "non-member",
+      });
+
+      const orgMembers = await Promise.all(
+        orgMembersData.map((member) =>
+          userRepositoryFixture.create({
+            email: member.email,
+            username: member.username,
+            organization: { connect: { id: org.id } },
+          })
+        )
+      );
+      // create profiles of orgMember like they would be when being invied to the org
+      await Promise.all(
+        orgMembers.map((member) =>
+          profileRepositoryFixture.create({
+            uid: `usr-${member.id}`,
+            username: member.username ?? `usr-${member.id}`,
+            organization: {
+              connect: {
+                id: org.id,
+              },
+            },
+            user: {
+              connect: {
+                id: member.id,
+              },
+            },
+          })
+        )
+      );
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+        organization: { connect: { id: org.id } },
+      });
+
+      await profileRepositoryFixture.create({
+        uid: `usr-${user.id}`,
+        username: userEmail,
+        organization: {
+          connect: {
+            id: org.id,
+          },
+        },
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+      });
+
+      await membershipFixtures.addUserToOrg(user, org, "ADMIN", true);
+      await Promise.all(
+        orgMembers.map((member) => membershipFixtures.addUserToOrg(member, org, "MEMBER", true))
+      );
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    it("should be defined", () => {
+      expect(userRepositoryFixture).toBeDefined();
+      expect(organizationsRepositoryFixture).toBeDefined();
+      expect(user).toBeDefined();
+      expect(org).toBeDefined();
+    });
+
+    it("should get all org users", async () => {
+      const { body } = await request(app.getHttpServer()).get(`/v2/organizations/${org.id}/users`);
+
+      const userData = body.data;
+
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.length).toBe(4);
+
+      expect(userData.filter((user: { email: string }) => user.email === nonMemberEmail).length).toBe(0);
+    });
+
+    it("should only get users with the specified email", async () => {
+      const { body } = await request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users`)
+        .query({
+          emails: userEmail,
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data;
+
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.length).toBe(1);
+
+      expect(userData.filter((user: { email: string }) => user.email === userEmail).length).toBe(1);
+    });
+
+    it("should get users within the specified emails array", async () => {
+      const orgMemberEmail = orgMembersData[0].email;
+
+      const { body } = await request(app.getHttpServer())
+        .get(`/v2/organizations/${org.id}/users`)
+        .query({
+          emails: [userEmail, orgMemberEmail],
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data;
+
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.length).toBe(2);
+
+      expect(userData.filter((user: { email: string }) => user.email === userEmail).length).toBe(1);
+      expect(userData.filter((user: { email: string }) => user.email === orgMemberEmail).length).toBe(1);
+    });
+
+    it("should update an org user", async () => {
+      const { body } = await request(app.getHttpServer())
+        .patch(`/v2/organizations/${org.id}/users/${user.id}`)
+        .send({
+          theme: "light",
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data as User;
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.theme).toBe("light");
+    });
+
+    it("should create a new org user", async () => {
+      const newOrgUser = {
+        email: "new-org-member-b@org.com",
+        organizationRole: "MEMBER",
+        autoAccept: true,
+      };
+
+      const emailSpy = jest
+        .spyOn(EmailService.prototype, "sendSignupToOrganizationEmail")
+        .mockImplementation(() => Promise.resolve());
+      const { body } = await request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/users`)
+        .send({
+          email: newOrgUser.email,
+        })
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data;
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.email).toBe(newOrgUser.email);
+      expect(emailSpy).toHaveBeenCalledWith({
+        usernameOrEmail: newOrgUser.email,
+        orgName: org.name,
+        orgId: org.id,
+        inviterName: "admin1@org.com",
+        locale: null,
+      });
+      createdUser = userData;
+    });
+
+    it("should delete an org user", async () => {
+      const { body } = await request(app.getHttpServer())
+        .delete(`/v2/organizations/${org.id}/users/${createdUser.id}`)
+        .set("Content-Type", "application/json")
+        .set("Accept", "application/json");
+
+      const userData = body.data as User;
+      expect(body.status).toBe(SUCCESS_STATUS);
+      expect(userData.id).toBe(createdUser.id);
+    });
+
+    afterAll(async () => {
+      // await membershipFixtures.delete(membership.id);
+      await Promise.all([
+        userRepositoryFixture.deleteByEmail(user.email),
+        userRepositoryFixture.deleteByEmail(nonMemberEmail),
+        ...orgMembersData.map((member) => userRepositoryFixture.deleteByEmail(member.email)),
+      ]);
+      await organizationsRepositoryFixture.delete(org.id);
+      await app.close();
+    });
+  });
+});
@@ -0,0 +1,20 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { IsBoolean, IsOptional, IsEnum, IsInt } from "class-validator";
+
+export class CreateOrgMembershipDto {
+  @IsInt()
+  readonly userId!: number;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly accepted?: boolean = false;
+
+  @IsEnum(MembershipRole)
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  readonly role: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly disableImpersonation?: boolean = false;
+}
@@ -0,0 +1,17 @@
+import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
+import { MembershipRole } from "@prisma/client";
+import { IsString, IsOptional, IsBoolean, IsEnum } from "class-validator";
+
+export class CreateOrganizationUserInput extends CreateUserInput {
+  @IsOptional()
+  @IsString()
+  locale = "en";
+
+  @IsOptional()
+  @IsEnum(MembershipRole)
+  organizationRole: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  autoAccept = true;
+}
@@ -0,0 +1,3 @@
+import { GetUsersInput } from "@/modules/users/inputs/get-users.input";
+
+export class GetOrganizationsUsersInput extends GetUsersInput {}
@@ -0,0 +1,17 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { IsBoolean, IsOptional, IsEnum } from "class-validator";
+
+export class UpdateOrgMembershipDto {
+  @IsOptional()
+  @IsBoolean()
+  readonly accepted?: boolean = false;
+
+  @IsEnum(MembershipRole)
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  readonly role?: MembershipRole = MembershipRole.MEMBER;
+
+  @IsOptional()
+  @IsBoolean()
+  readonly disableImpersonation?: boolean = false;
+}
@@ -0,0 +1,3 @@
+import { UpdateUserInput } from "@/modules/users/inputs/update-user.input";
+
+export class UpdateOrganizationUserInput extends UpdateUserInput {}
@@ -1,12 +1,20 @@
 import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
+import { EmailModule } from "@/modules/email/email.module";
+import { EmailService } from "@/modules/email/email.service";
 import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { OrganizationsMembershipsController } from "@/modules/organizations/controllers/memberships/organizations-membership.controller";
 import { OrganizationsSchedulesController } from "@/modules/organizations/controllers/schedules/organizations-schedules.controller";
 import { OrganizationsTeamsController } from "@/modules/organizations/controllers/teams/organizations-teams.controller";
+import { OrganizationsUsersController } from "@/modules/organizations/controllers/users/organizations-users.controller";
 import { OrganizationsRepository } from "@/modules/organizations/organizations.repository";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
 import { OrganizationSchedulesRepository } from "@/modules/organizations/repositories/organizations-schedules.repository";
 import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { OrganizationsUsersRepository } from "@/modules/organizations/repositories/organizations-users.repository";
+import { OrganizationsMembershipService } from "@/modules/organizations/services/organizations-membership.service";
 import { OrganizationsSchedulesService } from "@/modules/organizations/services/organizations-schedules.service";
 import { OrganizationsTeamsService } from "@/modules/organizations/services/organizations-teams.service";
+import { OrganizationsUsersService } from "@/modules/organizations/services/organizations-users-service";
 import { OrganizationsService } from "@/modules/organizations/services/organizations.service";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
@@ -15,7 +23,7 @@ import { UsersModule } from "@/modules/users/users.module";
 import { Module } from "@nestjs/common";

@Module({
-  imports: [PrismaModule, StripeModule, SchedulesModule_2024_06_11, UsersModule, RedisModule],
+  imports: [PrismaModule, StripeModule, SchedulesModule_2024_06_11, UsersModule, RedisModule, EmailModule],
  providers: [
    OrganizationsRepository,
    OrganizationsTeamsRepository,
@@ -24,8 +32,26 @@ import { Module } from "@nestjs/common";
    MembershipsRepository,
    OrganizationsSchedulesService,
    OrganizationSchedulesRepository,
+    OrganizationsUsersRepository,
+    OrganizationsUsersService,
+    EmailService,
+    OrganizationsMembershipRepository,
+    OrganizationsMembershipService,
+  ],
+  exports: [
+    OrganizationsService,
+    OrganizationsRepository,
+    OrganizationsTeamsRepository,
+    OrganizationsUsersRepository,
+    OrganizationsUsersService,
+    OrganizationsMembershipRepository,
+    OrganizationsMembershipService,
+  ],
+  controllers: [
+    OrganizationsTeamsController,
+    OrganizationsSchedulesController,
+    OrganizationsUsersController,
+    OrganizationsMembershipsController,
  ],
-  exports: [OrganizationsService, OrganizationsRepository, OrganizationsTeamsRepository],
-  controllers: [OrganizationsTeamsController, OrganizationsSchedulesController],
 })
 export class OrganizationsModule {}
@@ -74,7 +74,11 @@ export class OrganizationsRepository {
    return this.dbRead.prisma.user.findUnique({
      where: {
        id: userId,
-        organizationId,
+        profiles: {
+          some: {
+            organizationId,
+          },
+        },
      },
    });
  }
@@ -0,0 +1,20 @@
+import { GetUserOutput } from "@/modules/users/outputs/get-users.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum } from "class-validator";
+
+import { ERROR_STATUS } from "@calcom/platform-constants";
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class GetOrganizationUsersOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+  data!: GetUserOutput[];
+}
+
+export class GetOrganizationUserOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+  data!: GetUserOutput;
+}
@@ -0,0 +1,20 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class CreateOrgMembershipOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => OrgMembershipOutputDto)
+  data!: OrgMembershipOutputDto;
+}
@@ -0,0 +1,13 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class DeleteOrgMembership {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  data!: OrgMembershipOutputDto;
+}
@@ -0,0 +1,21 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested, IsArray } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class GetAllOrgMemberships {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested({ each: true })
+  @Type(() => OrgMembershipOutputDto)
+  @IsArray()
+  data!: OrgMembershipOutputDto[];
+}
@@ -0,0 +1,20 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class GetOrgMembership {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => OrgMembershipOutputDto)
+  data!: OrgMembershipOutputDto;
+}
@@ -0,0 +1,32 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { MembershipRole } from "@prisma/client";
+import { Expose } from "class-transformer";
+import { IsBoolean, IsInt, IsOptional, IsString } from "class-validator";
+
+export class OrgMembershipOutputDto {
+  @IsInt()
+  @Expose()
+  readonly id!: number;
+
+  @IsInt()
+  @Expose()
+  readonly userId!: number;
+
+  @IsInt()
+  @Expose()
+  readonly teamId!: number;
+
+  @IsBoolean()
+  @Expose()
+  readonly accepted!: boolean;
+
+  @IsString()
+  @ApiProperty({ enum: ["MEMBER", "OWNER", "ADMIN"] })
+  @Expose()
+  readonly role!: MembershipRole;
+
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  readonly disableImpersonation?: boolean;
+}
@@ -0,0 +1,20 @@
+import { OrgMembershipOutputDto } from "@/modules/organizations/outputs/organization-membership/membership.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsEnum, IsNotEmptyObject, ValidateNested } from "class-validator";
+
+import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
+
+export class UpdateOrgMembership {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: OrgMembershipOutputDto,
+  })
+  @IsNotEmptyObject()
+  @ValidateNested()
+  @Type(() => OrgMembershipOutputDto)
+  data!: OrgMembershipOutputDto;
+}
@@ -0,0 +1,52 @@
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { UpdateOrgMembershipDto } from "../inputs/update-organization-membership.input";
+
+@Injectable()
+export class OrganizationsMembershipRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async findOrgMembership(organizationId: number, membershipId: number) {
+    return this.dbRead.prisma.membership.findUnique({
+      where: {
+        id: membershipId,
+        teamId: organizationId,
+      },
+    });
+  }
+
+  async deleteOrgMembership(organizationId: number, membershipId: number) {
+    return this.dbWrite.prisma.membership.delete({
+      where: {
+        id: membershipId,
+        teamId: organizationId,
+      },
+    });
+  }
+
+  async createOrgMembership(organizationId: number, data: CreateOrgMembershipDto) {
+    return this.dbWrite.prisma.membership.create({
+      data: { ...data, teamId: organizationId },
+    });
+  }
+
+  async updateOrgMembership(organizationId: number, membershipId: number, data: UpdateOrgMembershipDto) {
+    return this.dbWrite.prisma.membership.update({
+      data: { ...data },
+      where: { id: membershipId, teamId: organizationId },
+    });
+  }
+
+  async findOrgMembershipsPaginated(organizationId: number, skip: number, take: number) {
+    return this.dbRead.prisma.membership.findMany({
+      where: {
+        teamId: organizationId,
+      },
+      skip,
+      take,
+    });
+  }
+}
@@ -0,0 +1,76 @@
+import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class OrganizationsUsersRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  private filterOnOrgMembership(orgId: number) {
+    return {
+      profiles: {
+        some: {
+          organizationId: orgId,
+        },
+      },
+    };
+  }
+
+  async getOrganizationUsersByEmails(orgId: number, emailArray?: string[], skip?: number, take?: number) {
+    return await this.dbRead.prisma.user.findMany({
+      where: {
+        ...this.filterOnOrgMembership(orgId),
+        ...(emailArray && emailArray.length ? { email: { in: emailArray } } : {}),
+      },
+      skip,
+      take,
+    });
+  }
+
+  async getOrganizationUserByUsername(orgId: number, username: string) {
+    return await this.dbRead.prisma.user.findFirst({
+      where: {
+        username,
+        ...this.filterOnOrgMembership(orgId),
+      },
+    });
+  }
+
+  async getOrganizationUserByEmail(orgId: number, email: string) {
+    return await this.dbRead.prisma.user.findFirst({
+      where: {
+        email,
+        ...this.filterOnOrgMembership(orgId),
+      },
+    });
+  }
+
+  async createOrganizationUser(orgId: number, createUserBody: CreateOrganizationUserInput) {
+    const createdUser = await this.dbWrite.prisma.user.create({
+      data: createUserBody,
+    });
+
+    return createdUser;
+  }
+
+  async updateOrganizationUser(orgId: number, userId: number, updateUserBody: UpdateOrganizationUserInput) {
+    return await this.dbWrite.prisma.user.update({
+      where: {
+        id: userId,
+        organizationId: orgId,
+      },
+      data: updateUserBody,
+    });
+  }
+
+  async deleteUser(orgId: number, userId: number) {
+    return await this.dbWrite.prisma.user.delete({
+      where: {
+        id: userId,
+        organizationId: orgId,
+      },
+    });
+  }
+}
@@ -0,0 +1,53 @@
+import { CreateOrgMembershipDto } from "@/modules/organizations/inputs/create-organization-membership.input";
+import { OrganizationsMembershipRepository } from "@/modules/organizations/repositories/organizations-membership.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { Injectable } from "@nestjs/common";
+
+import { UpdateOrgMembershipDto } from "../inputs/update-organization-membership.input";
+
+@Injectable()
+export class OrganizationsMembershipService {
+  constructor(
+    private readonly organizationsMembershipRepository: OrganizationsMembershipRepository,
+    private readonly organizationsTeamsRepository: OrganizationsTeamsRepository
+  ) {}
+
+  async getOrgMembership(organizationId: number, membershipId: number) {
+    const membership = await this.organizationsMembershipRepository.findOrgMembership(
+      organizationId,
+      membershipId
+    );
+    return membership;
+  }
+
+  async getPaginatedOrgMemberships(organizationId: number, skip = 0, take = 250) {
+    const memberships = await this.organizationsMembershipRepository.findOrgMembershipsPaginated(
+      organizationId,
+      skip,
+      take
+    );
+    return memberships;
+  }
+
+  async deleteOrgMembership(organizationId: number, membershipId: number) {
+    const memberships = await this.organizationsMembershipRepository.deleteOrgMembership(
+      organizationId,
+      membershipId
+    );
+    return memberships;
+  }
+
+  async updateOrgMembership(organizationId: number, membershipId: number, data: UpdateOrgMembershipDto) {
+    const membership = await this.organizationsMembershipRepository.updateOrgMembership(
+      organizationId,
+      membershipId,
+      data
+    );
+    return membership;
+  }
+
+  async createOrgMembership(organizationId: number, data: CreateOrgMembershipDto) {
+    const membership = await this.organizationsMembershipRepository.createOrgMembership(organizationId, data);
+    return membership;
+  }
+}
@@ -1,10 +1,15 @@
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
 import { CreateOrgTeamDto } from "@/modules/organizations/inputs/create-organization-team.input";
 import { OrganizationsTeamsRepository } from "@/modules/organizations/repositories/organizations-teams.repository";
+import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable } from "@nestjs/common";

@Injectable()
 export class OrganizationsTeamsService {
-  constructor(private readonly organizationsTeamRepository: OrganizationsTeamsRepository) {}
+  constructor(
+    private readonly organizationsTeamRepository: OrganizationsTeamsRepository,
+    private readonly membershipsRepository: MembershipsRepository
+  ) {}

  async getPaginatedOrgTeams(organizationId: number, skip = 0, take = 250) {
    const teams = await this.organizationsTeamRepository.findOrgTeamsPaginated(organizationId, skip, take);
@@ -21,8 +26,11 @@ export class OrganizationsTeamsService {
    return team;
  }

-  async createOrgTeam(organizationId: number, data: CreateOrgTeamDto) {
+  async createOrgTeam(organizationId: number, data: CreateOrgTeamDto, user: UserWithProfile) {
    const team = await this.organizationsTeamRepository.createOrgTeam(organizationId, data);
+    if (user.role !== "ADMIN") {
+      await this.membershipsRepository.createMembership(team.id, user.id, "OWNER");
+    }
    return team;
  }
 }
@@ -0,0 +1,118 @@
+import { EmailService } from "@/modules/email/email.service";
+import { CreateOrganizationUserInput } from "@/modules/organizations/inputs/create-organization-user.input";
+import { UpdateOrganizationUserInput } from "@/modules/organizations/inputs/update-organization-user.input";
+import { OrganizationsUsersRepository } from "@/modules/organizations/repositories/organizations-users.repository";
+import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
+import { Injectable, ConflictException } from "@nestjs/common";
+import { plainToInstance } from "class-transformer";
+
+import { createNewUsersConnectToOrgIfExists } from "@calcom/platform-libraries-0.0.18";
+import { Team } from "@calcom/prisma/client";
+
+@Injectable()
+export class OrganizationsUsersService {
+  constructor(
+    private readonly organizationsUsersRepository: OrganizationsUsersRepository,
+    private readonly emailService: EmailService
+  ) {}
+
+  async getUsers(orgId: number, emailInput?: string[], skip?: number, take?: number) {
+    const emailArray = !emailInput ? [] : emailInput;
+
+    const users = await this.organizationsUsersRepository.getOrganizationUsersByEmails(
+      orgId,
+      emailArray,
+      skip,
+      take
+    );
+
+    return users;
+  }
+
+  async createUser(org: Team, userCreateBody: CreateOrganizationUserInput, inviterName: string) {
+    // Check if email exists in the system
+    const userEmailCheck = await this.organizationsUsersRepository.getOrganizationUserByEmail(
+      org.id,
+      userCreateBody.email
+    );
+
+    if (userEmailCheck) throw new ConflictException("A user already exists with that email");
+
+    // Check if username is already in use in the org
+    if (userCreateBody.username) {
+      await this.checkForUsernameConflicts(org.id, userCreateBody.username);
+    }
+
+    const usernameOrEmail = userCreateBody.username ? userCreateBody.username : userCreateBody.email;
+
+    // Create new org user
+    const createdUserCall = await createNewUsersConnectToOrgIfExists({
+      invitations: [
+        {
+          usernameOrEmail: usernameOrEmail,
+          role: userCreateBody.organizationRole,
+        },
+      ],
+      teamId: org.id,
+      isOrg: true,
+      parentId: null,
+      autoAcceptEmailDomain: "not-required-for-this-endpoint",
+      orgConnectInfoByUsernameOrEmail: {
+        [usernameOrEmail]: {
+          orgId: org.id,
+          autoAccept: userCreateBody.autoAccept,
+        },
+      },
+    });
+
+    const createdUser = createdUserCall[0];
+
+    // Update user fields that weren't included in createNewUsersConnectToOrgIfExists
+    const updateUserBody = plainToInstance(CreateUserInput, userCreateBody, { strategy: "excludeAll" });
+
+    // Update new user with other userCreateBody params
+    const user = await this.organizationsUsersRepository.updateOrganizationUser(
+      org.id,
+      createdUser.id,
+      updateUserBody
+    );
+
+    // Need to send email to new user to create password
+    await this.emailService.sendSignupToOrganizationEmail({
+      usernameOrEmail,
+      orgName: org.name,
+      orgId: org.id,
+      locale: user?.locale,
+      inviterName,
+    });
+
+    return user;
+  }
+
+  async updateUser(orgId: number, userId: number, userUpdateBody: UpdateOrganizationUserInput) {
+    if (userUpdateBody.username) {
+      await this.checkForUsernameConflicts(orgId, userUpdateBody.username);
+    }
+
+    const user = await this.organizationsUsersRepository.updateOrganizationUser(
+      orgId,
+      userId,
+      userUpdateBody
+    );
+    return user;
+  }
+
+  async deleteUser(orgId: number, userId: number) {
+    const user = await this.organizationsUsersRepository.deleteUser(orgId, userId);
+    return user;
+  }
+
+  async checkForUsernameConflicts(orgId: number, username: string) {
+    const isUsernameTaken = await this.organizationsUsersRepository.getOrganizationUserByUsername(
+      orgId,
+      username
+    );
+
+    if (isUsernameTaken) throw new ConflictException("Username is already taken");
+  }
+}
@@ -5,8 +5,8 @@ import { ApiTags as DocsTags } from "@nestjs/swagger";
 import { Response as ExpressResponse, Request as ExpressRequest } from "express";

 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import { getAvailableSlots } from "@calcom/platform-libraries-0.0.2";
-import type { AvailableSlotsType } from "@calcom/platform-libraries-0.0.2";
+import { getAvailableSlots } from "@calcom/platform-libraries-0.0.18";
+import type { AvailableSlotsType } from "@calcom/platform-libraries-0.0.18";
 import { RemoveSelectedSlotInput, ReserveSlotInput } from "@calcom/platform-types";
 import { ApiResponse, GetAvailableSlotsInput } from "@calcom/platform-types";

@@ -3,7 +3,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 import { DateTime } from "luxon";

-import { MINUTES_TO_BOOK } from "@calcom/platform-libraries-0.0.2";
+import { MINUTES_TO_BOOK } from "@calcom/platform-libraries-0.0.18";
 import { ReserveSlotInput } from "@calcom/platform-types";

@Injectable()
@@ -4,7 +4,7 @@ import { Controller, Get } from "@nestjs/common";
 import { ApiTags as DocsTags } from "@nestjs/swagger";

 import { SUCCESS_STATUS } from "@calcom/platform-constants";
-import type { CityTimezones } from "@calcom/platform-libraries-0.0.2";
+import type { CityTimezones } from "@calcom/platform-libraries-0.0.18";
 import { ApiResponse } from "@calcom/platform-types";

@Controller({
@@ -1,8 +1,8 @@
 import { RedisService } from "@/modules/redis/redis.service";
 import { Injectable } from "@nestjs/common";

-import { cityTimezonesHandler } from "@calcom/platform-libraries-0.0.2";
-import type { CityTimezones } from "@calcom/platform-libraries-0.0.2";
+import { cityTimezonesHandler } from "@calcom/platform-libraries-0.0.18";
+import type { CityTimezones } from "@calcom/platform-libraries-0.0.18";

@Injectable()
 export class TimezonesService {
@@ -1,6 +1,7 @@
+import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { ApiProperty } from "@nestjs/swagger";
-import { IsOptional, IsTimeZone, IsString } from "class-validator";
+import { IsOptional, IsTimeZone, IsString, IsEnum } from "class-validator";

 export type WeekDay = "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday" | "Sunday";
 export type TimeFormat = 12 | 24;
@@ -30,4 +31,9 @@ export class CreateManagedUserInput {
  @CapitalizeTimeZone()
  @ApiProperty({ example: "America/New_York" })
  timeZone?: string;
+
+  @IsEnum(Locales)
+  @IsOptional()
+  @ApiProperty({ example: Locales.EN, enum: Locales })
+  locale?: Locales;
 }
@@ -0,0 +1,131 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Transform } from "class-transformer";
+import {
+  IsBoolean,
+  IsEmail,
+  IsHexColor,
+  IsNumber,
+  IsOptional,
+  IsString,
+  Validate,
+  Min,
+} from "class-validator";
+
+import { AvatarValidator } from "../validators/avatarValidator";
+import { LocaleValidator } from "../validators/localeValidator";
+import { ThemeValidator } from "../validators/themeValidator";
+import { TimeFormatValidator } from "../validators/timeFormatValidator";
+import { TimeZoneValidator } from "../validators/timeZoneValidator";
+import { WeekdayValidator } from "../validators/weekdayValidator";
+
+export class CreateUserInput {
+  @ApiProperty({ type: String, description: "User email address", example: "user@example.com" })
+  @IsEmail()
+  @Transform(({ value }) => {
+    if (typeof value === "string") {
+      return value.toLowerCase();
+    }
+  })
+  @Expose()
+  email!: string;
+
+  @ApiProperty({ type: String, required: false, description: "Username", example: "user123" })
+  @IsOptional()
+  @IsString()
+  @Transform(({ value }) => {
+    if (typeof value === "string") {
+      return value.toLowerCase();
+    }
+  })
+  @Expose()
+  username?: string;
+
+  @ApiProperty({ type: String, required: false, description: "Preferred weekday", example: "Monday" })
+  @IsOptional()
+  @IsString()
+  @Validate(WeekdayValidator)
+  @Expose()
+  weekday?: string;
+
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Brand color in HEX format",
+    example: "#FFFFFF",
+  })
+  @IsOptional()
+  @IsHexColor()
+  @Expose()
+  brandColor?: string;
+
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Dark brand color in HEX format",
+    example: "#000000",
+  })
+  @IsOptional()
+  @IsHexColor()
+  @Expose()
+  darkBrandColor?: string;
+
+  @ApiProperty({ type: Boolean, required: false, description: "Hide branding", example: false })
+  @IsOptional()
+  @IsBoolean()
+  @Expose()
+  hideBranding?: boolean;
+
+  @ApiProperty({ type: String, required: false, description: "Time zone", example: "America/New_York" })
+  @IsOptional()
+  @IsString()
+  @Validate(TimeZoneValidator)
+  @Expose()
+  timeZone?: string;
+
+  @ApiProperty({ type: String, required: false, description: "Theme", example: "dark" })
+  @IsOptional()
+  @IsString()
+  @Validate(ThemeValidator)
+  @Expose()
+  theme?: string | null;
+
+  @ApiProperty({ type: String, required: false, description: "Application theme", example: "light" })
+  @IsOptional()
+  @IsString()
+  @Validate(ThemeValidator)
+  @Expose()
+  appTheme?: string | null;
+
+  @ApiProperty({ type: Number, required: false, description: "Time format", example: 24 })
+  @IsOptional()
+  @IsNumber()
+  @Validate(TimeFormatValidator)
+  @Expose()
+  timeFormat?: number;
+
+  @ApiProperty({ type: Number, required: false, description: "Default schedule ID", example: 1, minimum: 0 })
+  @IsOptional()
+  @IsNumber()
+  @Min(0)
+  @Expose()
+  defaultScheduleId?: number;
+
+  @ApiProperty({ type: String, required: false, description: "Locale", example: "en", default: "en" })
+  @IsOptional()
+  @IsString()
+  @Validate(LocaleValidator)
+  @Expose()
+  locale?: string | null = "en";
+
+  @ApiProperty({
+    type: String,
+    required: false,
+    description: "Avatar URL",
+    example: "https://example.com/avatar.jpg",
+  })
+  @IsOptional()
+  @IsString()
+  @Validate(AvatarValidator)
+  @Expose()
+  avatarUrl?: string;
+}
@@ -0,0 +1,19 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
+import { IsOptional, Validate } from "class-validator";
+
+import { SkipTakePagination } from "@calcom/platform-types";
+
+import { IsEmailStringOrArray } from "../validators/isEmailStringOrArray";
+
+export class GetUsersInput extends SkipTakePagination {
+  @IsOptional()
+  @Validate(IsEmailStringOrArray)
+  @Transform(({ value }: { value: string | string[] }) => {
+    return typeof value === "string" ? [value] : value;
+  })
+  @ApiProperty({
+    description: "The email address or an array of email addresses to filter by",
+  })
+  emails?: string[];
+}
@@ -1,7 +1,8 @@
+import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { TimeFormat, WeekDay } from "@/modules/users/inputs/create-managed-user.input";
 import { ApiProperty } from "@nestjs/swagger";
-import { IsIn, IsNumber, IsOptional, IsString, IsTimeZone } from "class-validator";
+import { IsEnum, IsIn, IsNumber, IsOptional, IsString, IsTimeZone } from "class-validator";

 export class UpdateManagedUserInput {
  @IsString()
@@ -34,4 +35,9 @@ export class UpdateManagedUserInput {
  @IsOptional()
  @CapitalizeTimeZone()
  timeZone?: string;
+
+  @IsEnum(Locales)
+  @IsOptional()
+  @ApiProperty({ example: Locales.EN, enum: Locales })
+  locale?: Locales;
 }
@@ -0,0 +1,4 @@
+import { CreateUserInput } from "@/modules/users/inputs/create-user.input";
+import { PartialType } from "@nestjs/mapped-types";
+
+export class UpdateUserInput extends PartialType(CreateUserInput) {}
@@ -0,0 +1,239 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { Expose } from "class-transformer";
+import { IsBoolean, IsDateString, IsInt, IsString, ValidateNested, IsArray } from "class-validator";
+
+export class GetUserOutput {
+  @IsInt()
+  @Expose()
+  @ApiProperty({ type: Number, required: true, description: "The ID of the user", example: 1 })
+  id!: number;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The username of the user",
+    example: "john_doe",
+  })
+  username!: string | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The name of the user",
+    example: "John Doe",
+  })
+  name!: string | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    required: true,
+    description: "The email of the user",
+    example: "john@example.com",
+  })
+  email!: string;
+
+  @IsDateString()
+  @Expose()
+  @ApiProperty({
+    type: Date,
+    nullable: true,
+    required: false,
+    description: "The date when the email was verified",
+    example: "2022-01-01T00:00:00Z",
+  })
+  emailVerified!: Date | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The bio of the user",
+    example: "I am a software developer",
+  })
+  bio!: string | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The URL of the user's avatar",
+    example: "https://example.com/avatar.jpg",
+  })
+  avatarUrl!: string | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    required: true,
+    description: "The time zone of the user",
+    example: "America/New_York",
+  })
+  timeZone!: string;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    required: true,
+    description: "The week start day of the user",
+    example: "Monday",
+  })
+  weekStart!: string;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The app theme of the user",
+    example: "light",
+  })
+  appTheme!: string | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The theme of the user",
+    example: "default",
+  })
+  theme!: string | null;
+
+  @IsInt()
+  @Expose()
+  @ApiProperty({
+    type: Number,
+    nullable: true,
+    required: false,
+    description: "The ID of the default schedule for the user",
+    example: 1,
+  })
+  defaultScheduleId!: number | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The locale of the user",
+    example: "en-US",
+  })
+  locale!: string | null;
+
+  @IsInt()
+  @Expose()
+  @ApiProperty({
+    type: Number,
+    nullable: true,
+    required: false,
+    description: "The time format of the user",
+    example: 12,
+  })
+  timeFormat!: number | null;
+
+  @IsBoolean()
+  @Expose()
+  @ApiProperty({
+    type: Boolean,
+    required: true,
+    description: "Whether to hide branding for the user",
+    example: false,
+  })
+  hideBranding!: boolean;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The brand color of the user",
+    example: "#ffffff",
+  })
+  brandColor!: string | null;
+
+  @IsString()
+  @Expose()
+  @ApiProperty({
+    type: String,
+    nullable: true,
+    required: false,
+    description: "The dark brand color of the user",
+    example: "#000000",
+  })
+  darkBrandColor!: string | null;
+
+  @IsBoolean()
+  @Expose()
+  @ApiProperty({
+    type: Boolean,
+    nullable: true,
+    required: false,
+    description: "Whether dynamic booking is allowed for the user",
+    example: true,
+  })
+  allowDynamicBooking!: boolean | null;
+
+  @IsDateString()
+  @Expose()
+  @ApiProperty({
+    type: Date,
+    required: true,
+    description: "The date when the user was created",
+    example: "2022-01-01T00:00:00Z",
+  })
+  createdDate!: Date;
+
+  @IsBoolean()
+  @Expose()
+  @ApiProperty({
+    type: Boolean,
+    nullable: true,
+    required: false,
+    description: "Whether the user is verified",
+    example: true,
+  })
+  verified!: boolean | null;
+
+  @IsInt()
+  @Expose()
+  @ApiProperty({
+    type: Number,
+    nullable: true,
+    required: false,
+    description: "The ID of the user who invited this user",
+    example: 1,
+  })
+  invitedTo!: number | null;
+}
+
+export class GetUsersOutput {
+  @ValidateNested()
+  @Type(() => GetUserOutput)
+  @IsArray()
+  @ApiProperty({
+    type: [GetUserOutput],
+    required: true,
+    description: "The list of users",
+    example: [{ id: 1, username: "john_doe", name: "John Doe", email: "john@example.com" }],
+  })
+  users!: GetUserOutput[];
+}
@@ -0,0 +1,11 @@
+import { ValidatorConstraint } from "class-validator";
+import type { ValidatorConstraintInterface } from "class-validator";
+
+@ValidatorConstraint({ name: "avatarValidator", async: false })
+export class AvatarValidator implements ValidatorConstraintInterface {
+  validate(avatarString: string) {
+    // Checks if avatar string is a valid base 64 image
+    const regex = /^data:image\/[^;]+;base64,(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/;
+    return regex.test(avatarString);
+  }
+}
@@ -0,0 +1,24 @@
+import { ValidatorConstraint } from "class-validator";
+import type { ValidatorConstraintInterface } from "class-validator";
+
+@ValidatorConstraint({ name: "IsEmailStringOrArray", async: false })
+export class IsEmailStringOrArray implements ValidatorConstraintInterface {
+  validate(value: any): boolean {
+    if (typeof value === "string") {
+      return this.validateEmail(value);
+    } else if (Array.isArray(value)) {
+      return value.every((item) => this.validateEmail(item));
+    }
+    return false;
+  }
+
+  validateEmail(email: string): boolean {
+    const regex =
+      /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return regex.test(email);
+  }
+
+  defaultMessage() {
+    return "Please submit only valid email addresses";
+  }
+}
@@ -0,0 +1,39 @@
+import type { ValidatorConstraintInterface } from "class-validator";
+import { ValidatorConstraint } from "class-validator";
+
+@ValidatorConstraint({ name: "localeValidator", async: false })
+export class LocaleValidator implements ValidatorConstraintInterface {
+  validate(locale: string) {
+    const localeValues = [
+      "en",
+      "fr",
+      "it",
+      "ru",
+      "es",
+      "de",
+      "pt",
+      "ro",
+      "nl",
+      "pt-BR",
+      "ko",
+      "ja",
+      "pl",
+      "ar",
+      "iw",
+      "zh-CN",
+      "zh-TW",
+      "cs",
+      "sr",
+      "sv",
+      "vi",
+    ];
+
+    if (localeValues.includes(locale)) return true;
+
+    return false;
+  }
+
+  defaultMessage() {
+    return "Please include a valid locale";
+  }
+}
@@ -0,0 +1,17 @@
+import type { ValidatorConstraintInterface } from "class-validator";
+import { ValidatorConstraint } from "class-validator";
+
+@ValidatorConstraint({ name: "themeValidator", async: false })
+export class ThemeValidator implements ValidatorConstraintInterface {
+  validate(theme: string) {
+    const themeValues = ["dark", "light"];
+
+    if (themeValues.includes(theme)) return true;
+
+    return false;
+  }
+
+  defaultMessage() {
+    return "Please include either 'dark' or 'light";
+  }
+}
@@ -0,0 +1,17 @@
+import type { ValidatorConstraintInterface } from "class-validator";
+import { ValidatorConstraint } from "class-validator";
+
+@ValidatorConstraint({ name: "timeFormatValidator", async: false })
+export class TimeFormatValidator implements ValidatorConstraintInterface {
+  validate(timeFormat: number) {
+    const timeFormatValues = [12, 24];
+
+    if (timeFormatValues.includes(timeFormat)) return true;
+
+    return false;
+  }
+
+  defaultMessage() {
+    return "Please include either 12 or 24";
+  }
+}
@@ -0,0 +1,18 @@
+import type { ValidatorConstraintInterface } from "class-validator";
+import { ValidatorConstraint } from "class-validator";
+import tzdata from "tzdata";
+
+@ValidatorConstraint({ name: "timezoneValidator", async: false })
+export class TimeZoneValidator implements ValidatorConstraintInterface {
+  validate(timeZone: string) {
+    const timeZoneList = Object.keys(tzdata.zones);
+
+    if (timeZoneList.includes(timeZone)) return true;
+
+    return false;
+  }
+
+  defaultMessage() {
+    return "Please include a valid time zone";
+  }
+}
@@ -0,0 +1,16 @@
+import type { ValidatorConstraintInterface } from "class-validator";
+import { ValidatorConstraint } from "class-validator";
+
+@ValidatorConstraint({ name: "weekdayValidator", async: false })
+export class WeekdayValidator implements ValidatorConstraintInterface {
+  validate(weekday: string) {
+    const weekdays = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
+
+    if (weekdays.includes(weekday)) return true;
+    return false;
+  }
+
+  defaultMessage() {
+    return "Please include a valid weekday";
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Omar López	2af27170cd	chore: v4.3.1 (#15817 ) release.yml / release (push) Canceled after 0s Details	2024-07-18 13:09:30 +02:00
Joe Au-Yeungandzomars	218f6d6eaf	feat: Salesforce - Disable creating new contacts (#15780 ) Co-authored-by: zomars <zomars@me.com>	2024-07-18 10:50:42 +00:00
Hariom Balhara	f0464e72c7	fix: Check URL (#15815 )	2024-07-18 10:20:03 +00:00
Anik Dhabal BabuandPeer Richelsen	2ad3592eb3	chore: Introduce a new class WebAppURL that extends URL (#14982 ) * chore: Introduce a new class WebAppURL that extends URL * update --------- Co-authored-by: Peer Richelsen <peeroke@gmail.com>	2024-07-18 07:27:34 +00:00
Syed Ali ShahbazandMorgan Vernay	22fc47f69f	feat: V2 Org Memberships (#15578 ) * init * --WIP * WIP * ... * more wip * doc * address feedback --WIP * further requested changes * fix * add missing parseIntPipe * chore: code review comments + e2e tests * fixup! chore: code review comments + e2e tests * fixup! fixup! chore: code review comments + e2e tests * fix: don't allow passing teamId for org membership create/update * fix: improve docs and DTOs --------- Co-authored-by: Morgan Vernay <morgan@cal.com>	2024-07-18 03:43:20 +00:00
Morgan	af3d2e6879	chore: set managed user locale via api v2 (#15794 )	2024-07-17 12:56:37 +00:00
Morgan	58e61cb18e	fix: findOrgUser use profiles instead of organizationId apiv2 (#15808 )	2024-07-17 12:51:42 +00:00
NitinPSingh	9e3f8a2dc0	fix: Add signout button on onboarding screen (#15807 ) * fix #15787 created signoutbtn on onboarding screen * fix: Add signout button on onboarding screen and changes done as per feedback * small error removed	2024-07-17 14:32:13 +02:00
Udit Takkar	e960b8ad10	fix: fetch workflows on the backend (#15796 ) * fix: fetch workflows on the router * chore: remove workflows * chore: import zod * chore: move to repository	2024-07-17 07:02:22 +00:00
Peer Richelsen	b7bfd77f95	readded border (#15798 )	2024-07-16 15:46:40 +00:00
Peer Richelsen	2707adbb7b	chore: removed cal.ai email assistant (#15793 ) * removed cal-ai * removed apps/ai	2024-07-16 14:21:00 +00:00
Morgan	5ef1b22c87	fix: remove permission blocking public apiv2 event-types endpoint (#15801 )	2024-07-16 14:05:51 +00:00
Mohit YadavandKeith Williams	7e29db7a1b	docs(contributing): change fork link (#15792 ) Co-authored-by: Keith Williams <keithwillcode@gmail.com>	2024-07-16 14:25:06 +02:00
Joe Au-Yeung Morgan Vernay Morgan	41cde8e384	feat: API org user scope (#15739 ) * Init organizations users GET endpoint * Fix get users endpoint * Add create user input * Add POST to organization user endpoint * Creating a user make email mandatory * Move DTOs out of platform types * Use plainToInstance for data filtering * POST create user and org membership * Add email check * Filter update user call * Add getOrg decorator to endpoints * Add update endpoint * Add delete endpoint * Fix merge changes to create new org user * Init tests * Send org signup email * Abstract username check * Implement email service * WIP E2E test * Rename methods * Update update org user DTO * Remove unused inputs * chore: add ApiProperty decorator to users class validators * Type fix * Update tests * chore: code review comments * chore: code review comments * chore: code review comments --------- Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>	2024-07-16 10:50:46 +00:00
MorganandLauris Skraucis	9fec77e345	fix: creating organization team should add owner (#15779 ) * chore: platform libraries versions cleanup api v2 * fix: create membership to created org team apiv2 * chore: add test check owner membership --------- Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com>	2024-07-16 10:31:29 +00:00
Achraf Keith Williams Amit Sharma	7046f6f80a	feat: Fix Proton Calendar with ICS (#15454 ) * feat: fix proton calendar with ics * ics-feed: add note & clarify checkbox * fix review --------- Co-authored-by: Keith Williams <keithwillcode@gmail.com> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>	2024-07-16 12:08:54 +02:00
Hariom Balhara	3f4a0eff7f	Enable embed namespacing again (#15783 )	2024-07-16 12:07:37 +02:00
Peer Richelsen	d2768c4dc5	chore: Update /ee README.md (#15765 ) * Update README.md * Update README.md	2024-07-16 09:52:12 +00:00
satya-nutella supalarry Lauris Skraucis Peer Richelsen	470e0f53d8	feat: allow passing initial data props to calendar connectors (#15760 ) * feat: allow passing init data to AvailabilitySettings, OAuthConnect wrappers * chore: gitignore idea * chore: minor fixes * chore: use yarn.lock from main branch --------- Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com>	2024-07-16 09:47:50 +00:00
Lauris Skraucis	003af9a69d	chore: specify platform-libraries version for event-types (#15785 )	2024-07-16 09:47:37 +00:00
VijayandAmit Sharma	283ca9fc74	fix: #15749 Display availability page as per weekstart setting (#15753 ) * update to display availability page as per weekstart setting * update to accomodate any day * update for AvailabilityTab * reusable and tests added * update test description --------- Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>	2024-07-16 11:31:02 +02:00
Pranav RajveerandAmit Sharma	13ec930a61	fix: filter admin_api if org is present (#15386 ) * fix: filter admin_api if org is present * remove admin_api from developers tab when org is present --------- Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com>	2024-07-16 11:30:39 +02:00
Lauris Skraucis	cada4a58ac	chore: add platform-libraries change log (#15786 )	2024-07-16 10:53:26 +02:00
Lauris Skraucis	77519a077c	refactor: allow system admins to create event-type without membership (#15774 )	2024-07-16 06:08:28 +00:00
Nick Holden	1a5a539106	fix: higher resolution Campsite icon (#15777 )	2024-07-16 04:21:34 +00:00
Morgan	539a2ea301	chore: platform libraries versions cleanup api v2 (#15768 ) * chore: platform libraries versions cleanup api v2 * fixup! chore: platform libraries versions cleanup api v2	2024-07-15 17:03:15 +00:00
				`@@ -1 +0,0 @@`
				`export const context = { apiKey: "", userId: "" };`