* Add endpoints for testing the flow * Add MVP * new route * Fixes * Fixes * Remove enable toggle support from domainWideDelegation * Fixes * Revert "Remove enable toggle support from domainWideDelegation" This reverts commit c29e729206cd1fa063f9c9ce0cf148ef1577d60b. * Revert yarn.lock * More fixes * Fix new workspace platform add * refactor: improvements * refactor: bug fixes and improvements * fix: type errors * fix: conflicts * chore: update test * fix: logic * chore: improvements * fix: toglle * fix: bugs * fix: type err * chore: check number type * fix: after conflicts * chore: fix type err * fix: type errors and tests * fix: tets * test * chore: remove unused * fix: google meet url on booking page and secondary calendar * fix: add property * fix: type err * fix: re assingment bug * fix: use getAllCredentials * chore: fix import * fix: installed count * fix: pass event type * fix: import * fix: [Stacked PR] Review fixes (#17958) * Review fixes * fix: destination calendar bug --------- Co-authored-by: Udit Takkar <udit222001@gmail.com> * refactor: use repository * chore: remove duplicate * fix: More review fixes for domain wide delegation (#17969) * Reuse buildCredentialPayloadForCalendar * fixes --------- Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> * fix ts error * Fix getSchedule not using dwd credentials (#17995) * fix: Remove direct DWD table access from google-calendar and remove delegatedToId column from Credential (#18015) * Remove fn rename to reduce number of files changed * chore: check feature globally * test: add unit tests * chore: move function * test: add booking test * wip * Remove domain-wide-delegation team feature flag * Make sure duplicate calendars are not shown due to DWD. Show DWD when there is conflict * Fix tests and their ts errors * Fix more tests * Move findUsersForAvailabilityCheck to separate file as it has AppStore dependency causing problem with Routing Forms. Build crashes * fix: Multiple calendar connections from Google not showing up in apps/installed * DestinationCalendar must have either credentialId or domainWideDeelgationId. Also handle the case when DWD is disabled and there was a non-dwd credential that could be used * Disable deletetion of DWD as it is destructive and prefer disabling instead * Show DWD credential calendars at the top * Fixed tests * Calendar Cache DWD support * Self-Review: Verify email required and add more selectedCalendar tests * Self Review: shorten names * Self ReviewL Dead code removal * Revert "Calendar Cache DWD support" This reverts commit 009f236470fa21eba5986117d4f6e4d4c5e38c34. * Some misc fixes * fixes * Performance improvememt in slots loading and booking * More cases for handling dwd credentials * simplify the logic. Ensure that EventManager and the modules below it in the flow have CredentialForCalendarService available * Fix tests * Fix installed/conferencing not showing gogole meet * Shorten name * Fix ApI v2 tests * Add some more tests * add getSchedule tests * Improve tests * Make Google Meet default when DWD for google is enabled * Enable feature flagging for DWD * chore: bump libraries * Encrypt serviceaccount private key * Fix ts errors * bump platform libraries * org add dwd * org add dwd * bump platform libraries * fix selected calendars * fix remove selected dwd calendar * remove oauthclient id aliad in authedCalendar * remove oauthclient id aliad in authedCalendar * refactor: OrganizationsDwdController * chore: export toggleDwdEnabled from platform-libraries * feat: v2 update (enable / disable) dwd * refactor: SelectedCalendarsController check if user belongs to dwd org & for not dwd use previous logic * wip: DestinationCalendar send domainWideDelegationCredentialId from frontend to api * try fix set destination calendar api v2 * fixup! try fix set destination calendar api v2 * setting google meet as default location working for dwd * bump platform libraries version * allow office 365 workspace slug * allow office 365 workspace slug * chore: v2 create dwd MS and Google service keys input * fix: CreateDwdInput serviceAccountKey * fix: CredentialForCalendarService type * fix: check workspace slug * feat: update serviceAccessKey of DWD * testing * fixup! testing * fix: getAuthUtl bug * fix: unit tests * fix: type err and unit test * fix: e2e test * fix: credentials bug and failing unit tests * Update CalendarService.ts * chore: refactor office365 calendar service and add testDomainWideDelegationSetup * fix: office365Calendar use correct clientId/Secret for DWD * fix: office365Calendar dwd no need refresh token * test: add unit test for outlook dwd and setup * feat: added dwd support for office365 calendar * feat: added dwd support for office365 video * test: finish test for outlook dwd * fix: create dialog bug * chore: remove console logs * fix: refreshToken bug * bump version libraries * refactor: fetch dwd credentials only in findQualifiedHosts * fixup! refactor: fetch dwd credentials only in findQualifiedHosts * fix: type err * fix: type err * fix: getUserDisplayName * fix: unit test * chore: bump platform lib --------- Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Udit Takkar <udit222001@gmail.com> Co-authored-by: Morgan Vernay <morgan@cal.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
191 lines
5.8 KiB
TypeScript
191 lines
5.8 KiB
TypeScript
import type { AppCategories, Prisma } from "@prisma/client";
|
|
|
|
import type { Tag } from "@calcom/app-store/types";
|
|
|
|
type CommonProperties = {
|
|
default?: false;
|
|
type: string;
|
|
label: string;
|
|
messageForOrganizer?: string;
|
|
iconUrl?: string;
|
|
variable?: "locationLink";
|
|
defaultValueVariable?: "link";
|
|
attendeeInputType?: null;
|
|
attendeeInputPlaceholder?: null;
|
|
};
|
|
|
|
type StaticLinkBasedEventLocation = {
|
|
linkType: "static";
|
|
urlRegExp: string;
|
|
organizerInputPlaceholder?: string;
|
|
organizerInputType?: "text" | "phone";
|
|
} & CommonProperties;
|
|
|
|
type DynamicLinkBasedEventLocation = {
|
|
linkType: "dynamic";
|
|
urlRegExp?: null;
|
|
organizerInputType?: null;
|
|
organizerInputPlaceholder?: null;
|
|
} & CommonProperties;
|
|
|
|
export type EventLocationTypeFromAppMeta = StaticLinkBasedEventLocation | DynamicLinkBasedEventLocation;
|
|
|
|
type PaidAppData = {
|
|
priceInUsd: number;
|
|
priceId: string;
|
|
trial?: number;
|
|
mode?: "subscription" | "one_time";
|
|
};
|
|
|
|
type AppData = {
|
|
/**
|
|
* TODO: We must assert that if `location` is set in App config.json, then it must have atleast Messaging or Conferencing as a category.
|
|
* This is because we fetch only those credentials(as an optimization) which match that category.
|
|
*/
|
|
location?: EventLocationTypeFromAppMeta;
|
|
tag?: Tag;
|
|
} | null;
|
|
|
|
/**
|
|
* This is the definition for an app store's app metadata.
|
|
* This is used to display App info, categorize or hide certain apps in the app store.
|
|
*/
|
|
export interface App {
|
|
/**
|
|
* @deprecated
|
|
* Whether if the app is installed or not. Usually we check for api keys in env
|
|
* variables to determine if this is true or not.
|
|
* */
|
|
installed?: boolean;
|
|
/** The app type */
|
|
type:
|
|
| `${string}_calendar`
|
|
| `${string}_messaging`
|
|
| `${string}_payment`
|
|
| `${string}_video`
|
|
| `${string}_other`
|
|
| `${string}_automation`
|
|
| `${string}_analytics`
|
|
| `${string}_crm`
|
|
| `${string}_other_calendar`;
|
|
|
|
/**
|
|
* @deprecated
|
|
*
|
|
* Use name instead. Remove this property after ensuring name has the required value everywhere
|
|
* */
|
|
title?: string;
|
|
/** The display name for the app */
|
|
name: string;
|
|
/** A brief description, usually found in the app's package.json */
|
|
description: string;
|
|
/** TODO determine if we should use this instead of category */
|
|
variant:
|
|
| "calendar"
|
|
| "payment"
|
|
| "conferencing"
|
|
| "video"
|
|
| "other"
|
|
| "other_calendar"
|
|
| "automation"
|
|
| "crm";
|
|
/** The slug for the app store public page inside `/apps/[slug] */
|
|
slug: string;
|
|
|
|
/** The category to which this app belongs. Remove all usages of category and then remove the prop */
|
|
/*
|
|
* @deprecated Use categories
|
|
*/
|
|
category?: string;
|
|
|
|
/** The category to which this app belongs. */
|
|
/**
|
|
* Messaging and Conferencing(Earlier called Video) are considered location apps and are fetched when configuring an event-type location.
|
|
*/
|
|
categories: AppCategories[];
|
|
/**
|
|
* `User` is the broadest category. `EventType` is when you want to add features to EventTypes.
|
|
* See https://app.gitbook.com/o/6snd8PyPYMhg0wUw6CeQ/s/VXRprBTuMlihk37NQgUU/~/changes/6xkqZ4qvJ3Xh9k8UaWaZ/engineering/product-specs/app-store#user-apps for more details
|
|
*/
|
|
extendsFeature?: "EventType" | "User";
|
|
/** An absolute url to the app logo */
|
|
logo: string;
|
|
/** Company or individual publishing this app */
|
|
publisher: string;
|
|
/** App's website */
|
|
url: string;
|
|
/** Optional documentation website URL */
|
|
docsUrl?: string;
|
|
/** Wether if the app is verified by Cal.com or not */
|
|
verified?: boolean;
|
|
/** Wether the app should appear in the trending section of the app store */
|
|
trending?: boolean;
|
|
/** Rating from 0 to 5, harcoded for now. Should be fetched later on. */
|
|
rating?: number;
|
|
/** Number of reviews, harcoded for now. Should be fetched later on. */
|
|
reviews?: number;
|
|
/**
|
|
* Whether if the app is installed globally or needs user intervention.
|
|
* Used to show Connect/Disconnect buttons in App Store
|
|
* */
|
|
isGlobal?: boolean;
|
|
/**
|
|
* For apps that are accessible on an alternate URL(which is simpler and shorter), this can be set.
|
|
* e.g. Routing Forms App is available as /routing-forms in addition to regular /apps/routing-forms.
|
|
*/
|
|
simplePath?: string;
|
|
/** A contact email, mainly to ask for support */
|
|
email: string;
|
|
/** Needed API Keys (usually for global apps) */
|
|
key?: Prisma.JsonValue;
|
|
/** If not free, what kind of fees does the app have */
|
|
feeType?: "monthly" | "usage-based" | "one-time" | "free";
|
|
/** 0 = free. if type="usage-based" it's the price per booking */
|
|
price?: number;
|
|
/** only required for "usage-based" billing. % of commission for paid bookings */
|
|
commission?: number;
|
|
licenseRequired?: boolean;
|
|
teamsPlanRequired?: {
|
|
upgradeUrl: string;
|
|
};
|
|
appData?: AppData;
|
|
/** Represents paid app data, such as price, trials, etc */
|
|
paid?: PaidAppData;
|
|
|
|
/**
|
|
* @deprecated
|
|
* Used only by legacy apps which had slug different from their directory name.
|
|
*/
|
|
dirName?: string;
|
|
isTemplate?: boolean;
|
|
__template?: string;
|
|
/** Slug of an app needed to be installed before the current app can be added */
|
|
dependencies?: string[];
|
|
/** Enables video apps to be used for team events. Non Video/Conferencing apps don't honor this as they support team installation always. */
|
|
concurrentMeetings?: boolean;
|
|
|
|
createdAt?: string;
|
|
/** Specifies if the App uses an OAuth flow */
|
|
isOAuth?: boolean;
|
|
/**
|
|
* Specifies if the App supports domain-wide delegation
|
|
*/
|
|
domainWideDelegation?: {
|
|
workspacePlatformSlug: string;
|
|
};
|
|
}
|
|
|
|
export type AppFrontendPayload = Omit<App, "key"> & {
|
|
/** We should type error if keys are leaked to the frontend */
|
|
isDefault?: boolean;
|
|
key?: never;
|
|
dependencyData?: {
|
|
name?: string;
|
|
installed?: boolean;
|
|
}[];
|
|
/** Number of users who currently have this App installed */
|
|
installCount?: number;
|
|
};
|
|
|
|
export type AppMeta = App;
|