* chore: Upgrade prisma to 6.7.0 * Build fixes * type fixes Signed-off-by: Omar López <zomars@me.com> * Update schema.prisma * Patching * Revert "Update schema.prisma" This reverts commit 47d8618bf89ef4d007b30084df766f17281e21a1. * Revert "Patching" This reverts commit a1d2e3040e71690a44d4324db95d73b4d68c6adb. * Revert schema changes Signed-off-by: Omar López <zomars@me.com> * WIP Signed-off-by: Omar López <zomars@me.com> * Update getPublicEvent.ts * Update imports Signed-off-by: Omar López <zomars@me.com> * Update gitignore Signed-off-by: Omar López <zomars@me.com> * update remaining imports Signed-off-by: Omar López <zomars@me.com> * Delete .cursor/config.json * Discard changes to packages/features/eventtypes/lib/getPublicEvent.ts * Update _get.ts * Update user.ts * Update .gitignore * update * Update WorkflowStepContainer.tsx * Update next-auth-custom-adapter.ts * Update getPublicEvent.ts * Update workflow.ts * Update next-auth-custom-adapter.ts * Update next-auth-options.ts * Update bookingScenario.ts * fix missing imports * upgrades prismock Signed-off-by: Omar López <zomars@me.com> * patches prismock Signed-off-by: Omar López <zomars@me.com> * Update reschedule.test.ts * Update prisma.ts * patch prismock Signed-off-by: Omar López <zomars@me.com> * fix enums imports Signed-off-by: Omar López <zomars@me.com> * Revert "Update prisma.ts" This reverts commit 64edcf8db54171ff4456c209d563b5d431d99619. * Revert "patch prismock" This reverts commit e95819113dc9d88e7130947aa120cd42710977c8. * fix patch * Fix test that overrun the boundary, it shouldn't test too much * Move prisma import to changeSMSLockState * Bring back broken test without illegal imports * Merge with main and fix filter hosts by same round robin host * Fixed buildDryRunBooking fn tests * Fix and move ooo create or update handler test * Fix packages/features/eventtypes/lib/isCurrentlyAvailable.test.ts * Fix packages/trpc/server/routers/viewer/organizations/listMembers.handler.test.ts * Mock @calcom/prisma * Fix: verify-email.test.ts * fix: Moved WebhookService test and fixed default import mock * Fix: Added missing prisma mock, handleNewBooking uses that of course * We're not testing createContext here * fix: Prisma mock fix for listMembers.test.ts * More fixes to broken testcases * Forgot to remove borked test * Prevent the need to mock a lot of dependencies by moving out buildBaseWhereCondition to its own file * Temporarily skip getCalendarEvents, needs a rewrite * Fix: turns out you can access protected in testcases * fix further mocks * Added packages/features/insights/server/buildBaseWhereCondition.ts, types * Always great to have a mock and then not use it * And one less again. * fix: confirm.handler.test, didn't mock prisma * fix: Address minor nit by @eunjae & fix ImpersonationProvider test * Updated isPrismaAvailableCheck that doesn't crash on import * fix: Get Prisma directly from the client, it usually involves the Validator and does not need 'local' inclusion * Add zod-prisma-types without the generator enabled (commented out) * Uncomment and see what happens * Change method of import as imports did not work in Input Schemas * Remove custom 'zod' booking model, it does not belong with Prisma * Fix all other global Model imports * Rewrite most schema includes AND remove barrel file * Add bookingCreateBodySchema to features/bookings * Flurry of type fixes for compatibility with new zod gen * Refactor out the custom prisma type createEventTypeInput * Work around nullable eventTypeLocations * HandlePayment type fix * More fixes, final fix remaining is CompleteEventType * Should fix a bunch more booking related type errors * Missed one * Some props missing from BookingCreateBodySchema * Fix location type in handleChildrenEventTypes * Little bit hacky imo but it works * Final type error \o/ * Forgot to include Prisma * Do not include zod-utils in booker/types * Oops, was already including Booker/types * Fix membership type, also disallow updating createdAt/updatedAt, make part of patch/post * Fix api v1 type errors * Fix EventTypeDescription typings * Remove getParserWithGeneric, use userBodySchema with UserSchema * use centralized timeZoneSchema * Implement feedback by @zomars * Couple of WIP pushes * Fix tests * Type fixes in `handleChildrenEventTypes` test * Try and parse metadata before use * Change zod-prisma-types configuration for optimal performance * Fix prisma validator error in `prisma/selects/credential` * Disable seperate relations model, hits a bug * Import absolute - this makes rollup work in @platform/libraries * Attempt at removing resolutions override * Refactor using `Prisma.validator` to `satisfies` * Build atoms using @calcom/prisma/client * Build atoms using @calcom/prisma/client * fixes * Update eventTypeSelect.ts * Adjust `eventTypeMetaDataSchemaWithUntypedApps` from `unknown` to `record(any)` * `EventTypeDescription` rely on `descriptionAsSafeHTML` instead of `description` * Add `seatsPerTimeSlot` to event type public select * Fix typing in `users-public-view` getServerSide props * Add missing `schedulingType` to prop * chore: bump platform libraries * Function return type is illegal, not sure how this passed eslint (#21567) * Merged with main * Update updateTokenObject.ts * Update handleResponse.ts * Update index.ts * Update handleChildrenEventTypes.ts * Update booking-idempotency-key.ts * Update WebhookService.test.ts * Update events.test.ts * Update queued-response.test.ts * Update events.test.ts * Update getRoutedUrl.test.ts * fix: type checks Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * chore: bump platform libraries * Update yarn.lock * more fixes Signed-off-by: Omar López <zomars@me.com> * fixes Signed-off-by: Omar López <zomars@me.com> * biuld fixes * chore: bump platform libraries * Update conferencing.repository.ts * Update conferencing.repository.ts * Update getCalendarsEvents.test.ts * Update vite.config.js * chore: bump platform libraries * Update users.ts * Discard changes to docs/api-reference/v2/openapi.json * Update vite.config.ts * updated platform libraries * Update get.handler.test.ts * Update get.handler.test.ts * Update schema.prisma * Discard changes to docs/api-reference/v2/openapi.json * Update next-auth-custom-adapter.ts * Update team.ts * Flurry of type fixes * Fix majority of insight related type errors * Type fixes for unlink of account * Make user nullable again * Fixed a bunch of unit tests and one type error * Attempted mock fix * Attempted fix for Attribute type * Ensure default import becomes prisma, but not direct usage * Import default as prisma in prisma.module * Add attributeOption to attribute type * Fix calcom/prisma mock * Refactor Prisma client imports to @calcom/prisma/client Updated all imports from '@prisma/client' to '@calcom/prisma/client' across tests and repository files for consistency and to use the correct Prisma client package. This change improves maintainability and ensures the correct client is referenced throughout the codebase. * Undo removal of max-warnings=0 to get main to merge * Remove unit tests for e2e fixtures, provide new prisma mock * Mock @calcom/prisma in event manager * Mock @calcom/prisma in event manager * Add correct format even with --no-verify * Mock prisma in CalendarManager * Add mock for permission-check.service * Better injection in PrismaApiKeyRepository imports * More mock fixes :) * Fix listMembers.handler.test * Fix User import * Appropriately adjust all types to be imported as types, there were a lot of types imported as normal deps * Why was this a thing? * Strictly speaking; Not using prismock anymore * Ditched patch file for prismock * Fix output.service.ts platform type imports, need concrete for plainToClass * Better typing and tests for unlinkConnectedAccount.handler * Small type fix * Disable calendar cache tests as they are dependent on prismock * chore: bump platform lib * getRoutedUrl test remove of unused import * Extract select to external const on getEventTypesFromDB * Direct select of userSelect from selects/user * fix type error from merging 23653 * Fixed integration tests by removing hardcoded values that were possible due to mocking, but as its now directly hitting the db no longer * fix: vite config atoms prisma client type location * revert: example app prisma client * revert: example app prisma client * bump platform libs * fix: use class instead of type for DI of PlatformBookingsService * update platform libs * remove unused variable * chore: generate prisma client for api v2 * fix: api v2 e2e * fix: atoms e2e * fix: atoms e2e * fix: atoms e2e * fix: api v2 e2e * fix: tsconfig apiv2 enums * publish libraries * Simplify check for existence teamId --------- Signed-off-by: Omar López <zomars@me.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com> Co-authored-by: supalarry <laurisskraucis@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com>
311 lines
11 KiB
TypeScript
311 lines
11 KiB
TypeScript
"use client";
|
|
|
|
import { signOut, useSession } from "next-auth/react";
|
|
import { useState } from "react";
|
|
import { useForm } from "react-hook-form";
|
|
|
|
import SectionBottomActions from "@calcom/features/settings/SectionBottomActions";
|
|
import { useLocale } from "@calcom/lib/hooks/useLocale";
|
|
import { IdentityProvider } from "@calcom/prisma/enums";
|
|
import { userMetadata as userMetadataSchema } from "@calcom/prisma/zod-utils";
|
|
import type { RouterOutputs } from "@calcom/trpc/react";
|
|
import { trpc } from "@calcom/trpc/react";
|
|
import classNames from "@calcom/ui/classNames";
|
|
import { Alert } from "@calcom/ui/components/alert";
|
|
import { Button } from "@calcom/ui/components/button";
|
|
import { Form } from "@calcom/ui/components/form";
|
|
import { PasswordField } from "@calcom/ui/components/form";
|
|
import { Select } from "@calcom/ui/components/form";
|
|
import { SettingsToggle } from "@calcom/ui/components/form";
|
|
import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
|
|
import { showToast } from "@calcom/ui/components/toast";
|
|
|
|
type ChangePasswordSessionFormValues = {
|
|
oldPassword: string;
|
|
newPassword: string;
|
|
sessionTimeout?: number;
|
|
apiError: string;
|
|
};
|
|
|
|
interface PasswordViewProps {
|
|
user: RouterOutputs["viewer"]["me"]["get"];
|
|
}
|
|
|
|
const SkeletonLoader = () => {
|
|
return (
|
|
<SkeletonContainer>
|
|
<div className="border-subtle space-y-6 border-x px-4 py-8 sm:px-6">
|
|
<SkeletonText className="h-8 w-full" />
|
|
<SkeletonText className="h-8 w-full" />
|
|
<SkeletonText className="h-8 w-full" />
|
|
</div>
|
|
<div className="rounded-b-xl">
|
|
<SectionBottomActions align="end">
|
|
<SkeletonButton className="ml-auto h-8 w-20 rounded-md" />
|
|
</SectionBottomActions>
|
|
</div>
|
|
</SkeletonContainer>
|
|
);
|
|
};
|
|
|
|
const PasswordView = ({ user }: PasswordViewProps) => {
|
|
const { data } = useSession();
|
|
const { t } = useLocale();
|
|
const utils = trpc.useUtils();
|
|
const metadata = userMetadataSchema.safeParse(user?.metadata);
|
|
const initialSessionTimeout = metadata.success ? metadata.data?.sessionTimeout : undefined;
|
|
|
|
const [sessionTimeout, setSessionTimeout] = useState<number | undefined>(initialSessionTimeout);
|
|
|
|
const sessionMutation = trpc.viewer.me.updateProfile.useMutation({
|
|
onSuccess: (data) => {
|
|
showToast(t("session_timeout_changed"), "success");
|
|
formMethods.reset(formMethods.getValues());
|
|
setSessionTimeout(data.metadata?.sessionTimeout);
|
|
},
|
|
onSettled: () => {
|
|
utils.viewer.me.invalidate();
|
|
},
|
|
onMutate: async () => {
|
|
await utils.viewer.me.get.cancel();
|
|
const previousValue = await utils.viewer.me.get.getData();
|
|
const previousMetadata = userMetadataSchema.safeParse(previousValue?.metadata);
|
|
|
|
if (previousValue && sessionTimeout && previousMetadata.success) {
|
|
utils.viewer.me.get.setData(undefined, {
|
|
...previousValue,
|
|
metadata: { ...previousMetadata?.data, sessionTimeout: sessionTimeout },
|
|
});
|
|
return { previousValue };
|
|
}
|
|
},
|
|
onError: (error, _, context) => {
|
|
if (context?.previousValue) {
|
|
utils.viewer.me.get.setData(undefined, context.previousValue);
|
|
}
|
|
showToast(`${t("session_timeout_change_error")}, ${error.message}`, "error");
|
|
},
|
|
});
|
|
const passwordMutation = trpc.viewer.auth.changePassword.useMutation({
|
|
onSuccess: () => {
|
|
showToast(t("password_has_been_changed"), "success");
|
|
formMethods.resetField("oldPassword");
|
|
formMethods.resetField("newPassword");
|
|
|
|
if (data?.user.role === "INACTIVE_ADMIN") {
|
|
/*
|
|
AdminPasswordBanner component relies on the role returned from the session.
|
|
Next-Auth doesn't provide a way to revalidate the session cookie,
|
|
so this a workaround to hide the banner after updating the password.
|
|
discussion: https://github.com/nextauthjs/next-auth/discussions/4229
|
|
*/
|
|
signOut({ callbackUrl: "/auth/login" });
|
|
}
|
|
},
|
|
onError: (error) => {
|
|
showToast(`${t("error_updating_password")}, ${t(error.message)}`, "error");
|
|
|
|
formMethods.setError("apiError", {
|
|
message: t(error.message),
|
|
type: "custom",
|
|
});
|
|
},
|
|
});
|
|
|
|
const createAccountPasswordMutation = trpc.viewer.auth.createAccountPassword.useMutation({
|
|
onSuccess: () => {
|
|
showToast(t("password_reset_email", { email: user.email }), "success");
|
|
},
|
|
onError: (error) => {
|
|
showToast(`${t("error_creating_account_password")}, ${t(error.message)}`, "error");
|
|
},
|
|
});
|
|
|
|
const formMethods = useForm<ChangePasswordSessionFormValues>({
|
|
defaultValues: {
|
|
oldPassword: "",
|
|
newPassword: "",
|
|
},
|
|
});
|
|
|
|
const handleSubmit = (values: ChangePasswordSessionFormValues) => {
|
|
const { oldPassword, newPassword } = values;
|
|
|
|
if (!oldPassword.length) {
|
|
formMethods.setError(
|
|
"oldPassword",
|
|
{ type: "required", message: t("error_required_field") },
|
|
{ shouldFocus: true }
|
|
);
|
|
}
|
|
|
|
if (!newPassword.length) {
|
|
formMethods.setError(
|
|
"newPassword",
|
|
{ type: "required", message: t("error_required_field") },
|
|
{ shouldFocus: true }
|
|
);
|
|
}
|
|
|
|
if (oldPassword && newPassword) {
|
|
passwordMutation.mutate({ oldPassword, newPassword });
|
|
}
|
|
};
|
|
|
|
const timeoutOptions = [5, 10, 15].map((mins) => ({
|
|
label: t("multiple_duration_mins", { count: mins }),
|
|
value: mins,
|
|
}));
|
|
|
|
const isDisabled = formMethods.formState.isSubmitting || !formMethods.formState.isDirty;
|
|
|
|
const passwordMinLength = data?.user.role === "USER" ? 7 : 15;
|
|
const isUser = data?.user.role === "USER";
|
|
|
|
return (
|
|
<>
|
|
{user && user.identityProvider !== IdentityProvider.CAL && !user.passwordAdded ? (
|
|
<div className="border-subtle rounded-b-xl border border-t-0">
|
|
<div className="px-4 py-6 sm:px-6">
|
|
<h2 className="font-cal text-emphasis text-lg font-medium leading-6">
|
|
{t("account_managed_by_identity_provider", {
|
|
provider: IdentityProvider[user.identityProvider],
|
|
})}
|
|
</h2>
|
|
|
|
<p className="text-subtle mt-1 text-sm">
|
|
{t("account_managed_by_identity_provider_description", {
|
|
provider: IdentityProvider[user.identityProvider],
|
|
})}
|
|
</p>
|
|
<Button
|
|
className="mt-3"
|
|
onClick={() => createAccountPasswordMutation.mutate()}
|
|
loading={createAccountPasswordMutation.isPending}>
|
|
{t("create_account_password")}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<Form form={formMethods} handleSubmit={handleSubmit}>
|
|
<div className="border-subtle border-x px-4 py-6 sm:px-6">
|
|
{formMethods.formState.errors.apiError && (
|
|
<div className="pb-6">
|
|
<Alert severity="error" message={formMethods.formState.errors.apiError?.message} />
|
|
</div>
|
|
)}
|
|
<div className="w-full sm:grid sm:grid-cols-2 sm:gap-x-6">
|
|
<div>
|
|
<PasswordField {...formMethods.register("oldPassword")} label={t("old_password")} />
|
|
</div>
|
|
<div>
|
|
<PasswordField
|
|
{...formMethods.register("newPassword", {
|
|
minLength: {
|
|
message: t(isUser ? "password_hint_min" : "password_hint_admin_min"),
|
|
value: passwordMinLength,
|
|
},
|
|
pattern: {
|
|
message: "Should contain a number, uppercase and lowercase letters",
|
|
value: /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[a-zA-Z]).*$/gm,
|
|
},
|
|
})}
|
|
label={t("new_password")}
|
|
/>
|
|
</div>
|
|
</div>
|
|
<p className="text-default mt-4 w-full text-sm">
|
|
{t("invalid_password_hint", { passwordLength: passwordMinLength })}
|
|
</p>
|
|
</div>
|
|
<SectionBottomActions align="end">
|
|
<Button
|
|
color="primary"
|
|
type="submit"
|
|
loading={passwordMutation.isPending}
|
|
onClick={() => formMethods.clearErrors("apiError")}
|
|
disabled={isDisabled || passwordMutation.isPending || sessionMutation.isPending}>
|
|
{t("update")}
|
|
</Button>
|
|
</SectionBottomActions>
|
|
<div className="mt-6">
|
|
<SettingsToggle
|
|
toggleSwitchAtTheEnd={true}
|
|
title={t("session_timeout")}
|
|
description={t("session_timeout_description")}
|
|
checked={sessionTimeout !== undefined}
|
|
data-testid="session-check"
|
|
onCheckedChange={(e) => {
|
|
if (!e) {
|
|
setSessionTimeout(undefined);
|
|
|
|
if (metadata.success) {
|
|
sessionMutation.mutate({
|
|
metadata: { ...metadata.data, sessionTimeout: undefined },
|
|
});
|
|
}
|
|
} else {
|
|
setSessionTimeout(10);
|
|
}
|
|
}}
|
|
childrenClassName="lg:ml-0"
|
|
switchContainerClassName={classNames(
|
|
"py-6 px-4 sm:px-6 border-subtle rounded-xl border",
|
|
!!sessionTimeout && "rounded-b-none"
|
|
)}>
|
|
<>
|
|
<div className="border-subtle border-x p-6 pb-8">
|
|
<div className="flex flex-col">
|
|
<p className="text-default mb-2 font-medium">{t("session_timeout_after")}</p>
|
|
<Select
|
|
options={timeoutOptions}
|
|
defaultValue={
|
|
sessionTimeout
|
|
? timeoutOptions.find((tmo) => tmo.value === sessionTimeout)
|
|
: timeoutOptions[1]
|
|
}
|
|
isSearchable={false}
|
|
className="block h-[36px] !w-auto min-w-0 flex-none rounded-md text-sm"
|
|
onChange={(event) => {
|
|
setSessionTimeout(event?.value);
|
|
}}
|
|
/>
|
|
</div>
|
|
</div>
|
|
<SectionBottomActions align="end">
|
|
<Button
|
|
color="primary"
|
|
loading={sessionMutation.isPending}
|
|
onClick={() => {
|
|
sessionMutation.mutate({
|
|
metadata: { ...metadata, sessionTimeout },
|
|
});
|
|
formMethods.clearErrors("apiError");
|
|
}}
|
|
disabled={
|
|
initialSessionTimeout === sessionTimeout ||
|
|
passwordMutation.isPending ||
|
|
sessionMutation.isPending
|
|
}>
|
|
{t("update")}
|
|
</Button>
|
|
</SectionBottomActions>
|
|
</>
|
|
</SettingsToggle>
|
|
</div>
|
|
</Form>
|
|
)}
|
|
</>
|
|
);
|
|
};
|
|
|
|
const PasswordViewWrapper = () => {
|
|
const { data: user, isPending } = trpc.viewer.me.get.useQuery({ includePasswordAdded: true });
|
|
const { t } = useLocale();
|
|
if (isPending || !user) return <SkeletonLoader />;
|
|
|
|
return <PasswordView user={user} />;
|
|
};
|
|
|
|
export default PasswordViewWrapper;
|