+1









Joe Au-Yeung
GitHub
Shaik-Sirajuddin <sirajuddinshaik30gmail.com>
Shaik-Sirajuddin
Shaik-Sirajuddin
sean-brydon
Omar López
CarinaWolli
sean-brydon
Carina Wollendorfer
Somay Chauhan
625a7ec180
* fix timezone display on booking page to reflect event availability timezone * migrate fetching event owner's schedule to server side * migrate fetching event owner's schedule to server side * fix e2e test errors * Add WEBAPP_URL_FOR_OAUTH to salesforce auth * In event manager constructor include "_crm" credentials as calendar creds * Change crm apps to type to end with `_crm` * Move sendgrid out of CRM * Add zoho bigin to CRM apps * When getting apps, use slug * Add `crm` variants * Hubspot Oauth use `WEBAPP_URL_FOR_OAUTH` * Refactor creating credentials * Fix empty CRM page * Use credentials with `_crm` * Abstract getAppCategoryTitle * Add integration.handler changes * Init crmManager * Change salesforce to CrmService * Create crmManager * Create contact on new event * Create event * Create new CRM reference * - Fix create new contact for salesforce - Add reschedule to crmManager * Create deleteAllCRMEvents * When searching for credential, look for current credentials in class * On cancel, delete 3rd party events * Add delete method * Type fix * Type fix * Convert Close.com to CrmService * Convert Close.com to CrmService * Move hubspot to CrmService * Convert Pipedrive to CrmService * Rename classes to CrmService * Move ZohoCrm to CrmService * Move Bigin to CrmService * Type return for CrmServices * Fix type errors * Close.com create leads and contacts * Fix tests * Type fix * Zoho bug fixes * Clean up * Type fixes * Remove apiDeletes * Type fixes * Specific typing * Type fix * Type fix * Type fix * Type fix * Type fix * feat: Enable CRM apps on a per event type basis (#14450) * Add Salesforce to be an event type app * Handle new booking, only get enabled CRM credentials * Abstract generating search params * Add close.com to event type * Clean up * Move hubspot to event type * Add pipedrive to event type * Add zoho bigin to event type * Add zoho crm to event type * Remove console.log * Add deleting CRM apps from event type * Delete event type apps * Fix deleting credentials * Add CRM app data to event type metadata * Backwards compatibility: add CRM credential if doesn't exist on event type * Don't include user CRM credentials for backwards comp * Backwards compatibility show CRM app is enabled and dirty field * Clean up * Type fixes * Type fixes * Type fix * Type fix * Remove console.log * Test fix * Upgrade embed-react vite version - dev * Change build can't find error message * Add back omni install prop * Clean up * Refactor `writeAppDataToEventType` * Use eventType repository in writeAppDataToEventType * Clean up old comments * Add error logging * createCRMEvents pass event uid as created event uid * Use `getUid` * Clean up props in create crm event * Small changes to `crmManager` * Fix zoho CRM * refactor crmManager * Undo vite config change * Fix teamId query * Fix bigin error * Remove need for `writeAppDataToEventType` * Add `getAllCredentials` test * Add crmManager tests * Type fixes * Fix type errors * Fix getAllCredentials test * Fix tests * Skip CRM manager tests for now * feat: Skip RR Assignment if Contact Exists In Salesforce (#14556) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Update yarn.lock * @zomars feedback - use new URL for state params * fix: update hook to not produce enabled === undefined * fix: update app card interfaces to use the new enabled from useIsAppEnabled * fix: feedback for crm RR skip (#15160) * code clean up * fix type any * test setup for RR lead skip * code clean up * simplify code * type error * finshed first test for RR lead skip * add seconds test * add test for handleNewBooking * test if teamMember is set * fix missing enabled key * fix tests * fix type error * use setSystemTime instead of getDate * remove nested if --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> * fix type error * fix: remove app metadata from all eventTypes on deleting the app * fix: update hook to not produce enabled === undefined (default to false) --------- Co-authored-by: Shaik-Sirajuddin <sirajuddinshaik30gmail.com> Co-authored-by: Shaik-Sirajuddin <sirajudddinshaik30@gmail.com> Co-authored-by: Shaik-Sirajuddin <89742297+Shaik-Sirajuddin@users.noreply.github.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: sean-brydon <sean@cal.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: Somay Chauhan <somaychauhan98@gmail.com>
148 lines
4.7 KiB
TypeScript
148 lines
4.7 KiB
TypeScript
import type { UseMutationOptions } from "@tanstack/react-query";
|
|
import { useMutation } from "@tanstack/react-query";
|
|
import { usePathname } from "next/navigation";
|
|
|
|
import type { IntegrationOAuthCallbackState } from "@calcom/app-store/types";
|
|
import { WEBAPP_URL } from "@calcom/lib/constants";
|
|
import type { App } from "@calcom/types/App";
|
|
|
|
import getInstalledAppPath from "./getInstalledAppPath";
|
|
|
|
function gotoUrl(url: string, newTab?: boolean) {
|
|
if (newTab) {
|
|
window.open(url, "_blank");
|
|
return;
|
|
}
|
|
window.location.href = url;
|
|
}
|
|
|
|
type CustomUseMutationOptions =
|
|
| Omit<UseMutationOptions<unknown, unknown, unknown, unknown>, "mutationKey" | "mutationFn" | "onSuccess">
|
|
| undefined;
|
|
|
|
type AddAppMutationData = { setupPending: boolean } | void;
|
|
type UseAddAppMutationOptions = CustomUseMutationOptions & {
|
|
onSuccess?: (data: AddAppMutationData) => void;
|
|
installGoogleVideo?: boolean;
|
|
returnTo?: string;
|
|
};
|
|
|
|
type useAddAppMutationVariables = {
|
|
type?: App["type"];
|
|
variant?: string;
|
|
slug?: string;
|
|
isOmniInstall?: boolean;
|
|
teamId?: number;
|
|
onErrorReturnTo?: string;
|
|
};
|
|
|
|
function useAddAppMutation(_type: App["type"] | null, allOptions?: UseAddAppMutationOptions) {
|
|
const { returnTo, ...options } = allOptions || {};
|
|
const pathname = usePathname();
|
|
const onErrorReturnTo = `${WEBAPP_URL}${pathname}`;
|
|
|
|
const mutation = useMutation<
|
|
AddAppMutationData,
|
|
Error,
|
|
| {
|
|
type?: App["type"];
|
|
variant?: string;
|
|
slug?: string;
|
|
isOmniInstall?: boolean;
|
|
teamId?: number;
|
|
defaultInstall?: boolean;
|
|
}
|
|
| ""
|
|
>({
|
|
...options,
|
|
mutationFn: async (variables) => {
|
|
let type: string | null | undefined;
|
|
let isOmniInstall;
|
|
const teamId = variables && variables.teamId ? variables.teamId : undefined;
|
|
const defaultInstall = variables && variables.defaultInstall ? variables.defaultInstall : undefined;
|
|
if (variables === "") {
|
|
type = _type;
|
|
} else {
|
|
isOmniInstall = variables.isOmniInstall;
|
|
type = variables.type;
|
|
}
|
|
if (type?.endsWith("_other_calendar")) {
|
|
type = type.split("_other_calendar")[0];
|
|
}
|
|
|
|
if (options?.installGoogleVideo && type !== "google_calendar")
|
|
throw new Error("Could not install Google Meet");
|
|
|
|
const state: IntegrationOAuthCallbackState = {
|
|
returnTo:
|
|
returnTo ||
|
|
WEBAPP_URL +
|
|
getInstalledAppPath(
|
|
{ variant: variables && variables.variant, slug: variables && variables.slug },
|
|
location.search
|
|
),
|
|
onErrorReturnTo,
|
|
fromApp: true,
|
|
...(type === "google_calendar" && { installGoogleVideo: options?.installGoogleVideo }),
|
|
...(teamId && { teamId }),
|
|
...(defaultInstall && { defaultInstall }),
|
|
};
|
|
|
|
const stateStr = encodeURIComponent(JSON.stringify(state));
|
|
const searchParams = generateSearchParamString({ stateStr, teamId, returnTo });
|
|
|
|
const res = await fetch(`/api/integrations/${type}/add${searchParams}`);
|
|
|
|
if (!res.ok) {
|
|
const errorBody = await res.json();
|
|
throw new Error(errorBody.message || "Something went wrong");
|
|
}
|
|
|
|
const json = await res.json();
|
|
const externalUrl = /https?:\/\//.test(json.url) && !json.url.startsWith(window.location.origin);
|
|
if (!isOmniInstall) {
|
|
gotoUrl(json.url, json.newTab);
|
|
return { setupPending: externalUrl || json.url.endsWith("/setup") };
|
|
}
|
|
|
|
// Skip redirection only if it is an OmniInstall and redirect URL isn't of some other origin
|
|
// This allows installation of apps like Stripe to still redirect to their authentication pages.
|
|
|
|
// Check first that the URL is absolute, then check that it is of different origin from the current.
|
|
if (externalUrl) {
|
|
// TODO: For Omni installation to authenticate and come back to the page where installation was initiated, some changes need to be done in all apps' add callbacks
|
|
gotoUrl(json.url, json.newTab);
|
|
return { setupPending: externalUrl };
|
|
}
|
|
|
|
return { setupPending: externalUrl || json.url.endsWith("/setup") };
|
|
},
|
|
});
|
|
|
|
return mutation;
|
|
}
|
|
|
|
export default useAddAppMutation;
|
|
const generateSearchParamString = ({
|
|
stateStr,
|
|
teamId,
|
|
returnTo,
|
|
}: {
|
|
stateStr: string;
|
|
teamId?: number;
|
|
returnTo?: string;
|
|
}) => {
|
|
const url = new URL("https://example.com"); // Base URL can be anything since we only care about the search params
|
|
|
|
url.searchParams.append("state", stateStr);
|
|
if (teamId !== undefined) {
|
|
url.searchParams.append("teamId", teamId.toString());
|
|
}
|
|
if (returnTo) {
|
|
url.searchParams.append("returnTo", returnTo);
|
|
}
|
|
|
|
// Return the search string part of the URL
|
|
return url.search;
|
|
};
|