+1

![cubic-dev-ai[bot] <1082092+cubic-dev-ai[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



![Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>](/assets/img/avatar_default.png)



Peer Richelsen
GitHub
lauris@cal.com <lauris@cal.com>
Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
eunjae@cal.com <hey@eunjae.dev>
Lauris Skraucis
supalarry
cubic-dev-ai[bot] <1082092+cubic-dev-ai[bot]@users.noreply.github.com>
CarinaWolli
lauris@cal.com <lauris@cal.com>
Morgan
a03722fd7f
* feat: add OAuth client developer settings page with approval workflow - Add new developer OAuth page at /settings/developer/oAuth for users to submit OAuth client requests - Transform admin OAuth page into management dashboard for reviewing/approving submissions - Add OAuthClientApprovalStatus enum (PENDING, APPROVED, REJECTED) to track submission status - Add userId and createdAt fields to OAuthClient model for tracking submissions - Create email notifications for admin (new submission) and user (approval) - Add sidebar navigation link in developer section below API keys - Add comprehensive translations for new UI strings - Create OAuthClientRepository for data access following repository pattern Co-Authored-By: peer@cal.com <peer@cal.com> * fix: re-export generateSecret for backward compatibility Co-Authored-By: peer@cal.com <peer@cal.com> * feat: make logo mandatory and list items clickable for OAuth clients Co-Authored-By: peer@cal.com <peer@cal.com> * fix: add missing translation keys and remove client secret from details dialog Co-Authored-By: peer@cal.com <peer@cal.com> * fix: address cubic AI reviewer comments - Remove duplicate 'there' JSON key in common.json - Add select clause to findByUserId to avoid exposing clientSecret - Add @@index([userId]) to OAuthClient model for query performance - Update migration to include the index Co-Authored-By: peer@cal.com <peer@cal.com> * fix: address PR review comments - fix indentation and use useCopy hook Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: change react-dom/server import to fix Turbopack compatibility Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * Revert "fix: change react-dom/server import to fix Turbopack compatibility" This reverts commit c3e0b709c2d88fd221143cb4ce9cd25bb8c94277. * fix: use email service pattern for OAuth client notifications Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: add try-catch around email sending to handle Turbopack react-dom/server issue Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * Revert "fix: add try-catch around email sending to handle Turbopack react-dom/server issue" This reverts commit fc9d47cd773505ebc5ee2696718aad4a8a98be77. * fix: improve OAuth client UI with skeleton loaders and smaller dialog styling - Replace 'Loading...' text with proper skeleton loaders in both developer and admin OAuth client views - Make client_id and copy button smaller in dialogs using size='sm' and text-sm styling - Add 'client_id' translation key to common.json for proper i18n Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix: improve skeleton loader to match actual OAuth client list structure - Remove divide-y from container and use conditional border-b on rows - Match the exact structure from oauth-clients-view.tsx L126-160 - Use proper spacing for text elements (mt-1 instead of space-y-2) Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * fix skeleton * rename the selected oauth client dialog * fix: address PR feedback - admin auth, dropdown styling, sidebar label - Add defense-in-depth admin authorization check in updateClientStatus handler - Fix broken dropdown menu by using DropdownItem with StartIcon prop - Fix sidebar menu label from 'oAuth' to 'oauth_clients' to match developer view Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * update common.json * feat: show client secret in approval email for confidential OAuth clients - Add regenerateSecret method to OAuthClientRepository - Regenerate secret when admin approves a PENDING confidential client - Include client secret in approval notification email - Add one-time warning message about storing the secret securely - Only regenerate on first approval (not re-approvals) Co-Authored-By: eunjae@cal.com <hey@eunjae.dev> * feat: add Website URL field, fix logo styling, show client secret after approval - Add Website URL field to OAuth client forms (admin and developer views) - Fix Upload Logo section styling by wrapping in Label div with proper gap - Display client secret in dialog after admin approves a confidential OAuth client - Add websiteUrl field to Prisma schema with migration - Update tRPC handlers and repository to support websiteUrl - Add translation keys for new UI elements Co-Authored-By: peer@cal.com <peer@cal.com> * fix: move clientSecret variable declaration outside if block for proper scoping Co-Authored-By: peer@cal.com <peer@cal.com> * refactor: dont expose client secret in emails * refactor: dont regenerate secret upon status change * refactor: reuse existing hash function * refactor: rename admin/oAuth to admin/oauth page * refactor: deduplicate oauth repositories * refactor: remove withGlobalPrisma from oauth repository * refactor: developer oauth page * refactor: oauth status by default accepted * refactor: request oauth status when creating * refactor ux * fix: address Cubic AI code review feedback - Add purpose field to plain text email body for accessibility - Convert NewOAuthClientButton to inline JSX to avoid React anti-pattern - Trigger re-approval when redirectUri changes for security - Add e.preventDefault() for Space key to prevent page scroll - Change default approvalStatus to PENDING for defense-in-depth - Use oauth_clients translation key for consistency - Add meaningful alt text to Avatar for accessibility - Remove onClick from DialogClose to prevent double-run close effects - Return NOT_FOUND for non-owner delete to prevent resource enumeration Co-Authored-By: unknown <> * common.json file * refactor: delete all prisma migrations * refactor: have just 1 prisma migration * revert: some devin changes * fix: typecheck * test: owner OAuth crud * test: admin OAuth approval / rejection * fix: address Cubic AI review feedback (confidence 9/10 issues) - schema.prisma: Remove @default("") from purpose field to make it required - schema.prisma: Use UTC-aware timezone expression for createdAt default - OAuthClientFormFields.tsx: Localize redirect URI placeholder using t() - common.json: Add redirect_uri_placeholder translation key Co-Authored-By: unknown <> * cubic changes * refactor: dont log sensitive info and rethrow error * cubic feedback * refactor: make oauth client purpose optional * refactor: admin/oauth not allowed if not logged in * refactor: admin view skeleton * refactor: rename state * refactor: get rid of redundant mapping * refactor: remove redundant handler * refactor: remove redundant handler * refactor: re-usable new oauth client button * refactor: dialogs * refactor: modals * refactor: handler names, dialog, skeleton * fix: purpose being null * refactor: rename handler and delete old oauth admin page * fix: purpose in submission * refactor: handler names * refactor: rename * refactor: update handler * refactor: rename approvalStatus -> status * refactor: simplify modal * refactor: name * dont require repproval if redirectUri changes * fix: remove integration sync index creation * refactor: require re-approval if redirectUri updated * fix: flaky e2e test * fix: flaky e2e test * fix: flaky e2e test * fix: remove duplicate common.json keys * refactor: replace team@cal.com with SUPPORT_MAIL_ADDRESS * refactor: generate client secret on handler level * fix: authorization code only available to approved clients * refactor: cubic review dont display exclamation * refactor: cubic review website_url in common json * fix: dont default in ui to approved status * refactor: optiona logo in schema create handler * fix: tests * fix: tests * fix: /authorize redirect if client not approved or show error * test: authorize page with invalid client id * refactor: dont allow refreshing tokens unless approved client * fix: flaky e2e test * fix: flaky e2e test * fix: flaky e2e test * fix: flaky e2e test * fix: flaky e2e test * fix: flaky e2e test * chore: warn that pending client is not usable * fix: approve and reject buttons * fix: /authorize show error if client not approved * refactor: info message about editing oauth client and status * change info alert to warning * try to fix ci test * debug: failing e2e test * fix: improve session propagation in oauth-client-admin E2E test - Add navigateToAdminOAuthPage helper that waits for listClients API call - If the API call doesn't arrive (session issue), reload page to force session refresh - This fixes the CI flakiness where admin page wasn't loading due to session not having ADMIN role Co-Authored-By: lauris@cal.com <lauris@cal.com> * fix: register waitForResponse before navigating in E2E test - Register the listClients waitForResponse promise BEFORE page.goto() - This ensures the response isn't missed during page load - Also register the promise before reload in the catch block Co-Authored-By: lauris@cal.com <lauris@cal.com> * fix: rename oAuth folder to oauth for case-sensitive filesystems The admin OAuth page route was at /settings/admin/oAuth (capital A) but the code references /settings/admin/oauth (lowercase). This caused 404 errors on case-sensitive filesystems (Linux). Also improved the E2E test navigation helper to retry with delays if the admin page doesn't load immediately, handling session propagation timing. Co-Authored-By: lauris@cal.com <lauris@cal.com> * test style --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: eunjae@cal.com <hey@eunjae.dev> Co-authored-by: Lauris Skraucis <lauris.skraucis@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: cubic-dev-ai[bot] <1082092+cubic-dev-ai[bot]@users.noreply.github.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: lauris@cal.com <lauris@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
294 lines
9.7 KiB
TypeScript
294 lines
9.7 KiB
TypeScript
"use client";
|
|
|
|
/* eslint-disable react-hooks/exhaustive-deps */
|
|
import { useSession } from "next-auth/react";
|
|
import { useRouter } from "next/navigation";
|
|
import { useState, useEffect } from "react";
|
|
|
|
import { APP_NAME } from "@calcom/lib/constants";
|
|
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { trpc } from "@calcom/trpc/react";
|
|
import { Avatar } from "@calcom/ui/components/avatar";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { Select } from "@calcom/ui/components/form";
|
|
import { Icon } from "@calcom/ui/components/icon";
|
|
|
|
export function Authorize() {
|
|
const { t } = useLocale();
|
|
const { status } = useSession();
|
|
|
|
const router = useRouter();
|
|
const searchParams = useCompatSearchParams();
|
|
|
|
const client_id = (searchParams?.get("client_id") as string) || "";
|
|
const redirect_uri = searchParams?.get("redirect_uri") as string;
|
|
const state = searchParams?.get("state") as string;
|
|
const scope = searchParams?.get("scope") as string;
|
|
const code_challenge = searchParams?.get("code_challenge") as string;
|
|
const code_challenge_method = searchParams?.get("code_challenge_method") as string;
|
|
|
|
const queryString = searchParams?.toString();
|
|
|
|
const [selectedAccount, setSelectedAccount] = useState<{ value: string; label: string } | null>();
|
|
const scopes = scope ? scope.toString().split(",") : [];
|
|
|
|
const {
|
|
data: client,
|
|
error: getClientError,
|
|
isPending: isPendingGetClient,
|
|
} = trpc.viewer.oAuth.getClientForAuthorization.useQuery(
|
|
{
|
|
clientId: client_id as string,
|
|
redirectUri: redirect_uri,
|
|
},
|
|
{
|
|
enabled: status === "authenticated" && !!redirect_uri,
|
|
}
|
|
);
|
|
|
|
const { data, isPending: isPendingProfiles } =
|
|
trpc.viewer.loggedInViewerRouter.teamsAndUserProfilesQuery.useQuery();
|
|
|
|
const generateAuthCodeMutation = trpc.viewer.oAuth.generateAuthCode.useMutation({
|
|
onSuccess: (data) => {
|
|
window.location.href =
|
|
data.redirectUrl ?? `${client?.redirectUri}?code=${data.authorizationCode}&state=${state}`;
|
|
},
|
|
onError: (error) => {
|
|
if (client?.redirectUri) {
|
|
redirectToOAuthError({
|
|
redirectUri: client.redirectUri,
|
|
trpcError: error,
|
|
state,
|
|
});
|
|
}
|
|
},
|
|
});
|
|
|
|
const mappedProfiles = data
|
|
? data
|
|
.filter((profile) => !profile.readOnly)
|
|
.map((profile) => ({
|
|
label: profile.name || profile.slug || "",
|
|
value: profile.slug || "",
|
|
}))
|
|
: [];
|
|
|
|
useEffect(() => {
|
|
if (mappedProfiles.length > 0) {
|
|
setSelectedAccount(mappedProfiles[0]);
|
|
}
|
|
}, [isPendingProfiles]);
|
|
|
|
// Auto-authorize trusted clients
|
|
useEffect(() => {
|
|
if (client?.isTrusted && selectedAccount) {
|
|
generateAuthCodeMutation.mutate({
|
|
clientId: client_id as string,
|
|
redirectUri: client.redirectUri,
|
|
scopes,
|
|
codeChallenge: code_challenge || undefined,
|
|
codeChallengeMethod: (code_challenge_method as "S256") || undefined,
|
|
state,
|
|
});
|
|
}
|
|
}, [client?.isTrusted, selectedAccount]);
|
|
|
|
useEffect(() => {
|
|
if (status === "unauthenticated") {
|
|
const urlSearchParams = new URLSearchParams({
|
|
callbackUrl: `auth/oauth2/authorize?${queryString}`,
|
|
});
|
|
// Pass register param directly so login page can hide "Don't have an account" link
|
|
const registerParam = searchParams?.get("register");
|
|
if (registerParam) {
|
|
urlSearchParams.set("register", registerParam);
|
|
}
|
|
router.replace(`/auth/login?${urlSearchParams.toString()}`);
|
|
}
|
|
}, [status]);
|
|
|
|
if (getClientError) {
|
|
return <div>{getClientError.message}</div>;
|
|
}
|
|
|
|
if (isPendingGetClient || isPendingProfiles || status !== "authenticated") {
|
|
return <></>;
|
|
}
|
|
|
|
if (!client) {
|
|
return <div>{t("unauthorized")}</div>;
|
|
}
|
|
|
|
// Don't show UI for trusted clients, they'll auto-authorize
|
|
if (client.isTrusted && selectedAccount) {
|
|
return (
|
|
<div className="flex justify-center pt-32">
|
|
<div className="flex items-center space-x-3">
|
|
<span className="text-lg font-medium text-gray-700">Authorizing...</span>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className="flex min-h-screen items-center justify-center">
|
|
<div className="bg-default border-subtle mt-2 max-w-xl rounded-md border px-9 pt-2 pb-3">
|
|
<div className="flex items-center justify-center">
|
|
<Avatar
|
|
alt=""
|
|
fallback={<Icon name="plus" className="text-subtle h-6 w-6" />}
|
|
className="items-center"
|
|
imageSrc={client.logo}
|
|
size="lg"
|
|
/>
|
|
<div className="relative -ml-6 h-24 w-24">
|
|
<div className="absolute inset-0 flex items-center justify-center">
|
|
<div className="bg-default flex h-[70px] w-[70px] items-center justify-center rounded-full">
|
|
<img src="/cal-com-icon.svg" alt="Logo" className="h-16 w-16 rounded-full" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<h1 className="px-5 pt-3 pb-5 text-center text-2xl font-bold tracking-tight">
|
|
{t("access_cal_account", { clientName: client.name, appName: APP_NAME })}
|
|
</h1>
|
|
<div className="mb-1 text-sm font-medium">{t("select_account_team")}</div>
|
|
<Select
|
|
isSearchable={true}
|
|
id="account-select"
|
|
onChange={(value) => {
|
|
setSelectedAccount(value);
|
|
}}
|
|
className="w-52"
|
|
defaultValue={selectedAccount || mappedProfiles[0]}
|
|
options={mappedProfiles}
|
|
/>
|
|
<div className="mt-5 mb-4 font-medium">{t("allow_client_to", { clientName: client.name })}</div>
|
|
<ul className="stack-y-4 text-sm">
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span>{" "}
|
|
{t("associate_with_cal_account", { clientName: client.name })}
|
|
</li>
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span> {t("see_personal_info")}
|
|
</li>
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span> {t("see_primary_email_address")}
|
|
</li>
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span> {t("connect_installed_apps")}
|
|
</li>
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span> {t("access_event_type")}
|
|
</li>
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span> {t("access_availability")}
|
|
</li>
|
|
<li className="relative pl-5">
|
|
<span className="absolute left-0">✓</span> {t("access_bookings")}
|
|
</li>
|
|
</ul>
|
|
<div className="bg-subtle mt-8 mb-8 flex rounded-md p-3">
|
|
<div>
|
|
<Icon name="info" className="mr-1 mt-0.5 h-4 w-4" />
|
|
</div>
|
|
<div className="ml-1">
|
|
<div className="mb-1 text-sm font-medium">
|
|
{t("allow_client_to_do", { clientName: client.name })}
|
|
</div>
|
|
<div className="text-sm">{t("oauth_access_information", { appName: APP_NAME })}</div>{" "}
|
|
</div>
|
|
</div>
|
|
<div className="border-subtle border- -mx-9 mb-4 border-b" />
|
|
<div className="flex justify-end">
|
|
<Button
|
|
className="mr-2"
|
|
color="minimal"
|
|
onClick={() => {
|
|
const separator = client.redirectUri.includes("?") ? "&" : "?";
|
|
const params = new URLSearchParams();
|
|
params.set("error", "access_denied");
|
|
if (state) {
|
|
params.set("state", state);
|
|
}
|
|
window.location.href = `${client.redirectUri}${separator}${params.toString()}`;
|
|
}}>
|
|
{t("go_back")}
|
|
</Button>
|
|
<Button
|
|
onClick={() => {
|
|
generateAuthCodeMutation.mutate({
|
|
clientId: client_id as string,
|
|
scopes,
|
|
redirectUri: client.redirectUri,
|
|
teamSlug: selectedAccount?.value.startsWith("team/")
|
|
? selectedAccount?.value.substring(5)
|
|
: undefined, // team account starts with /team/<slug>
|
|
codeChallenge: code_challenge || undefined,
|
|
codeChallengeMethod: (code_challenge_method as "S256") || undefined,
|
|
state,
|
|
});
|
|
}}
|
|
data-testid="allow-button">
|
|
{t("allow")}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function mapTrpcCodeToOAuthError(code: string | undefined) {
|
|
if (code === "BAD_REQUEST") return "invalid_request";
|
|
if (code === "UNAUTHORIZED") return "unauthorized_client";
|
|
return "server_error";
|
|
}
|
|
|
|
function buildOAuthErrorRedirectUrl({
|
|
redirectUri,
|
|
error,
|
|
errorDescription,
|
|
state,
|
|
}: {
|
|
redirectUri: string;
|
|
error: string;
|
|
errorDescription?: string;
|
|
state?: string;
|
|
}) {
|
|
const errorParams = new URLSearchParams({
|
|
error,
|
|
});
|
|
|
|
if (errorDescription) {
|
|
errorParams.append("error_description", errorDescription);
|
|
}
|
|
|
|
if (state) {
|
|
errorParams.append("state", state);
|
|
}
|
|
|
|
return `${redirectUri}${redirectUri.includes("?") ? "&" : "?"}${errorParams.toString()}`;
|
|
}
|
|
|
|
function redirectToOAuthError({
|
|
redirectUri,
|
|
trpcError,
|
|
state,
|
|
}: {
|
|
redirectUri: string;
|
|
trpcError: { data?: { code?: string } | null; message: string };
|
|
state?: string;
|
|
}) {
|
|
const redirectUrl = buildOAuthErrorRedirectUrl({
|
|
redirectUri,
|
|
error: mapTrpcCodeToOAuthError(trpcError.data?.code),
|
|
errorDescription: trpcError.message,
|
|
state,
|
|
});
|
|
|
|
window.location.href = redirectUrl;
|
|
}
|
|
|
|
export default Authorize; |