fix: admin password hint text (#6906)

* feat: use the trans hook * fix: hide AdminPasswordBanner * fix: translation * fix: style and use validation * fix: layout * fix: use trans keys * fix: replace number with placeholder * feat: add alert banner * fix: use the correct password length * fix: metadata not saved while creating a booking. (#6866) * feat: add metadata to booking creation * fix: bug * Beginning of Strict CSP Compliance (#6841) * Add CSP Support and enable it initially for Login page * Update README * Make sure that CSP is not enabled if CSP_POLICY isnt set * Add a new value for x-csp header that tells if instance has opted-in to CSP or not * Add more src to CSP * Fix typo in header name * Remove duplicate headers fn * Add https://eu.ui-avatars.com/api/ * Add CSP_POLICY to env.example * v2.5.10 * fix: add req.headers (#6921) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * add-console-vars (#6929) * Admin Wizard Choose License (#6574) * Implementation * i18n * More i18n * extracted i18n, needs api to get most recent price, added hint: update later * Fixing i18n var * Fix booking filters not working for admin (#6576) * fix: react-select overflow issue in some modals. (#6587) * feat: add a disable overflow prop * feat: use the disable overflow prop * Tailwind Merge (#6596) * Tailwind Merge * Fix merge classNames * [CAL-808] /availability/single - UI issue on buttons beside time inputs (#6561) * [CAL-808] /availability/single - UI issue on buttons beside time inputs * Update apps/web/public/static/locales/en/common.json * Update packages/features/schedules/components/Schedule.tsx * create new translation for tooltip Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Bye bye submodules (#6585) * WIP * Uses ssh instead * Update .gitignore * Update .gitignore * Update Makefile * Update git-setup.sh * Update git-setup.sh * Replaced Makefile with bash script * Update package.json * fix: show button on empty string (#6601) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: add delete in dropdown (#6599) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Update README.md * Update README.md * Changed a neutral- classes to gray (#6603) * Changed a neutral- classes to gray * Changed all border-1 to border * Update package.json * Test fixes * Yarn lock fixes * Fix string equality check in git-setup.sh * [CAL-811] Avatar icon not redirecting user back to the main page (#6586) * Remove cursor-pointer, remove old Avatar* files * Fixed styling for checkedSelect + some cleanup Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> * Harsh/add member invite (#6598) Co-authored-by: Guest <guest@pop-os.localdomain> Co-authored-by: root <harsh.singh@gocomet.com> * Regenerated lockfile without upgrade (#6610) * fix: remove annoying outline when <Button /> clicked (#6537) * fix: remove annoying outline when <Button /> clicked * Delete yarn.lock * remove 1 on 1 icon (#6609) * removed 1-on-1 badge * changed user to users for group events * fix: case-sensitivity in apps path (#6552) * fix: lowercase slug * fix: make fallback blocking * Fix FAB (#6611) * feat: add LocationSelect component (#6571) * feat: add LocationSelect component Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: type error Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * chore: type error Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Update booking filters design (#6543) * Update booking filters * Add filter on YOUR bookings * Fix pending members showing up in list * Reduce the avatar size to 'sm' for now * Bugfix/dropdown menu trigger as child remove class names (#6614) * Fix UsernameTextfield to take right height * Remove className side-effect * Incorrect resolution version fixed * Converted mobile DropdownMenuTrigger styles into Button * v2.5.3 * fix: use items-center (#6618) * fix tooltip and modal stacking issues (#6491) * fix tooltip and modal stacking issues * use z-index in larger screens and less Co-authored-by: Alex van Andel <me@alexvanandel.com> * Temporary fix (#6626) * Fix Ga4 tracking (#6630) * generic <UpgradeScreen> component (#6594) * first attempt of <UpgradeScreen> * changes to icons * reverted changes back to initial state, needs fix: teams not showing * WIP * Fix weird reactnode error * Fix loading text * added upgradeTip to routing forms * icon colors * create and use hook to check if user has team plan * use useTeamPlan for upgradeTeamsBadge * replace huge svg with compressed jpeg * responsive fixes * Update packages/ui/components/badge/UpgradeTeamsBadge.tsx Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> * Give team plan features to E2E tests * Allow option to make a user part of team int ests * Remove flash of paywall for team user * Add team user for typeform tests as well Co-authored-by: Peer Richelsen <peer@cal.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * Removing env var to rely on db * Restoring i18n keys, set loading moved * Fixing tailwind-preset glob * Wizard width fix for md+ screens * Converting licenses options to radix radio * Applying feedback + other tweaks * Reverting this, not this PR related * Unneeded code removal * Reverting unneeded style change * Applying feedback * Removing licenseType * Upgrades typescript * Update yarn lock * Typings * Hotfix: ping,riverside,whereby and around not showing up in list (#6712) * Hotfix: ping,riverside,whereby and around not showing up in list (#6712) (#6713) * Adds deployment settings to DB (#6706) * WIP * Adds DeploymentTheme * Add missing migrations * Adds client extensions for deployment * Cleanup * Delete migration.sql * Relying on both, env var and new model * Restoring env example doc for backward compat * Maximum call stack size exceeded fix? * Revert upgrade * Update index.ts * Delete index.ts * Not exposing license key, fixed radio behavior * Covering undefined env var * Self contained checkLicense * Feedback * Moar feedback * Feedback * Feedback * Feedback * Cleanup --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: Peer Richelsen <peer@cal.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: Nafees Nazik <84864519+G3root@users.noreply.github.com> Co-authored-by: GitStart-Cal.com <121884634+gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Harsh Singh <51085015+harshsinghatz@users.noreply.github.com> Co-authored-by: Guest <guest@pop-os.localdomain> Co-authored-by: root <harsh.singh@gocomet.com> Co-authored-by: Luis Cadillo <luiscaf3r@gmail.com> Co-authored-by: Mohammed Cherfaoui <hi@cherfaoui.dev> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> * added two new tips (#6915) * [CAL-488] Timezone selection has a weird double dropdown (#6851) Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> * fix: color and line height of icon (#6913) * fix: use destination calendar email (#6886) * fix: use destination calendar email to display correct primary email Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: simplify logic Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: dropdown title in bookings page (#6924) * fixes the broken max size of members on teams page (#6926) * fix: display provider name instead of url (#6914) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * fix: add sortByLabel (#6797) Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Email Variables Bug (#6943) * Remove _subject translations for zh-CN, needs retranslation * minor timezone-select improvements (#6944) * fixed timezone select positioning and hover * fixed timezone select positioning and hover * Give trackingId a default value because if user doesnt interact with trackingId input it is not set (#6945) * Block /auth/:path, nothing else. (#6949) * Block /auth/:path, nothing else. * Also add /signup * fix start icon in button (#6950) Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Fixes localisation of {EVENT_DATE} in workflows (#6907) * translate {EVENT_DATE} variable to correct language * fix locale for cron schedule reminder emails/sms * fix type error * add missing locale to attendees * fix type error * code clean up * revert last commit * using Intl for date translations --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> * Allow account linking for Google and SAML providers (#6874) * allow account linking for self-hosted instances, both Google and SAML are verified emails * allow account linking for Google and SSO if emails match with existing username/password account * Tweaked find user by email since we now have multiple providers (other than credentials provider) * feat/payment-service-6438-cal-767 (#6677) * WIP paymentService * Changes for payment Service * Fix for stripe payment flow * Remove logs/comments * Refactored refund for stripe app * Move stripe handlePayment to own lib * Move stripe delete payments to paymentService * lint fix * Change handleRefundError as generic function * remove log * remove logs * remove logs * Return stripe default export to lib/server * Fixing types * Fix types * Upgrades typescript * Update yarn lock * Typings * Hotfix: ping,riverside,whereby and around not showing up in list (#6712) * Hotfix: ping,riverside,whereby and around not showing up in list (#6712) (#6713) * Adds deployment settings to DB (#6706) * WIP * Adds DeploymentTheme * Add missing migrations * Adds client extensions for deployment * Cleanup * Revert "lint fix" This reverts commit e1a2e4a357e58e6673c47399888ae2e00d1351a6. * Add validation * Revert changes removed in force push * Removing abstract class and just leaving interface implementation * Fix types for handlePayments * Fix payment test appStore import * Fix stripe metadata in event type * Move migration to separate PR * Revert "Move migration to separate PR" This reverts commit 48aa64e0724a522d3cc2fefaaaee5792ee9cd9e6. * Update packages/prisma/migrations/20230125175109_remove_type_from_payment_and_add_app_relationship/migration.sql Co-authored-by: Omar López <zomars@me.com> --------- Co-authored-by: zomars <zomars@me.com> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> * Small UI fixes for seats & destination calendars (#6859) * Do not add former time for events on seats * Default display destination calendar * Add seats badge to event type item * Add string * Actively watch seats enabled option for requires confirmation * Only show former time when there is a rescheduleUid * fix: use typedquery hook in duplicate dialog (#6730) * fix: use typedquery hook in duplicate dialog Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> * Update packages/features/eventtypes/components/DuplicateDialog.tsx --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: Peer Richelsen <peer@cal.com> Co-authored-by: Omar López <zomars@me.com> * Fixing admin wizard step done (#6954) * Feature/maintenance mode (#6930) * Implement maintenance mode with Vercel Edge Config * Error log is spam during development/ added \n in .env.example * Exclude _next, /api for /maintenance page * Re-instate previous config * rtl: begone * Added note to explain why /auth/login covers the maintenance page. --------- Co-authored-by: Omar López <zomars@me.com> * Update package.json * I18N Caching (#6823) * Caching Logic Changes Enabled this function to change its cache value based on incoming paths value * Invalidate I18N Cache Invalidating the I18N cache when a user saves changes to their General settings * Removes deprecated useLocale location * Overriding the default getSchedule cache to have a revalidation time of 1 second * Update apps/web/pages/api/trpc/[trpc].ts * Updated cache values to match the comment --------- Co-authored-by: zomars <zomars@me.com> --------- Signed-off-by: Udit Takkar <udit.07814802719@cse.mait.ac.in> Co-authored-by: Hariom Balhara <hariombalhara@gmail.com> Co-authored-by: Omar López <zomars@me.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: alannnc <alannnc@gmail.com> Co-authored-by: Leo Giovanetti <hello@leog.me> Co-authored-by: Peer Richelsen <peer@cal.com> Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Co-authored-by: GitStart-Cal.com <121884634+gitstart-calcom@users.noreply.github.com> Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com> Co-authored-by: Peer Richelsen <peeroke@gmail.com> Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com> Co-authored-by: Harsh Singh <51085015+harshsinghatz@users.noreply.github.com> Co-authored-by: Guest <guest@pop-os.localdomain> Co-authored-by: root <harsh.singh@gocomet.com> Co-authored-by: Luis Cadillo <luiscaf3r@gmail.com> Co-authored-by: Mohammed Cherfaoui <hi@cherfaoui.dev> Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com> Co-authored-by: Joe Shajan <joeshajan1551@gmail.com> Co-authored-by: Ben Hybert <53020786+Hybes@users.noreply.github.com> Co-authored-by: Deepak Prabhakara <deepak@boxyhq.com> Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com> Co-authored-by: Aaron Presley <155617+AaronPresley@users.noreply.github.com>
2023-02-09 02:02:17 +00:00
parent 05f51459a6
commit 156f3e5de2
25 changed files with 92 additions and 57 deletions
@@ -1,7 +1,6 @@
 import { IdentityProvider } from "@prisma/client";
 import { GetServerSidePropsContext } from "next";
-import { Trans } from "next-i18next";
-import { useState } from "react";
+import { signOut, useSession } from "next-auth/react";
 import { useForm } from "react-hook-form";

 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
@@ -9,7 +8,7 @@ import { identityProviderNameMap } from "@calcom/lib/auth";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { userMetadata } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
-import { Button, Form, Meta, PasswordField, Select, SettingsToggle, showToast } from "@calcom/ui";
+import { Alert, Button, Form, Meta, PasswordField, Select, SettingsToggle, showToast } from "@calcom/ui";

 import { ssrInit } from "@server/lib/ssr";

@@ -17,9 +16,11 @@ type ChangePasswordSessionFormValues = {
  oldPassword: string;
  newPassword: string;
  sessionTimeout?: number;
+  apiError: string;
 };

 const PasswordView = () => {
+  const { data } = useSession();
  const { t } = useLocale();
  const utils = trpc.useContext();
  const { data: user } = trpc.viewer.me.useQuery();
@@ -58,9 +59,24 @@ const PasswordView = () => {
      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")}, ${error.message}`, "error");
+      showToast(`${t("error_updating_password")}, ${t(error.message)}`, "error");
+
+      formMethods.setError("apiError", {
+        message: t(error.message),
+        type: "custom",
+      });
    },
  });

@@ -91,6 +107,8 @@ const PasswordView = () => {

  const isDisabled = formMethods.formState.isSubmitting || !formMethods.formState.isDirty;

+  const passwordMinLength = data?.user.role === "USER" ? 7 : 15;
+  const isUser = data?.user.role === "USER";
  return (
    <>
      <Meta title={t("password")} description={t("password_description")} />
@@ -111,19 +129,34 @@ const PasswordView = () => {
        </div>
      ) : (
        <Form form={formMethods} handleSubmit={handleSubmit}>
-          <div className="max-w-[38rem] sm:flex sm:space-x-4">
-            <div className="flex-grow">
+          {formMethods.formState.errors.apiError && (
+            <div className="pb-6">
+              <Alert severity="error" message={formMethods.formState.errors.apiError?.message} />
+            </div>
+          )}
+
+          <div className="max-w-[38rem] sm:grid sm:grid-cols-2 sm:gap-x-4">
+            <div>
              <PasswordField {...formMethods.register("oldPassword")} label={t("old_password")} />
            </div>
-            <div className="flex-grow">
-              <PasswordField {...formMethods.register("newPassword")} label={t("new_password")} />
+            <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="mt-4 max-w-[38rem] text-sm text-gray-600">
-            <Trans i18nKey="invalid_password_hint">
-              Password must be at least at least 7 characters, mix of uppercase & lowercase letters, and
-              contain at least 1 number.
-            </Trans>
+            {t("invalid_password_hint", { passwordLength: passwordMinLength })}
          </p>
          <div className="mt-8 border-t border-gray-200 py-8">
            <SettingsToggle
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "إذا فقدت هذا السر أو نسيته، يمكنك تغييره، ولكن ضع في اعتبارك أن جميع التكاملات التي تستخدم هذا السر ستحتاج إلى تحديث",
  "current_incorrect_password": "كلمة المرور الحالية غير صحيحة",
  "password_hint_caplow": "مزيج من الحروف الكبيرة والحروف الصغيرة",
-  "password_hint_min": "8 أحرف كحد أدنى",
+  "password_hint_min": "7 أحرف كحد أدنى",
  "password_hint_admin_min": "15 محرفًا كحد أدنى",
  "password_hint_num": "يحتوي على رقم واحد على الأقل",
-  "invalid_password_hint": "يجب أن تتألف كلمة المرور على الأقل من 7 أحرف، ورقم واحد على الأقل، ومزيج من الحروف الكبيرة والصغيرة",
+  "invalid_password_hint": "يجب أن تتألف كلمة المرور على الأقل من {{passwordLength}} أحرف، ورقم واحد على الأقل، ومزيج من الحروف الكبيرة والصغيرة",
  "incorrect_password": "كلمة المرور غير صحيحة.",
  "24_h": "24 ساعة",
  "use_setting": "استخدام الإعداد",
@@ -423,7 +423,7 @@
  "password_hint_min": "Minimální délka 7 znaků",
  "password_hint_admin_min": "Minimální délka 15 znaků",
  "password_hint_num": "Obsahuje alespoň 1 číslo",
-  "invalid_password_hint": "Heslo musí být minimálně 7 znaků dlouhé, obsahovat alespoň jedno číslo a obsahovat kombinaci velkých a malých písmen",
+  "invalid_password_hint": "Heslo musí být minimálně {{passwordLength}} znaků dlouhé, obsahovat alespoň jedno číslo a obsahovat kombinaci velkých a malých písmen",
  "incorrect_password": "Heslo není správné.",
  "24_h": "24h",
  "use_setting": "Použít nastavení",
@@ -419,10 +419,10 @@
  "forgotten_secret_description": "Wenn Sie dieses Passwort verloren oder vergessen haben, können Sie es ändern. Bitte beachten Sie, dass alle Integrationen, die dieses Geheimnis nutzen, aktualisiert werden müssen",
  "current_incorrect_password": "Aktuelles Passwort ist falsch",
  "password_hint_caplow": "Mischung aus Groß- und Kleinbuchstaben",
-  "password_hint_min": "Mindestens 8 Zeichen lang",
+  "password_hint_min": "Mindestens 7 Zeichen lang",
  "password_hint_admin_min": "Mindestens 15 Zeichen lang",
  "password_hint_num": "Enthält mindestens 1 Zahl",
-  "invalid_password_hint": "Das Passwort muss mindestens 7 Zeichen lang sein und mindestens eine Nummer beinhalten, sowie eine Mischung aus Groß- und Kleinbuchstaben sein",
+  "invalid_password_hint": "Das Passwort muss mindestens {{passwordLength}} Zeichen lang sein und mindestens eine Nummer beinhalten, sowie eine Mischung aus Groß- und Kleinbuchstaben sein",
  "incorrect_password": "Passwort ist falsch",
  "24_h": "24 Std",
  "use_setting": "Benutze Einstellung",
@@ -428,10 +428,10 @@
  "forgotten_secret_description": "If you have lost or forgotten this secret, you can change it, but be aware that all integrations using this secret will need to be updated",
  "current_incorrect_password": "Current password is incorrect",
  "password_hint_caplow": "Mix of uppercase & lowercase letters",
-  "password_hint_min": "Minimum 8 characters long",
+  "password_hint_min": "Minimum 7 characters long",
  "password_hint_admin_min": "Minimum 15 characters long",
  "password_hint_num": "Contain at least 1 number",
-  "invalid_password_hint": "The password must be a minimum of 7 characters long containing at least one number and have a mixture of uppercase and lowercase letters",
+  "invalid_password_hint": "The password must be a minimum of {{passwordLength}} characters long containing at least one number and have a mixture of uppercase and lowercase letters",
  "incorrect_password": "Password is incorrect.",
  "incorrect_username_password": "Username or password is incorrect.",
  "24_h": "24h",
@@ -423,7 +423,7 @@
  "password_hint_min": "Mínimo 7 caracteres",
  "password_hint_admin_min": "Longitud mínima de 15 caracteres",
  "password_hint_num": "Debe contener al menos 1 número",
-  "invalid_password_hint": "La contraseña debe tener un mínimo de 7 caracteres que contengan al menos un número y una mezcla de letras mayúsculas y minúsculas",
+  "invalid_password_hint": "La contraseña debe tener un mínimo de {{passwordLength}} caracteres que contengan al menos un número y una mezcla de letras mayúsculas y minúsculas",
  "incorrect_password": "La Contraseña es Incorrecta.",
  "24_h": "24hs",
  "use_setting": "Usar Ajuste",
@@ -423,10 +423,10 @@
  "forgotten_secret_description": "Vous pouvez modifier ce secret si vous l'avez perdu ou oublié. Soyez cependant conscient que toutes les intégrations l'utilisant devront être mises à jour.",
  "current_incorrect_password": "Le mot de passe actuel est incorrect",
  "password_hint_caplow": "Mélange de lettres majuscules et minuscules",
-  "password_hint_min": "Minimum 8 caractères",
+  "password_hint_min": "Minimum 7 caractères",
  "password_hint_admin_min": "Minimum 15 caractères",
  "password_hint_num": "Contient au moins 1 chiffre",
-  "invalid_password_hint": "Le mot de passe doit contenir au moins 7 caractères, un chiffre et un mélange de lettres, majuscules et minuscules.",
+  "invalid_password_hint": "Le mot de passe doit contenir au moins {{passwordLength}} caractères, un chiffre et un mélange de lettres, majuscules et minuscules.",
  "incorrect_password": "Le mot de passe est incorrect.",
  "24_h": "24 h",
  "use_setting": "Utiliser le paramètre",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "אם שכחת או איבדת את הסוד, יש לך אפשרות לשנות אותו, אבל חשוב לזכור שיהיה צורך לעדכן את כל השילובים שבהם נעשה שימוש בסוד זה",
  "current_incorrect_password": "הסיסמה הנוכחית שגויה",
  "password_hint_caplow": "שילוב של אותיות רישיות וקטנות",
-  "password_hint_min": "באורך 8 תווים לפחות",
+  "password_hint_min": "באורך 7 תווים לפחות",
  "password_hint_admin_min": "באורך של 15 תווים לפחות",
  "password_hint_num": "לכלול לפחות ספרה אחת",
-  "invalid_password_hint": "הסיסמה חייבת להיות באורך של 7 תווים לפחות ולכלול לפחות ספרה אחת ושילוב של אותיות רישיות וקטנות",
+  "invalid_password_hint": "הסיסמה חייבת להיות באורך של {{passwordLength}} תווים לפחות ולכלול לפחות ספרה אחת ושילוב של אותיות רישיות וקטנות",
  "incorrect_password": "הסיסמה שגויה.",
  "24_h": "24 שעות",
  "use_setting": "השתמש בהגדרה",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Nel caso la parola segreta venga persa o dimenticata, è possibile cambiarla, ma tieni presente che tutte le integrazioni che la utilizzano dovranno essere aggiornate",
  "current_incorrect_password": "La password attuale non è corretta",
  "password_hint_caplow": "Combinazione di caratteri maiuscoli e minuscoli",
-  "password_hint_min": "La lunghezza minima è di 8 caratteri",
+  "password_hint_min": "La lunghezza minima è di 7 caratteri",
  "password_hint_admin_min": "La lunghezza minima è di 15 caratteri",
  "password_hint_num": "Deve contenere almeno 1 numero",
-  "invalid_password_hint": "La password deve avere una lunghezza minima di 7 caratteri e deve contenere almeno 1 numero e una combinazione di caratteri maiuscoli e minuscoli",
+  "invalid_password_hint": "La password deve avere una lunghezza minima di {{passwordLength}} caratteri e deve contenere almeno 1 numero e una combinazione di caratteri maiuscoli e minuscoli",
  "incorrect_password": "La password non è corretta.",
  "24_h": "24 ore",
  "use_setting": "Usa impostazione",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "このシークレットを紛失または忘れた場合は変更が可能です。しかしこのシークレットを使っている連携はすべて最新のものにする必要があります",
  "current_incorrect_password": "現在のパスワードが正しくありません",
  "password_hint_caplow": "アルファベットの大文字と小文字を両方使用してください",
-  "password_hint_min": "8 文字以上入力してください",
+  "password_hint_min": "7 文字以上入力してください",
  "password_hint_admin_min": "15 文字以上入力してください",
  "password_hint_num": "少なくとも 1 文字は数字を含めてください",
-  "invalid_password_hint": "パスワードには少なくとも 1 文字以上数字を含め、アルファベットの大文字と小文字を両方使用した上で 7 文字以上の長さに設定してください",
+  "invalid_password_hint": "パスワードには少なくとも 1 文字以上数字を含め、アルファベットの大文字と小文字を両方使用した上で {{passwordLength}} 文字以上の長さに設定してください",
  "incorrect_password": "パスワードが正しくありません。",
  "24_h": "24時間",
  "use_setting": "設定を使用",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Als u dit geheim vergeten of verloren bent, kunt u het wijzigen. Maar wees u ervan bewust dat alle integraties die dit geheim gebruiken bijgewerkt moeten worden",
  "current_incorrect_password": "Uw wachtwoord is verkeerd",
  "password_hint_caplow": "Mix van hoofd- en kleine letters",
-  "password_hint_min": "Minimaal 8 tekens lang",
+  "password_hint_min": "Minimaal 7 tekens lang",
  "password_hint_admin_min": "Minimaal 15 tekens lang",
  "password_hint_num": "Minimaal 1 cijfer bevatten",
-  "invalid_password_hint": "Het wachtwoord moet minimaal 7 tekens lang zijn, minimaal 1 cijfer bevatten en bestaan uit een mix van hoofd- en kleine letters",
+  "invalid_password_hint": "Het wachtwoord moet minimaal {{passwordLength}} tekens lang zijn, minimaal 1 cijfer bevatten en bestaan uit een mix van hoofd- en kleine letters",
  "incorrect_password": "Uw wachtwoord is incorrect.",
  "24_h": "24u",
  "use_setting": "Instelling gebruiken",
@@ -423,10 +423,10 @@
  "forgotten_secret_description": "Hvis du har mistet eller glemt denne hemmeligheten, kan du endre den, men vær oppmerksom på at alle integrasjoner som bruker denne hemmeligheten må oppdateres",
  "current_incorrect_password": "Nåværende passord er feil",
  "password_hint_caplow": "Blanding av store og små bokstaver",
-  "password_hint_min": "Minimum 8 tegn langt",
+  "password_hint_min": "Minimum 7 tegn langt",
  "password_hint_admin_min": "Minimum 15 tegn langt",
  "password_hint_num": "Inneholde minst 1 tall",
-  "invalid_password_hint": "Passordet må være minst 7 tegn langt og inneholde minst ett tall og ha en blanding av store og små bokstaver",
+  "invalid_password_hint": "Passordet må være minst {{passwordLength}} tegn langt og inneholde minst ett tall og ha en blanding av store og små bokstaver",
  "incorrect_password": "Passordet er feil.",
  "24_h": "24t",
  "use_setting": "Bruk innstilling",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Jeśli nie pamiętasz tego wpisu tajnego lub nie masz do niego dostępu, możesz go zmienić, ale pamiętaj, że wszystkie integracje korzystające z tego wpisu tajnego będą musiały zostać zaktualizowane.",
  "current_incorrect_password": "Bieżące hasło jest nieprawidłowe",
  "password_hint_caplow": "Kombinacja wielkich i małych liter",
-  "password_hint_min": "Długość co najmniej 8 znaków",
+  "password_hint_min": "Długość co najmniej 7 znaków",
  "password_hint_admin_min": "Długość co najmniej 15 znaków",
  "password_hint_num": "Zawrzyj co najmniej 1 cyfrę",
-  "invalid_password_hint": "Hasło musi składać się z co najmniej 7 znaków, zawierać co najmniej jedną cyfrę oraz kombinację wielkich i małych liter",
+  "invalid_password_hint": "Hasło musi składać się z co najmniej {{passwordLength}} znaków, zawierać co najmniej jedną cyfrę oraz kombinację wielkich i małych liter",
  "incorrect_password": "Hasło jest nieprawidłowe.",
  "24_h": "24 godz.",
  "use_setting": "Użyj ustawień",
@@ -423,7 +423,7 @@
  "password_hint_min": "Tamanho mínimo de 7 caracteres",
  "password_hint_admin_min": "Tamanho mínimo de 15 caracteres",
  "password_hint_num": "Contém pelo menos 1 número",
-  "invalid_password_hint": "A palavra-passe deve ter no mínimo 7 caracteres, com pelo menos um número e uma mistura de letras maiúsculas e minúsculas",
+  "invalid_password_hint": "A palavra-passe deve ter no mínimo {{passwordLength}} caracteres, com pelo menos um número e uma mistura de letras maiúsculas e minúsculas",
  "incorrect_password": "Palavra-Passe incorreta",
  "24_h": "24h",
  "use_setting": "Usar Configuração",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Dacă ați pierdut sau ați uitat acest secret, îl puteți modifica, dar rețineți că toate integrările cu acest secret vor trebui actualizate",
  "current_incorrect_password": "Parola curentă este incorectă",
  "password_hint_caplow": "Combinație de litere mari și litere mici",
-  "password_hint_min": "Cel puțin 8 caractere",
+  "password_hint_min": "Cel puțin 7 caractere",
  "password_hint_admin_min": "Cel puțin 15 caractere",
  "password_hint_num": "Conține cel puțin 1 cifră",
-  "invalid_password_hint": "Parola trebuie să aibă cel puțin 7 caractere, să conțină cel puțin o cifră și o combinație de litere mari și litere mici",
+  "invalid_password_hint": "Parola trebuie să aibă cel puțin {{passwordLength}} caractere, să conțină cel puțin o cifră și o combinație de litere mari și litere mici",
  "incorrect_password": "Parola este incorectă.",
  "24_h": "24h",
  "use_setting": "Folosește setarea",
@@ -423,7 +423,7 @@
  "password_hint_min": "Не короче 7 символов",
  "password_hint_admin_min": "Не короче 15 символов",
  "password_hint_num": "Не менее 1 цифры",
-  "invalid_password_hint": "Пароль должен быть не короче 7 символов и содержать заглавные и строчные буквы, а также не менее одной цифры",
+  "invalid_password_hint": "Пароль должен быть не короче {{passwordLength}} символов и содержать заглавные и строчные буквы, а также не менее одной цифры",
  "incorrect_password": "Неверный пароль",
  "24_h": "24 часа",
  "use_setting": "Использовать настройки",
@@ -423,7 +423,7 @@
  "password_hint_min": "Dugačka minimalno 7 znakova",
  "password_hint_admin_min": "Dugačka minimalno 15 znakova",
  "password_hint_num": "Sadrži barem 1 broj",
-  "invalid_password_hint": "Lozinka mora da bude dugačka najmanje 7 znakova, da sadrži najmanje jedan broj i da ima mešavinu velikih i malih slova",
+  "invalid_password_hint": "Lozinka mora da bude dugačka najmanje {{passwordLength}} znakova, da sadrži najmanje jedan broj i da ima mešavinu velikih i malih slova",
  "incorrect_password": "Lozinka je netačna.",
  "24_h": "24 sata",
  "use_setting": "Koristi podešavanje",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Om du tappat bort eller glömt den här hemligheten kan du ändra den, men var medveten om att alla integrationer som använder hemligheten måste uppdateras",
  "current_incorrect_password": "Nuvarande lösenord är felaktigt",
  "password_hint_caplow": "Blandning av versaler och gemener",
-  "password_hint_min": "Minst 8 tecken",
+  "password_hint_min": "Minst 7 tecken",
  "password_hint_admin_min": "Minst 15 tecken",
  "password_hint_num": "Innehåller minst 1 siffra",
-  "invalid_password_hint": "Lösenordet måste innehålla minst 7 tecken och har minst en siffra samt en blandning av versaler och gemener",
+  "invalid_password_hint": "Lösenordet måste innehålla minst {{passwordLength}} tecken och har minst en siffra samt en blandning av versaler och gemener",
  "incorrect_password": "Lösenordet är felaktigt.",
  "24_h": "24 timmar",
  "use_setting": "Använd inställning",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Bu gizli anahtarı kaybettiyseniz veya unuttuysanız değiştirebilirsiniz ancak bu gizli anahtarı kullanan tüm entegrasyonların güncellenmesi gerekecektir",
  "current_incorrect_password": "Mevcut şifre hatalı",
  "password_hint_caplow": "Büyük ve küçük harf karışımı",
-  "password_hint_min": "En az 8 karakter uzunluğunda",
+  "password_hint_min": "En az 7 karakter uzunluğunda",
  "password_hint_admin_min": "Minimum uzunluk 15 karakter",
  "password_hint_num": "En az 1 rakam içermelidir",
-  "invalid_password_hint": "Şifre en az 7 karakter uzunluğunda olmalı, en az bir rakam içermeli ve büyük ve küçük harflerin karışımından oluşmalıdır",
+  "invalid_password_hint": "Şifre en az {{passwordLength}} karakter uzunluğunda olmalı, en az bir rakam içermeli ve büyük ve küçük harflerin karışımından oluşmalıdır",
  "incorrect_password": "Şifre hatalı.",
  "24_h": "24 sa",
  "use_setting": "Ayarı kullan",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Якщо ви загубили або забули цей таємний код, його можна змінити, але в такому випадку потрібно буде оновити всі інтеграції, що використовують його.",
  "current_incorrect_password": "Поточний пароль неправильний",
  "password_hint_caplow": "Комбінація великих і малих літер",
-  "password_hint_min": "Щонайменше 8 символів завдовжки",
+  "password_hint_min": "Щонайменше 7 символів завдовжки",
  "password_hint_admin_min": "Щонайменше 15 символів",
  "password_hint_num": "Містить принаймні 1 цифру",
-  "invalid_password_hint": "Пароль має містити не менше ніж 7 символів: принаймні одну цифру та комбінацію великих і малих літер",
+  "invalid_password_hint": "Пароль має містити не менше ніж {{passwordLength}} символів: принаймні одну цифру та комбінацію великих і малих літер",
  "incorrect_password": "Пароль неправильний.",
  "24_h": "24 год",
  "use_setting": "Використовувати налаштування",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "Nếu bạn mất hoặc quên từ bí mật này, bạn có thể đổi nó, nhưng hãy biết cho tất cả mọi tích hợp dùng từ bí mật này sẽ cần được cập nhật",
  "current_incorrect_password": "Mật khẩu hiện tại không đúng",
  "password_hint_caplow": "Kết hợp các chữ cái in hoa & in thường",
-  "password_hint_min": "Dài tối thiểu 8 ký tự",
+  "password_hint_min": "Dài tối thiểu 7 ký tự",
  "password_hint_admin_min": "Dài tối thiểu 15 ký tự",
  "password_hint_num": "Chứa ít nhất 1 con số",
-  "invalid_password_hint": "Mật khẩu phải có tối thiểu 7 ký tự chứa ít nhất một con số và phải kết hợp chữ cái in hoa lẫn in thường",
+  "invalid_password_hint": "Mật khẩu phải có tối thiểu {{passwordLength}} ký tự chứa ít nhất một con số và phải kết hợp chữ cái in hoa lẫn in thường",
  "incorrect_password": "Mật khẩu không đúng.",
  "24_h": "24h",
  "use_setting": "Sử dụng cài đặt",
@@ -415,10 +415,10 @@
  "forgotten_secret_description": "如果您丢失或忘记此密码，您可以对其进行更改，但请注意，使用此密码的所有集成都需要更新",
  "current_incorrect_password": "当前密码不正确",
  "password_hint_caplow": "大写和小写字母混合",
-  "password_hint_min": "至少 8 个字符长",
+  "password_hint_min": "至少 7 个字符长",
  "password_hint_admin_min": "至少 15 个字符长",
  "password_hint_num": "包含至少 1 个数字",
-  "invalid_password_hint": "密码必须是至少 7 个字符长，包含至少一个数字，并且是大写和小写字母混合",
+  "invalid_password_hint": "密码必须是至少 {{passwordLength}} 个字符长，包含至少一个数字，并且是大写和小写字母混合",
  "incorrect_password": "密码不正确。",
  "24_h": "24 小时制",
  "use_setting": "使用设置",
@@ -420,10 +420,10 @@
  "forgotten_secret_description": "如果您已遺失或忘記此密碼，可以變更密碼，但請注意，所有使用此密碼的整合都需更新",
  "current_incorrect_password": "現有密碼不正確",
  "password_hint_caplow": "大小寫字母組合",
-  "password_hint_min": "至少 8 個字元長",
+  "password_hint_min": "至少 7 個字元長",
  "password_hint_admin_min": "至少 15 個字元長",
  "password_hint_num": "至少包含 1 個數字",
-  "invalid_password_hint": "密碼長度至少要有 7 個字元，其中包含至少一個數字和大小寫字母組合",
+  "invalid_password_hint": "密碼長度至少要有 {{passwordLength}} 個字元，其中包含至少一個數字和大小寫字母組合",
  "incorrect_password": "密碼不正確。",
  "24_h": "24 小時",
  "use_setting": "使用設定",
@@ -42,15 +42,15 @@ export const authRouter = router({

      const passwordsMatch = await verifyPassword(oldPassword, currentPassword);
      if (!passwordsMatch) {
-        throw new TRPCError({ code: "BAD_REQUEST", message: "INCORRECT_PASSWORD" });
+        throw new TRPCError({ code: "BAD_REQUEST", message: "incorrect_password" });
      }

      if (oldPassword === newPassword) {
-        throw new TRPCError({ code: "BAD_REQUEST", message: "PASSWORD_MATCHES_OLD" });
+        throw new TRPCError({ code: "BAD_REQUEST", message: "new_password_matches_old_password" });
      }

      if (!validPassword(newPassword)) {
-        throw new TRPCError({ code: "BAD_REQUEST", message: "INVALID_PASSWORD" });
+        throw new TRPCError({ code: "BAD_REQUEST", message: "password_hint_min" });
      }

      const hashedPassword = await hashPassword(newPassword);
@@ -67,9 +67,11 @@ export function HintsOrErrors<T extends FieldValues = FieldValues>(props: {
  // errors exist, not custom ones, just show them as is
  if (fieldErrors) {
    return (
-      <div className="text-gray mt-2 flex items-center text-sm text-red-700">
-        <FiInfo className="mr-1 h-3 w-3" />
-        <>{fieldErrors.message}</>
+      <div className="text-gray mt-2 flex items-center gap-x-2 text-sm text-red-700">
+        <div>
+          <FiInfo className="h-3 w-3" />
+        </div>
+        <p>{fieldErrors.message}</p>
      </div>
    );
  }