From c25c84aeb3587e81ad5e996d3e3af824deb72549 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 4 Jan 2025 00:29:37 +0530 Subject: [PATCH] feat: added csp and minor changes --- frontend-v2/index.html | 15 +++++++++++++++ .../src/components/auth/TeamInviteStep.tsx | 1 - .../UpgradePlanModal/UpgradePlanModal.tsx | 2 +- .../src/pages/admin/OverviewPage/route.tsx | 12 +++++------- frontend-v2/src/pages/admin/layout.tsx | 16 +++++++--------- .../src/pages/auth/LoginLdapPage/route.tsx | 16 +++++++++++++--- .../src/pages/auth/LoginPage/Login.utils.tsx | 1 - .../EmailConfirmationStep.tsx | 2 +- 8 files changed, 42 insertions(+), 23 deletions(-) diff --git a/frontend-v2/index.html b/frontend-v2/index.html index b4bcd72c3..ee247f1f6 100644 --- a/frontend-v2/index.html +++ b/frontend-v2/index.html @@ -4,6 +4,21 @@ + Infisical diff --git a/frontend-v2/src/components/auth/TeamInviteStep.tsx b/frontend-v2/src/components/auth/TeamInviteStep.tsx index 79dfa7b9a..5a9f11bde 100644 --- a/frontend-v2/src/components/auth/TeamInviteStep.tsx +++ b/frontend-v2/src/components/auth/TeamInviteStep.tsx @@ -101,4 +101,3 @@ export default function TeamInviteStep(): JSX.Element { ); } - diff --git a/frontend-v2/src/components/license/UpgradePlanModal/UpgradePlanModal.tsx b/frontend-v2/src/components/license/UpgradePlanModal/UpgradePlanModal.tsx index bcd682fe8..17c0777f1 100644 --- a/frontend-v2/src/components/license/UpgradePlanModal/UpgradePlanModal.tsx +++ b/frontend-v2/src/components/license/UpgradePlanModal/UpgradePlanModal.tsx @@ -68,4 +68,4 @@ export const UpgradePlanModal = ({ text, isOpen, onOpenChange }: Props): JSX.Ele ); -}; \ No newline at end of file +}; diff --git a/frontend-v2/src/pages/admin/OverviewPage/route.tsx b/frontend-v2/src/pages/admin/OverviewPage/route.tsx index df1f50496..f5955b2ab 100644 --- a/frontend-v2/src/pages/admin/OverviewPage/route.tsx +++ b/frontend-v2/src/pages/admin/OverviewPage/route.tsx @@ -1,9 +1,7 @@ -import { createFileRoute } from '@tanstack/react-router' +import { createFileRoute } from "@tanstack/react-router"; -import { OverviewPage } from './OverviewPage' +import { OverviewPage } from "./OverviewPage"; -export const Route = createFileRoute( - '/_authenticate/_inject-org-details/admin/_admin-layout/', -)({ - component: OverviewPage, -}) +export const Route = createFileRoute("/_authenticate/_inject-org-details/admin/_admin-layout/")({ + component: OverviewPage +}); diff --git a/frontend-v2/src/pages/admin/layout.tsx b/frontend-v2/src/pages/admin/layout.tsx index b88cdcd2c..f94484746 100644 --- a/frontend-v2/src/pages/admin/layout.tsx +++ b/frontend-v2/src/pages/admin/layout.tsx @@ -1,16 +1,14 @@ -import { createFileRoute, redirect } from '@tanstack/react-router' +import { createFileRoute, redirect } from "@tanstack/react-router"; -import { AdminLayout } from '@app/layouts/AdminLayout' +import { AdminLayout } from "@app/layouts/AdminLayout"; -export const Route = createFileRoute( - '/_authenticate/_inject-org-details/admin/_admin-layout', -)({ +export const Route = createFileRoute("/_authenticate/_inject-org-details/admin/_admin-layout")({ component: AdminLayout, beforeLoad: ({ context }) => { if (!context.user.superAdmin) { throw redirect({ - to: '/organization/secret-manager/overview', - }) + to: "/organization/secret-manager/overview" + }); } - }, -}) + } +}); diff --git a/frontend-v2/src/pages/auth/LoginLdapPage/route.tsx b/frontend-v2/src/pages/auth/LoginLdapPage/route.tsx index 36ee58b86..aa2ff18c6 100644 --- a/frontend-v2/src/pages/auth/LoginLdapPage/route.tsx +++ b/frontend-v2/src/pages/auth/LoginLdapPage/route.tsx @@ -1,7 +1,17 @@ -import { createFileRoute } from "@tanstack/react-router"; +import { createFileRoute, stripSearchParams } from "@tanstack/react-router"; +import { zodValidator } from "@tanstack/zod-adapter"; +import { z } from "zod"; import { LoginLdapPage } from "./LoginLDAPPage"; -export const Route = createFileRoute("/_restrict-login-signup/login/ldap")({ - component: LoginLdapPage +const LoginLdapPageQueryParamsSchema = z.object({ + organizationSlug: z.string().catch("") +}); + +export const Route = createFileRoute("/_restrict-login-signup/login/ldap")({ + component: LoginLdapPage, + validateSearch: zodValidator(LoginLdapPageQueryParamsSchema), + search: { + middlewares: [stripSearchParams({ organizationSlug: "" })] + } }); diff --git a/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx b/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx index 3b9b8562b..11fcf0d2d 100644 --- a/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx +++ b/frontend-v2/src/pages/auth/LoginPage/Login.utils.tsx @@ -46,4 +46,3 @@ export const useNavigateToSelectOrganization = () => { return { navigateToSelectOrganization }; }; - diff --git a/frontend-v2/src/pages/auth/SignUpSsoPage/components/EmailConfirmationStep/EmailConfirmationStep.tsx b/frontend-v2/src/pages/auth/SignUpSsoPage/components/EmailConfirmationStep/EmailConfirmationStep.tsx index c19a68e47..a200d3f7c 100644 --- a/frontend-v2/src/pages/auth/SignUpSsoPage/components/EmailConfirmationStep/EmailConfirmationStep.tsx +++ b/frontend-v2/src/pages/auth/SignUpSsoPage/components/EmailConfirmationStep/EmailConfirmationStep.tsx @@ -187,4 +187,4 @@ export const EmailConfirmationStep = ({ ); -}; \ No newline at end of file +};