awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-17 08:35:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(infisical-pg): auth injection completed and validation in password router

Browse Source
This commit is contained in:
Akhil Mohan
2024-01-27 12:38:22 +05:30
parent fcfd6b3fb2
commit f3b37de3f3
196 changed files with 1871 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/Project/IPAllowListPage/components/IPAllowlistModal.tsx
+3 -3
View File
@@ -80,11 +80,11 @@ export const IPAllowlistModal = ({
comment
}: FormData) => {
try {
if (!currentWorkspace?._id) return;
if (!currentWorkspace?.id) return;
if (popUp?.trustedIp?.data) {
await updateTrustedIp.mutateAsync({
workspaceId: currentWorkspace._id,
workspaceId: currentWorkspace.id,
trustedIpId: (popUp?.trustedIp?.data as { trustedIpId: string })?.trustedIpId,
ipAddress,
comment,
@@ -92,7 +92,7 @@ export const IPAllowlistModal = ({
});
} else {
await addTrustedIp.mutateAsync({
workspaceId: currentWorkspace._id,
workspaceId: currentWorkspace.id,
ipAddress,
comment,
isActive: true
frontend/src/views/Project/IPAllowListPage/components/IPAllowlistSection.tsx
+2 -2
View File
@@ -30,10 +30,10 @@ export const IPAllowlistSection = () => {
const onDeleteTrustedIpSubmit = async (trustedIpId: string) => {
try {
if (!currentWorkspace?._id) return;
if (!currentWorkspace?.id) return;
await mutateAsync({
workspaceId: currentWorkspace._id,
workspaceId: currentWorkspace.id,
trustedIpId
});
frontend/src/views/Project/IPAllowListPage/components/IPAllowlistTable.tsx
+5 -5
View File
@@ -42,7 +42,7 @@ type Props = {
export const IPAllowlistTable = ({ popUp, handlePopUpOpen, handlePopUpToggle }: Props) => {
const { subscription } = useSubscription();
const { currentWorkspace } = useWorkspace();
const { data, isLoading } = useGetTrustedIps(currentWorkspace?._id ?? "");
const { data, isLoading } = useGetTrustedIps(currentWorkspace?.id ?? "");
const formatType = (type: string, prefix?: number) => {
return `${type.slice(0, 2).toUpperCase() + type.slice(2)} ${
@@ -69,9 +69,9 @@ export const IPAllowlistTable = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
data?.length > 0 &&
data
.sort((a, b) => a.ipAddress.localeCompare(b.ipAddress))
.map(({ _id, ipAddress, comment, type, prefix, isActive }) => {
.map(({ id, ipAddress, comment, type, prefix, isActive }) => {
return (
<Tr key={`ip-access-range-${_id}`} className="h-10">
<Tr key={`ip-access-range-${id}`} className="h-10">
<Td>{`${ipAddress}${prefix !== undefined ? `/${prefix}` : ""}`}</Td>
<Td>{formatType(type, prefix)}</Td>
<Td>{comment}</Td>
@@ -95,7 +95,7 @@ export const IPAllowlistTable = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
onClick={() => {
if (subscription?.ipAllowlisting) {
handlePopUpOpen("trustedIp", {
trustedIpId: _id,
trustedIpId: id,
ipAddress,
comment,
prefix,
@@ -123,7 +123,7 @@ export const IPAllowlistTable = ({ popUp, handlePopUpOpen, handlePopUpToggle }:
onClick={() => {
if (subscription?.ipAllowlisting) {
handlePopUpOpen("deleteTrustedIp", {
trustedIpId: _id
trustedIpId: id
});
} else {
handlePopUpOpen("upgradePlan");