* Initial commit * Adding feature flag * feat: Orgs Schema Changing `scopedMembers` to `orgUsers` (#9209) * Change scopedMembers to orgMembers * Change to orgUsers * Letting duplicate slugs for teams to support orgs * Covering null on unique clauses * Supporting having the orgId in the session cookie * feat: organization event type filter (#9253) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Missing changes to support orgs schema changes * feat: Onboarding process to create an organization (#9184) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * feedback * Making sure we check requestedSlug now --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * feat: [CAL-1816] Organization subdomain support (#9345) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * Covering users and subteams, excluding non-org users * Unpublished teams shows correctly * Create subdomain in Vercel * feedback * Renaming Vercel env vars * Vercel domain check before creation * Supporting cal-staging.com * Change to have vercel detect it * vercel domain check data message error * Remove check domain * Making sure we check requestedSlug now * Feedback and unneeded code * Reverting unneeded changes * Unneeded changes --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Vercel subdomain creation in PROD only * Making sure we let localhost still work * Feedback * Type check fixes * feat: Organization branding in side menu (#9279) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Org branding provider used in shell sidebar * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Using org avatar (temp) * Not showing org logo if not set * User onboarding with org branding (slug) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * feedback * Feedback * Org public profile * Public profiles for team event types * Added setup profile alert * Using org avatar on subteams avatar * Making sure we show the set up profile on org only * Profile username availability rely on org hook * Update apps/web/pages/team/[slug].tsx Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Update apps/web/pages/team/[slug].tsx Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * feat: Organization support for event types page (#9449) * Desktop first banner, mobile pending * Removing dead code and img * WIP * Adds Email verification template+translations for organizations (#9202) * First step done * Merge branch 'feat/organizations-onboarding' of github.com:calcom/cal.com into feat/organizations-onboarding * Step 2 done, avatar not working * Covering null on unique clauses * Onboarding admins step * Last step to create teams * Moving change password handler, improving verifying code flow * Clearing error before submitting * Reverting email testing api changes * Reverting having the banner for now * Consistent exported components * Remove unneeded files from banner * Removing uneeded code * Fixing avatar selector * Org branding provider used in shell sidebar * Using meta component for head/descr * Missing i18n strings * Feedback * Making an org avatar (temp) * Using org avatar (temp) * Not showing org logo if not set * User onboarding with org branding (slug) * Check for subteams slug clashes with usernames * Fixing create teams onsuccess * feedback * Feedback * Org public profile * Public profiles for team event types * Added setup profile alert * Using org avatar on subteams avatar * Processing orgs and children as profile options * Reverting change not belonging to this PR * Making sure we show the set up profile on org only * Removing console.log * Comparing memberships to choose the highest one --------- Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Type errors * Refactor and type fixes * Update orgDomains.ts * Feedback * Reverting * NIT * fix issue getting org slug from domain * Improving orgDomains util * Host comes with port * Update useRouterQuery.ts * Feedback * Feedback * Feedback * Feedback: SSR for user event-types to have org context * chore: Cache node_modules (#9492) * Adding check for cache hit * Adding a separate install step first * Put the restore cache steps back * Revert the uses type for restoring cache * Added step to restore nm cache * Removed the cache-hit check * Comments and naming * Removed extra install command * Updated the name of the linting step to be more clear * Removes the need for useEffect here * Feedback * Feedback * Cookie domain needs a dot * Type fix * Update apps/web/public/static/locales/en/common.json Co-authored-by: Omar López <zomars@me.com> * Update packages/emails/src/templates/OrganizationAccountVerifyEmail.tsx * Feedback --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: zomars <zomars@me.com> Co-authored-by: Efraín Rochín <roae.85@gmail.com> Co-authored-by: Keith Williams <keithwillcode@gmail.com>
118 lines
3.7 KiB
TypeScript
118 lines
3.7 KiB
TypeScript
import type { NextApiRequest, NextApiResponse } from "next";
|
|
import type { CollectOpts, EventHandler } from "next-collect";
|
|
import { useCollector } from "next-collect/client";
|
|
// Importing types so we're not directly importing next/server
|
|
import type { NextRequest, NextResponse } from "next/server";
|
|
|
|
import { CONSOLE_URL } from "./constants";
|
|
|
|
export const telemetryEventTypes = {
|
|
pageView: "page_view",
|
|
apiCall: "api_call",
|
|
bookingConfirmed: "booking_confirmed",
|
|
bookingCancelled: "booking_cancelled",
|
|
importSubmitted: "import_submitted",
|
|
login: "login",
|
|
embedView: "embed_view",
|
|
embedBookingConfirmed: "embed_booking_confirmed",
|
|
onboardingFinished: "onboarding_finished",
|
|
onboardingStarted: "onboarding_started",
|
|
signup: "signup",
|
|
team_created: "team_created",
|
|
website: {
|
|
pageView: "website_page_view",
|
|
},
|
|
slugReplacementAction: "slug_replacement_action",
|
|
org_created: "org_created",
|
|
};
|
|
|
|
export function collectPageParameters(
|
|
route?: string,
|
|
extraData: Record<string, unknown> = {}
|
|
): Record<string, unknown> {
|
|
const host = document.location.host;
|
|
const docPath = route ?? "";
|
|
return {
|
|
page_url: route,
|
|
doc_encoding: document.characterSet,
|
|
url: document.location.protocol + "//" + host + (docPath ?? ""),
|
|
...extraData,
|
|
};
|
|
}
|
|
|
|
const reportUsage: EventHandler = async (event, { fetch }) => {
|
|
const ets = telemetryEventTypes;
|
|
if ([ets.bookingConfirmed, ets.embedBookingConfirmed].includes(event.eventType)) {
|
|
const key = process.env.CALCOM_LICENSE_KEY;
|
|
const url = `${CONSOLE_URL}/api/deployments/usage?key=${key}&quantity=1`;
|
|
try {
|
|
return fetch(url, { method: "POST", mode: "cors" });
|
|
} catch (e) {
|
|
console.error(`Error reporting booking for key: '${key}'`, e);
|
|
return Promise.resolve();
|
|
}
|
|
} else {
|
|
return Promise.resolve();
|
|
}
|
|
};
|
|
|
|
export const nextCollectBasicSettings: CollectOpts = {
|
|
drivers: [
|
|
process.env.CALCOM_LICENSE_KEY && process.env.NEXT_PUBLIC_IS_E2E !== "1" ? reportUsage : undefined,
|
|
process.env.CALCOM_TELEMETRY_DISABLED === "1" || process.env.NEXT_PUBLIC_IS_E2E === "1"
|
|
? undefined
|
|
: {
|
|
type: "jitsu",
|
|
opts: {
|
|
key: "s2s.2pvs2bbpqq1zxna97wcml.esb6cikfrf7yn0qoh1nj1",
|
|
server: "https://t.calendso.com",
|
|
},
|
|
},
|
|
process.env.TELEMETRY_DEBUG && { type: "echo", opts: { disableColor: true } },
|
|
],
|
|
eventTypes: [
|
|
{ "*.ttf": null },
|
|
{ "*.webmanifest": null },
|
|
{ "*.json": null },
|
|
{ "*.svg": null },
|
|
{ "*.map": null },
|
|
{ "*.png": null },
|
|
{ "*.gif": null },
|
|
{ "/api/collect-events": null },
|
|
{ "/api*": null },
|
|
{ "/img*": null },
|
|
{ "/favicon*": null },
|
|
{ "/*": telemetryEventTypes.pageView },
|
|
],
|
|
};
|
|
|
|
export const extendEventData = (
|
|
req: NextRequest | NextApiRequest,
|
|
res: NextResponse | NextApiResponse,
|
|
original: { page_url: string; isTeamBooking: boolean }
|
|
) => {
|
|
const onVercel =
|
|
typeof req.headers?.get === "function"
|
|
? !!req.headers.get("x-vercel-id")
|
|
: !!(req.headers as { [key: string]: string })?.["x-vercel-id"];
|
|
const pageUrl = original?.page_url || req.url || undefined;
|
|
const cookies = req.cookies as { [key: string]: string };
|
|
return {
|
|
title: "",
|
|
ipAddress: "",
|
|
queryString: "",
|
|
page_url: pageUrl,
|
|
licensekey: process.env.CALCOM_LICENSE_KEY,
|
|
isTeamBooking:
|
|
original?.isTeamBooking === undefined
|
|
? pageUrl?.includes("team/") || undefined
|
|
: original?.isTeamBooking,
|
|
referrer: "",
|
|
onVercel,
|
|
isAuthorized: !!cookies["next-auth.session-token"] || !!cookies["__Secure-next-auth.session-token"],
|
|
utc_time: new Date().toISOString(),
|
|
};
|
|
};
|
|
|
|
export const useTelemetry = useCollector;
|