)}
- {currentEnv && isInRootFolder && (
+ {currentEnv && secretPath === "/" && (
<>
)}
+ {isFolderMode && Boolean(secretPathSegments.length) && (
+
+ )}
{isFolderMode &&
- folders?.map(({ id, name }, index) => {
+ secretPathSegments?.map((folderName, index) => {
const query = { ...router.query };
- if (name !== "root") query.folderId = id;
- else delete query.folderId;
+ query.secretPath = secretPathSegments.slice(0, index + 1);
+
return (
-
);
}
diff --git a/frontend/src/components/signup/InitialSignupStep.tsx b/frontend/src/components/signup/InitialSignupStep.tsx
index 0a1248b2d..7953ff0df 100644
--- a/frontend/src/components/signup/InitialSignupStep.tsx
+++ b/frontend/src/components/signup/InitialSignupStep.tsx
@@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import Link from "next/link";
import { useRouter } from "next/router";
-import { faGithub,faGoogle } from "@fortawesome/free-brands-svg-icons";
+import { faGithub, faGitlab, faGoogle } from "@fortawesome/free-brands-svg-icons";
import { faEnvelope } from "@fortawesome/free-regular-svg-icons";
import { faLock } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -9,74 +9,94 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Button } from "../v2";
export default function InitialSignupStep({
- setIsSignupWithEmail,
+ setIsSignupWithEmail
}: {
- setIsSignupWithEmail: (value: boolean) => void
+ setIsSignupWithEmail: (value: boolean) => void;
}) {
- const { t } = useTranslation();
- const router = useRouter();
+ const { t } = useTranslation();
+ const router = useRouter();
- return
-
{t("signup.initial-title")}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {t("signup.create-policy")}
-
-
-
- {t("signup.already-have-account")}
-
-
+ return (
+
+
+ {t("signup.initial-title")}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {t("signup.create-policy")}
+
+
+
+
+ {t("signup.already-have-account")}
+
+
+
+ );
}
diff --git a/frontend/src/components/tags/CreateTagModal/CreateTagModal.tsx b/frontend/src/components/tags/CreateTagModal/CreateTagModal.tsx
new file mode 100644
index 000000000..4c93a5a19
--- /dev/null
+++ b/frontend/src/components/tags/CreateTagModal/CreateTagModal.tsx
@@ -0,0 +1,266 @@
+import { useEffect, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { faCheck } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+
+import { useNotificationContext } from "@app/components/context/Notifications/NotificationProvider";
+import {
+ Button,
+ FormControl,
+ Input,
+ Modal,
+ ModalClose,
+ ModalContent,
+ Tooltip
+} from "@app/components/v2";
+import { useWorkspace } from "@app/context";
+import { useCreateWsTag } from "@app/hooks/api";
+
+export const secretTagsColors = [
+ {
+ id: 1,
+ hex: "#bec2c8",
+ rgba: "rgb(128,128,128, 0.8)",
+ name: "Grey"
+ },
+ {
+ id: 2,
+ hex: "#95a2b3",
+ rgba: "rgb(0,0,255, 0.8)",
+ name: "blue"
+ },
+ {
+ id: 3,
+ hex: "#5e6ad2",
+ rgba: "rgb(128,0,128, 0.8)",
+ name: "Purple"
+ },
+ {
+ id: 4,
+ hex: "#26b5ce",
+ rgba: "rgb(0,128,128, 0.8)",
+ name: "Teal"
+ },
+ {
+ id: 5,
+ hex: "#4cb782",
+ rgba: "rgb(0,128,0, 0.8)",
+ name: "Green"
+ },
+ {
+ id: 6,
+ hex: "#f2c94c",
+ rgba: "rgb(255,255,0, 0.8)",
+ name: "Yellow"
+ },
+ {
+ id: 7,
+ hex: "#f2994a",
+ rgba: "rgb(128,128,0, 0.8)",
+ name: "Orange"
+ },
+ {
+ id: 8,
+ hex: "#f7c8c1",
+ rgba: "rgb(128,0,0, 0.8)",
+ name: "Pink"
+ },
+ {
+ id: 9,
+ hex: "#eb5757",
+ rgba: "rgb(255,0,0, 0.8)",
+ name: "Red"
+ }
+];
+
+const isValidHexColor = (hexColor: string) => {
+ const hexColorPattern = /^#?([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$/;
+
+ return hexColorPattern.test(hexColor);
+};
+
+type Props = {
+ isOpen?: boolean;
+ onToggle: (isOpen: boolean) => void;
+};
+
+const createTagSchema = z.object({
+ name: z.string().trim(),
+ color: z.string().trim()
+});
+
+type FormData = z.infer
;
+type TagColor = {
+ id: number;
+ hex: string;
+ rgba: string;
+ name: string;
+};
+
+export const CreateTagModal = ({ isOpen, onToggle }: Props): JSX.Element => {
+ const {
+ control,
+ reset,
+ watch,
+ setValue,
+ formState: { isSubmitting },
+ handleSubmit
+ } = useForm({
+ resolver: zodResolver(createTagSchema)
+ });
+ const { createNotification } = useNotificationContext();
+ const { currentWorkspace } = useWorkspace();
+ const workspaceId = currentWorkspace?._id || "";
+
+ const { mutateAsync: createWsTag } = useCreateWsTag();
+
+ const [showHexInput, setShowHexInput] = useState(false);
+ const selectedTagColor = watch("color", secretTagsColors[0].hex);
+
+ useEffect(()=>{
+ if(!isOpen) reset();
+ },[isOpen])
+
+ const onFormSubmit = async ({ name, color }: FormData) => {
+ try {
+ await createWsTag({
+ workspaceID: workspaceId,
+ tagName: name,
+ tagColor: color,
+ tagSlug: name.replace(" ", "_")
+ });
+ onToggle(false);
+ reset();
+ createNotification({
+ text: "Successfully created a tag",
+ type: "success"
+ });
+ } catch (error) {
+ console.error(error);
+ createNotification({
+ text: "Failed to create a tag",
+ type: "error"
+ });
+ }
+ };
+
+ return (
+
+
+
+
+
+ );
+};
diff --git a/frontend/src/components/tags/CreateTagModal/index.tsx b/frontend/src/components/tags/CreateTagModal/index.tsx
new file mode 100644
index 000000000..e9d283b3c
--- /dev/null
+++ b/frontend/src/components/tags/CreateTagModal/index.tsx
@@ -0,0 +1 @@
+export { CreateTagModal } from "./CreateTagModal";
diff --git a/frontend/src/components/utilities/attemptCliLogin.ts b/frontend/src/components/utilities/attemptCliLogin.ts
index b2eeeceea..b8812918a 100644
--- a/frontend/src/components/utilities/attemptCliLogin.ts
+++ b/frontend/src/components/utilities/attemptCliLogin.ts
@@ -2,8 +2,6 @@
import jsrp from "jsrp";
import { login1, login2 } from "@app/hooks/api/auth/queries";
-import { fetchOrganizations } from "@app/hooks/api/organization/queries";
-import { fetchMyOrganizationProjects } from "@app/hooks/api/users/queries";
import KeyService from "@app/services/KeyService";
import Telemetry from "./telemetry/Telemetry";
@@ -122,17 +120,7 @@ const attemptLogin = async (
iv,
tag,
privateKey
- });
-
- const userOrgs = await fetchOrganizations();
- const orgId = userOrgs[0]._id;
- localStorage.setItem("orgData.id", orgId);
-
- const orgUserProjects = await fetchMyOrganizationProjects(orgId);
-
- if (orgUserProjects.length > 0) {
- localStorage.setItem("projectData.id", orgUserProjects[0]._id);
- }
+ });
if (email) {
telemetry.identify(email, email);
diff --git a/frontend/src/components/utilities/attemptCliLoginMfa.ts b/frontend/src/components/utilities/attemptCliLoginMfa.ts
index 6681e8464..3a99e6e8e 100644
--- a/frontend/src/components/utilities/attemptCliLoginMfa.ts
+++ b/frontend/src/components/utilities/attemptCliLoginMfa.ts
@@ -2,9 +2,6 @@
import jsrp from "jsrp";
import { login1 , verifyMfaToken } from "@app/hooks/api/auth/queries";
-import { fetchOrganizations } from "@app/hooks/api/organization/queries";
-import { fetchMyOrganizationProjects } from "@app/hooks/api/users/queries";
-// import verifyMfaToken from "@app/pages/api/auth/verifyMfaToken";
import KeyService from "@app/services/KeyService";
import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
@@ -19,7 +16,6 @@ interface IsMfaLoginSuccessful {
privateKey: string;
JTWToken: string;
}
-
}
/**
@@ -93,16 +89,6 @@ const attemptLoginMfa = async ({
privateKey
});
- // TODO: in the future - move this logic elsewhere
- // because this function is about logging the user in
- // and not initializing the login details
- const userOrgs = await fetchOrganizations();
- const orgId = userOrgs[0]._id;
- localStorage.setItem("orgData.id", orgId);
-
- const orgUserProjects = await fetchMyOrganizationProjects(orgId);
- localStorage.setItem("projectData.id", orgUserProjects[0]._id);
-
resolve({
success: true,
loginResponse:{
diff --git a/frontend/src/components/utilities/attemptLogin.ts b/frontend/src/components/utilities/attemptLogin.ts
index c4fe91b05..c9cedbf68 100644
--- a/frontend/src/components/utilities/attemptLogin.ts
+++ b/frontend/src/components/utilities/attemptLogin.ts
@@ -2,8 +2,6 @@
import jsrp from "jsrp";
import { login1, login2 } from "@app/hooks/api/auth/queries";
-import { fetchOrganizations } from "@app/hooks/api/organization/queries";
-import { fetchMyOrganizationProjects } from "@app/hooks/api/users/queries";
import KeyService from "@app/services/KeyService";
import Telemetry from "./telemetry/Telemetry";
@@ -119,20 +117,6 @@ const attemptLogin = async (
tag,
privateKey
});
-
- // TODO: in the future - move this logic elsewhere
- // because this function is about logging the user in
- // and not initializing the login details
- const userOrgs = await fetchOrganizations();
-
- const orgId = userOrgs[0]._id;
- localStorage.setItem("orgData.id", orgId);
-
- const orgUserProjects = await fetchMyOrganizationProjects(orgId);
-
- if (orgUserProjects.length > 0) {
- localStorage.setItem("projectData.id", orgUserProjects[0]._id);
- }
if (email) {
telemetry.identify(email, email);
diff --git a/frontend/src/components/utilities/attemptLoginMfa.ts b/frontend/src/components/utilities/attemptLoginMfa.ts
index c588eb965..fdbf495c1 100644
--- a/frontend/src/components/utilities/attemptLoginMfa.ts
+++ b/frontend/src/components/utilities/attemptLoginMfa.ts
@@ -2,8 +2,6 @@
import jsrp from "jsrp";
import { login1 , verifyMfaToken } from "@app/hooks/api/auth/queries";
-import { fetchOrganizations } from "@app/hooks/api/organization/queries";
-import { fetchMyOrganizationProjects } from "@app/hooks/api/users/queries";
import KeyService from "@app/services/KeyService";
import { saveTokenToLocalStorage } from "./saveTokenToLocalStorage";
@@ -83,16 +81,6 @@ const attemptLoginMfa = async ({
privateKey
});
- // TODO: in the future - move this logic elsewhere
- // because this function is about logging the user in
- // and not initializing the login details
- const userOrgs = await fetchOrganizations();
- const orgId = userOrgs[0]._id;
- localStorage.setItem("orgData.id", orgId);
-
- const orgUserProjects = await fetchMyOrganizationProjects(orgId);
- localStorage.setItem("projectData.id", orgUserProjects[0]._id);
-
resolve(true);
} catch (err) {
reject(err);
diff --git a/frontend/src/components/utilities/telemetry/Telemetry.ts b/frontend/src/components/utilities/telemetry/Telemetry.ts
index 2676bed85..76e86fa37 100644
--- a/frontend/src/components/utilities/telemetry/Telemetry.ts
+++ b/frontend/src/components/utilities/telemetry/Telemetry.ts
@@ -13,7 +13,7 @@ class Capturer {
}
capture(item: string) {
- if (ENV === 'production' && TELEMETRY_CAPTURING_ENABLED) {
+ if (ENV === 'production' && TELEMETRY_CAPTURING_ENABLED === "true") {
try {
this.api.capture(item);
} catch (error) {
@@ -23,7 +23,7 @@ class Capturer {
}
identify(id: string, email?: string) {
- if (ENV === 'production' && TELEMETRY_CAPTURING_ENABLED) {
+ if (ENV === 'production' && TELEMETRY_CAPTURING_ENABLED === "true") {
try {
this.api.identify(id, {
email: email
diff --git a/frontend/src/components/v2/Accordion/Accordion.stories.tsx b/frontend/src/components/v2/Accordion/Accordion.stories.tsx
new file mode 100644
index 000000000..bd17c8743
--- /dev/null
+++ b/frontend/src/components/v2/Accordion/Accordion.stories.tsx
@@ -0,0 +1,30 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "./Accordion";
+
+const meta: Meta = {
+ title: "Components/Accordion",
+ component: Accordion,
+ tags: ["v2"],
+ argTypes: {}
+};
+
+export default meta;
+type Story = StoryObj;
+
+export const Basic: Story = {
+ render: (args) => (
+
+
+
+ Section 1
+ Description of Section 1
+
+
+ Section 2
+ Description of Section 2
+
+
+
{children}
+ {children}
));
@@ -68,10 +68,7 @@ export const Accordion = ({
children,
...props
}: AccordionPrimitive.AccordionSingleProps | AccordionPrimitive.AccordionMultipleProps) => (
-
+
{children}
);
diff --git a/frontend/src/components/v2/Button/Button.tsx b/frontend/src/components/v2/Button/Button.tsx
index 7c2a5fd6d..63a735d65 100644
--- a/frontend/src/components/v2/Button/Button.tsx
+++ b/frontend/src/components/v2/Button/Button.tsx
@@ -11,6 +11,9 @@ type Props = {
isLoading?: boolean;
};
+// refactor(akhilmhdh): both color and size variants are together need to split it
+// colorSchema should handle all color class names
+// variant should handle how the button padding and other types should be set
const buttonVariants = cva(
[
"button",
@@ -67,7 +70,7 @@ const buttonVariants = cva(
{
colorSchema: "primary",
variant: "solid",
- className: "bg-primary-500 bg-opacity-90 hover:bg-primary-500 hover:text-black"
+ className: "text-black bg-primary-500 bg-opacity-90 hover:bg-primary-500 hover:text-black"
},
{
colorSchema: "primary",
@@ -106,6 +109,12 @@ const buttonVariants = cva(
variant: "outline",
className: "text-red hover:bg-red hover:text-black"
},
+ {
+ colorSchema: "danger",
+ variant: "outline_bg",
+ className:
+ "bg-mineshaft-600 border border-red-500 hover:bg-red/[0.1] hover:border-red/40 text-red-500"
+ },
{
colorSchema: "primary",
variant: "plain",
diff --git a/frontend/src/components/v2/Checkbox/Checkbox.tsx b/frontend/src/components/v2/Checkbox/Checkbox.tsx
index 8c79a5ff2..87e278119 100644
--- a/frontend/src/components/v2/Checkbox/Checkbox.tsx
+++ b/frontend/src/components/v2/Checkbox/Checkbox.tsx
@@ -30,9 +30,10 @@ export const Checkbox = ({
{
+ const [pos, setPos] = useState(0);
+ const isTextArray = Array.isArray(text);
+ useEffect(() => {
+ let interval: NodeJS.Timer;
+ if (isTextArray) {
+ interval = setInterval(() => {
+ setPos((state) => (state + 1) % text.length);
+ }, frequency);
+ }
+ return () => clearInterval(interval);
+ }, []);
+
+ return (
+
+
+ {text && isTextArray && (
+
+
+ {text[pos]}
+
+
+ )}
+ {text && !isTextArray &&
{text}
}
+
-
+ {icon && iconPos === "left" && {icon}}
+ {children}
+ {icon && iconPos === "right" && {icon}}
+
+
+);
+
// grouping items into 1
export type DropdownMenuGroupProps = DropdownMenuPrimitive.DropdownMenuGroupProps;
export const DropdownMenuGroup = forwardRef(
- ({ ...props }, ref) =>
+ ({ ...props }, ref) => (
+
+ )
);
DropdownMenuGroup.displayName = "DropdownMenuGroup";
@@ -98,3 +164,5 @@ export const DropdownMenuSeparator = forwardRef<
));
DropdownMenuSeparator.displayName = "DropdownMenuSeperator";
+
+DropdownMenuSeparator.displayName = "DropdownMenuSeperator";
diff --git a/frontend/src/components/v2/Dropdown/index.tsx b/frontend/src/components/v2/Dropdown/index.tsx
index 8ecbebd09..bde01449e 100644
--- a/frontend/src/components/v2/Dropdown/index.tsx
+++ b/frontend/src/components/v2/Dropdown/index.tsx
@@ -4,7 +4,10 @@ export type {
DropdownMenuGroupProps,
DropdownMenuItemProps,
DropdownMenuProps,
- DropdownMenuTriggerProps
+ DropdownMenuTriggerProps,
+ DropdownSubMenuContentProps,
+ DropdownSubMenuProps,
+ DropdownSubMenuTriggerProps
} from "./Dropdown";
export {
DropdownMenu,
@@ -13,5 +16,8 @@ export {
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
- DropdownMenuTrigger
+ DropdownMenuTrigger,
+ DropdownSubMenu,
+ DropdownSubMenuContent,
+ DropdownSubMenuTrigger
} from "./Dropdown";
diff --git a/frontend/src/components/v2/Menu/Menu.tsx b/frontend/src/components/v2/Menu/Menu.tsx
index d56d16fec..e4771e551 100644
--- a/frontend/src/components/v2/Menu/Menu.tsx
+++ b/frontend/src/components/v2/Menu/Menu.tsx
@@ -2,8 +2,8 @@
/* eslint-disable import/no-extraneous-dependencies */
/* eslint-disable global-require */
import { ComponentPropsWithRef, ElementType, ReactNode, Ref, useRef } from "react";
-import { motion } from "framer-motion"
-import Lottie from "lottie-react"
+import { motion } from "framer-motion";
+import Lottie from "lottie-react";
import { twMerge } from "tailwind-merge";
export type MenuProps = {
@@ -39,13 +39,10 @@ export const MenuItem = ({
inputRef,
...props
}: MenuItemProps & ComponentPropsWithRef): JSX.Element => {
- const iconRef = useRef()
+ const iconRef = useRef();
- return(
- iconRef.current?.play()}
- onMouseLeave={() => iconRef.current?.stop()}
- >
+ return (
+ iconRef.current?.play()} onMouseLeave={() => iconRef.current?.stop()}>
({
)}
>
- -
-
- {/* {icon && {icon}} */}
-
+
+ {/* {icon && {icon}} */}
+ {icon && (
+
+ )}
{children}
{description && {description}}
- )
+ );
};
export const SubMenuItem = ({
@@ -88,13 +97,10 @@ export const SubMenuItem = ({
inputRef,
...props
}: MenuItemProps & ComponentPropsWithRef): JSX.Element => {
- const iconRef = useRef()
+ const iconRef = useRef();
- return(
- iconRef.current?.play()}
- onMouseLeave={() => iconRef.current?.stop()}
- >
+ return (
+ iconRef.current?.play()} onMouseLeave={() => iconRef.current?.stop()}>
({
)}
>
- -
+
-
({
- )
+ );
};
-
MenuItem.displayName = "MenuItem";
export type MenuGroupProps = {
diff --git a/frontend/src/components/v2/Modal/Modal.tsx b/frontend/src/components/v2/Modal/Modal.tsx
index 200ceefb2..98a4ad71a 100644
--- a/frontend/src/components/v2/Modal/Modal.tsx
+++ b/frontend/src/components/v2/Modal/Modal.tsx
@@ -22,14 +22,14 @@ export const ModalContent = forwardRef(
) => (
diff --git a/frontend/src/components/v2/SecretInput/SecretInput.tsx b/frontend/src/components/v2/SecretInput/SecretInput.tsx
index 666c41d69..314dada0c 100644
--- a/frontend/src/components/v2/SecretInput/SecretInput.tsx
+++ b/frontend/src/components/v2/SecretInput/SecretInput.tsx
@@ -1,7 +1,7 @@
/* eslint-disable react/no-danger */
-import { forwardRef, HTMLAttributes } from "react";
-import ContentEditable from "react-contenteditable";
+import { forwardRef, TextareaHTMLAttributes } from "react";
import sanitizeHtml, { DisallowedTagsModes } from "sanitize-html";
+import { twMerge } from "tailwind-merge";
import { useToggle } from "@app/hooks";
@@ -22,7 +22,7 @@ const sanitizeConf = {
const syntaxHighlight = (content?: string | null, isVisible?: boolean) => {
if (content === "") return "EMPTY";
- if (!content) return "missing";
+ if (!content) return "EMPTY";
if (!isVisible) return replaceContentWithDot(content);
const sanitizedContent = sanitizeHtml(
@@ -35,58 +35,61 @@ const syntaxHighlight = (content?: string | null, isVisible?: boolean) => {
`${${b}}`
);
- return newContent;
+ // akhilmhdh: Dont remove this br. I am still clueless how this works but weirdly enough
+ // when break is added a line break works properly
+ return `${newContent}
`;
};
-type Props = Omit, "onChange" | "onBlur"> & {
+type Props = TextareaHTMLAttributes & {
value?: string | null;
isVisible?: boolean;
+ isReadOnly?: boolean;
isDisabled?: boolean;
- onChange?: (val: string) => void;
- onBlur?: () => void;
+ containerClassName?: string;
};
-export const SecretInput = forwardRef(
- ({ value, isVisible, onChange, onBlur, isDisabled, ...props }, ref) => {
+const commonClassName = "font-mono text-sm caret-white border-none outline-none w-full break-all";
+
+export const SecretInput = forwardRef(
+ (
+ { value, isVisible, containerClassName, onBlur, isDisabled, isReadOnly, onFocus, ...props },
+ ref
+ ) => {
const [isSecretFocused, setIsSecretFocused] = useToggle();
return (
-
-
{
- if (onChange) onChange(evt.currentTarget.innerText.trim());
- }}
- onFocus={() => setIsSecretFocused.on()}
- disabled={isDisabled}
- spellCheck={false}
- onBlur={() => {
- if (onBlur) onBlur();
- setIsSecretFocused.off();
- }}
- html={
- isVisible || isSecretFocused
- ? sanitizeHtml(
- value?.replaceAll("<", "<").replaceAll(">", ">") || "",
- sanitizeConf
- )
- : syntaxHighlight(value, false)
- }
- {...props}
- />
+ 
- 
+ 
@@ -44,11 +43,11 @@
+
## Introduction
-**[Infisical](https://infisical.com)** is an open source, end-to-end encrypted secret management platform that teams use to centralize their secrets like API keys, database credentials, and configurations.
+**[Infisical](https://infisical.com)** is the open source secret management platform that teams use to centralize their secrets like API keys, database credentials, and configurations.
We're on a mission to make secret management more accessible to everyone, not just security teams, and that means redesigning the entire developer experience from ground up.
@@ -134,7 +133,6 @@ Whether it's big or small, we love contributions. Check out our guide to see how
Not sure where to get started? You can:
-- [Book a free, non-pressure pairing session / code walkthrough with one of our teammates](https://cal.com/tony-infisical/30-min-meeting-contributing)!
- Join our Slack, and ask us any questions there.
- Join our [community calls](https://us06web.zoom.us/j/82623506356) every Wednesday at 11am EST to ask any questions, provide feedback, hangout and more.
diff --git a/backend/.eslintrc b/backend/.eslintrc
index 6aa49ee31..31bcc259b 100644
--- a/backend/.eslintrc
+++ b/backend/.eslintrc
@@ -26,6 +26,7 @@
],
"@typescript-eslint/no-unused-vars": "off",
"unused-imports/no-unused-imports": "error",
+ "@typescript-eslint/no-extra-semi": "off", // added to be able to push
"unused-imports/no-unused-vars": [
"warn",
{
diff --git a/backend/package-lock.json b/backend/package-lock.json
index 66aeceee2..3429181a2 100644
--- a/backend/package-lock.json
+++ b/backend/package-lock.json
@@ -50,6 +50,7 @@
"nodemailer": "^6.8.0",
"passport": "^0.6.0",
"passport-github": "^1.1.0",
+ "passport-gitlab2": "^5.0.0",
"passport-google-oauth20": "^2.0.0",
"posthog-node": "^2.6.0",
"probot": "^12.3.1",
@@ -63,7 +64,7 @@
"utility-types": "^3.10.0",
"winston": "^3.8.2",
"winston-loki": "^6.0.6",
- "zod": "^3.21.4"
+ "zod": "^3.22.3"
},
"devDependencies": {
"@jest/globals": "^29.3.1",
@@ -13727,6 +13728,17 @@
"node": ">= 0.4.0"
}
},
+ "node_modules/passport-gitlab2": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/passport-gitlab2/-/passport-gitlab2-5.0.0.tgz",
+ "integrity": "sha512-cXQMgM6JQx9wHVh7JLH30D8fplfwjsDwRz+zS0pqC8JS+4bNmc1J04NGp5g2M4yfwylH9kQRrMN98GxMw7q7cg==",
+ "dependencies": {
+ "passport-oauth2": "^1.4.0"
+ },
+ "engines": {
+ "node": ">= 6.0.0"
+ }
+ },
"node_modules/passport-google-oauth20": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
@@ -16684,9 +16696,9 @@
}
},
"node_modules/zod": {
- "version": "3.21.4",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
- "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw==",
+ "version": "3.22.3",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
+ "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==",
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}
@@ -27163,6 +27175,14 @@
"passport-oauth2": "1.x.x"
}
},
+ "passport-gitlab2": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/passport-gitlab2/-/passport-gitlab2-5.0.0.tgz",
+ "integrity": "sha512-cXQMgM6JQx9wHVh7JLH30D8fplfwjsDwRz+zS0pqC8JS+4bNmc1J04NGp5g2M4yfwylH9kQRrMN98GxMw7q7cg==",
+ "requires": {
+ "passport-oauth2": "^1.4.0"
+ }
+ },
"passport-google-oauth20": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz",
@@ -29384,9 +29404,9 @@
"dev": true
},
"zod": {
- "version": "3.21.4",
- "resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz",
- "integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="
+ "version": "3.22.3",
+ "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz",
+ "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug=="
}
}
}
diff --git a/backend/package.json b/backend/package.json
index e8ecb384f..cd38aa20f 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -41,6 +41,7 @@
"nodemailer": "^6.8.0",
"passport": "^0.6.0",
"passport-github": "^1.1.0",
+ "passport-gitlab2": "^5.0.0",
"passport-google-oauth20": "^2.0.0",
"posthog-node": "^2.6.0",
"probot": "^12.3.1",
@@ -54,7 +55,7 @@
"utility-types": "^3.10.0",
"winston": "^3.8.2",
"winston-loki": "^6.0.6",
- "zod": "^3.21.4"
+ "zod": "^3.22.3"
},
"name": "infisical-api",
"version": "1.0.0",
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index b5e50d9da..402fd5874 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -1,3 +1,5 @@
+import { GITLAB_URL } from "../variables";
+
import InfisicalClient from "infisical-node";
export const client = new InfisicalClient({
@@ -15,17 +17,14 @@ export const getRootEncryptionKey = async () => {
}
export const getInviteOnlySignup = async () => (await client.getSecret("INVITE_ONLY_SIGNUP")).secretValue === "true"
export const getSaltRounds = async () => parseInt((await client.getSecret("SALT_ROUNDS")).secretValue) || 10;
+export const getAuthSecret = async () => (await client.getSecret("JWT_AUTH_SECRET")).secretValue ?? (await client.getSecret("AUTH_SECRET")).secretValue;
export const getJwtAuthLifetime = async () => (await client.getSecret("JWT_AUTH_LIFETIME")).secretValue || "10d";
-export const getJwtAuthSecret = async () => (await client.getSecret("JWT_AUTH_SECRET")).secretValue;
export const getJwtMfaLifetime = async () => (await client.getSecret("JWT_MFA_LIFETIME")).secretValue || "5m";
-export const getJwtMfaSecret = async () => (await client.getSecret("JWT_MFA_LIFETIME")).secretValue || "5m";
export const getJwtRefreshLifetime = async () => (await client.getSecret("JWT_REFRESH_LIFETIME")).secretValue || "90d";
-export const getJwtRefreshSecret = async () => (await client.getSecret("JWT_REFRESH_SECRET")).secretValue;
-export const getJwtServiceSecret = async () => (await client.getSecret("JWT_SERVICE_SECRET")).secretValue;
+export const getJwtServiceSecret = async () => (await client.getSecret("JWT_SERVICE_SECRET")).secretValue; // TODO: deprecate (related to ST V1)
export const getJwtSignupLifetime = async () => (await client.getSecret("JWT_SIGNUP_LIFETIME")).secretValue || "15m";
-export const getJwtProviderAuthSecret = async () => (await client.getSecret("JWT_PROVIDER_AUTH_SECRET")).secretValue;
export const getJwtProviderAuthLifetime = async () => (await client.getSecret("JWT_PROVIDER_AUTH_LIFETIME")).secretValue || "15m";
-export const getJwtSignupSecret = async () => (await client.getSecret("JWT_SIGNUP_SECRET")).secretValue;
+export const getJwtServiceTokenSecret = async () => (await client.getSecret("JWT_SERVICE_TOKEN_SECRET")).secretValue;
export const getMongoURL = async () => (await client.getSecret("MONGO_URL")).secretValue;
export const getNodeEnv = async () => (await client.getSecret("NODE_ENV")).secretValue || "production";
export const getVerboseErrorOutput = async () => (await client.getSecret("VERBOSE_ERROR_OUTPUT")).secretValue === "true" && true;
@@ -52,6 +51,9 @@ export const getClientIdGoogleLogin = async () => (await client.getSecret("CLIEN
export const getClientSecretGoogleLogin = async () => (await client.getSecret("CLIENT_SECRET_GOOGLE_LOGIN")).secretValue;
export const getClientIdGitHubLogin = async () => (await client.getSecret("CLIENT_ID_GITHUB_LOGIN")).secretValue;
export const getClientSecretGitHubLogin = async () => (await client.getSecret("CLIENT_SECRET_GITHUB_LOGIN")).secretValue;
+export const getClientIdGitLabLogin = async () => (await client.getSecret("CLIENT_ID_GITLAB_LOGIN")).secretValue;
+export const getClientSecretGitLabLogin = async () => (await client.getSecret("CLIENT_SECRET_GITLAB_LOGIN")).secretValue;
+export const getUrlGitLabLogin = async () => (await client.getSecret("URL_GITLAB_LOGIN")).secretValue || GITLAB_URL;
export const getPostHogHost = async () => (await client.getSecret("POSTHOG_HOST")).secretValue || "https://app.posthog.com";
export const getPostHogProjectApiKey = async () => (await client.getSecret("POSTHOG_PROJECT_API_KEY")).secretValue || "phc_nSin8j5q2zdhpFDI1ETmFNUIuTG4DwKVyIigrY10XiE";
diff --git a/backend/src/controllers/v1/authController.ts b/backend/src/controllers/v1/authController.ts
index 6f6411541..e426eef5a 100644
--- a/backend/src/controllers/v1/authController.ts
+++ b/backend/src/controllers/v1/authController.ts
@@ -6,15 +6,18 @@ const jsrp = require("jsrp");
import { LoginSRPDetail, TokenVersion, User } from "../../models";
import { clearTokens, createToken, issueAuthTokens } from "../../helpers/auth";
import { checkUserDevice } from "../../helpers/user";
-import { ACTION_LOGIN, ACTION_LOGOUT } from "../../variables";
+import {
+ ACTION_LOGIN,
+ ACTION_LOGOUT,
+ AuthTokenType
+} from "../../variables";
import { BadRequestError, UnauthorizedRequestError } from "../../utils/errors";
import { EELogService } from "../../ee/services";
import { getUserAgentType } from "../../utils/posthog";
import {
+ getAuthSecret,
getHttpsEnabled,
- getJwtAuthLifetime,
- getJwtAuthSecret,
- getJwtRefreshSecret
+ getJwtAuthLifetime
} from "../../config";
import { ActorType } from "../../ee/models";
import { validateRequest } from "../../helpers/validation";
@@ -238,6 +241,7 @@ export const checkAuth = async (req: Request, res: Response) => {
* @returns
*/
export const getNewToken = async (req: Request, res: Response) => {
+
const refreshToken = req.cookies.jid;
if (!refreshToken)
@@ -245,7 +249,9 @@ export const getNewToken = async (req: Request, res: Response) => {
message: "Failed to find refresh token in request cookies"
});
- const decodedToken = 
+