Fix merge conflicts

2026-10-15 16:52:38 +00:00 · 2024-06-25 14:46:58 -07:00
parent 24c75c6325 285a01af51
commit b01b4323ca
171 changed files with 4384 additions and 535 deletions
@@ -6,6 +6,8 @@ import { faUpload } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { parseDocument, Scalar, YAMLMap } from "yaml";

+import { SecretType } from "@app/hooks/api/types";
+
 import Button from "../basic/buttons/Button";
 import Error from "../basic/Error";
 import { createNotification } from "../notifications";
@@ -33,7 +35,6 @@ const DropZone = ({
  numCurrentRows
 }: DropZoneProps) => {
  const { t } = useTranslation();
-  

  const handleDragEnter = (e: DragEvent) => {
    e.preventDefault();
@@ -66,7 +67,7 @@ const DropZone = ({
          key,
          value: keyPairs[key as keyof typeof keyPairs].value,
          comment: keyPairs[key as keyof typeof keyPairs].comments.join("\n"),
-          type: "shared",
+          type: SecretType.Shared,
          tags: []
        }));
        break;
@@ -79,7 +80,7 @@ const DropZone = ({
          key,
          value: keyPairs[key as keyof typeof keyPairs],
          comment: "",
-          type: "shared",
+          type: SecretType.Shared,
          tags: []
        }));
        break;
@@ -102,7 +103,7 @@ const DropZone = ({
            key,
            value: keyPairs[key as keyof typeof keyPairs]?.toString() ?? "",
            comment,
-            type: "shared",
+            type: SecretType.Shared,
            tags: []
          };
        });
@@ -132,7 +133,7 @@ const DropZone = ({
    if (file === undefined) {
      createNotification({
        text: "You can't inject files from VS Code. Click 'Reveal in finder', and drag your file directly from the directory where it's located.",
-        type: "error",
+        type: "error"
      });
      setLoading(false);
      return;
@@ -26,4 +26,4 @@ export const createNotification = (
    type: myProps?.type || "info",
  });

-export const NotificationContainer = () => <ToastContainer hideProgressBar />;
+export const NotificationContainer = () => <ToastContainer pauseOnHover toastClassName="border border-mineshaft-500" style={{ width: "400px" }} />;
@@ -1,5 +1,7 @@
 import { SecretDataProps } from "public/data/frequentInterfaces";

+import { SecretType } from "@app/hooks/api/types";
+
 /**
 * This function downloads the secrets as a .env file
 * @param {object} obj
@@ -10,8 +12,8 @@ const checkOverrides = async ({ data }: { data: SecretDataProps[] }) => {
  let secrets: SecretDataProps[] = data!.map((secret) => Object.create(secret));
  const overridenSecrets = data!.filter((secret) =>
    secret.valueOverride === undefined || secret?.value !== secret?.valueOverride
-      ? "shared"
-      : "personal"
+      ? SecretType.Shared
+      : SecretType.Personal
  );
  if (overridenSecrets.length) {
    overridenSecrets.forEach((secret) => {
@@ -3,6 +3,7 @@ import crypto from "crypto";
 import { SecretDataProps, Tag } from "public/data/frequentInterfaces";

 import { fetchUserWsKey } from "@app/hooks/api/keys/queries";
+import { SecretType } from "@app/hooks/api/types";

 import { decryptAssymmetric, encryptSymmetric } from "../cryptography/crypto";

@@ -20,7 +21,7 @@ interface EncryptedSecretProps {
  secretValueCiphertext: string;
  secretValueIV: string;
  secretValueTag: string;
-  type: "personal" | "shared";
+  type: SecretType;
  tags: Tag[];
 }

@@ -108,8 +109,8 @@ const encryptSecrets = async ({
        secretCommentTag,
        type:
          secret.valueOverride === undefined || secret?.value !== secret?.valueOverride
-            ? "shared"
-            : "personal",
+            ? SecretType.Shared
+            : SecretType.Personal,
        tags: secret.tags
      };

@@ -15,7 +15,7 @@ const replaceContentWithDot = (str: string) => {
 };

 const syntaxHighlight = (content?: string | null, isVisible?: boolean, isImport?: boolean) => {
-  if (isImport) return "IMPORTED";
+  if (isImport && !content) return "IMPORTED";
  if (content === "") return "EMPTY";
  if (!content) return "EMPTY";
  if (!isVisible) return replaceContentWithDot(content);
@@ -36,61 +36,73 @@ export const Select = forwardRef<HTMLButtonElement, SelectProps>(
    ref
  ): JSX.Element => {
    return (
-      <SelectPrimitive.Root {...props} disabled={isDisabled}>
-        <SelectPrimitive.Trigger
-          ref={ref}
-          className={twMerge(
-            `inline-flex items-center justify-between rounded-md
-            bg-mineshaft-900 px-3 py-2 font-inter text-sm font-normal text-bunker-200 outline-none focus:bg-mineshaft-700/80 data-[placeholder]:text-mineshaft-200`,
-            className,
-            isDisabled && "cursor-not-allowed opacity-50"
-          )}
-        >
-          <SelectPrimitive.Value placeholder={placeholder}>
-            {props.icon ? <FontAwesomeIcon icon={props.icon} /> : placeholder}
-          </SelectPrimitive.Value>
+      <div className="flex items-center space-x-2">
+        <SelectPrimitive.Root
+          {...props}
+          onValueChange={(value) => {
+            if (!props.onValueChange) return;

-          <SelectPrimitive.Icon className="ml-3">
-            <FontAwesomeIcon
-              icon={faCaretDown}
-              size="sm"
-              className={twMerge(isDisabled && "opacity-30")}
-            />
-          </SelectPrimitive.Icon>
-        </SelectPrimitive.Trigger>
-        <SelectPrimitive.Portal>
-          <SelectPrimitive.Content
+            const newValue = value === "EMPTY-VALUE" ? "" : value;
+            props.onValueChange(newValue);
+          }}
+          disabled={isDisabled}
+        >
+          <SelectPrimitive.Trigger
+            ref={ref}
            className={twMerge(
-              "relative top-1 z-[100] overflow-hidden rounded-md border border-mineshaft-600 bg-mineshaft-900 font-inter text-bunker-100 shadow-md",
-              position === "popper" && "max-h-72",
-              dropdownContainerClassName
+              `inline-flex items-center justify-between rounded-md
+            bg-mineshaft-900 px-3 py-2 font-inter text-sm font-normal text-bunker-200 outline-none focus:bg-mineshaft-700/80 data-[placeholder]:text-mineshaft-200`,
+              className,
+              isDisabled && "cursor-not-allowed opacity-50"
            )}
-            position={position}
-            style={{ width: "var(--radix-select-trigger-width)" }}
          >
-            <SelectPrimitive.ScrollUpButton>
-              <div className="flex items-center justify-center">
-                <FontAwesomeIcon icon={faCaretUp} size="sm" />
-              </div>
-            </SelectPrimitive.ScrollUpButton>
-            <SelectPrimitive.Viewport className="p-1">
-              {isLoading ? (
-                <div className="flex items-center justify-center">
-                  <Spinner size="xs" />
-                  <span className="ml-2 text-xs text-gray-500">Loading...</span>
-                </div>
-              ) : (
-                children
+            <div className="flex items-center space-x-2">
+              {props.icon && <FontAwesomeIcon icon={props.icon} />}
+              <SelectPrimitive.Value placeholder={placeholder} />
+            </div>
+
+            <SelectPrimitive.Icon className="ml-3">
+              <FontAwesomeIcon
+                icon={faCaretDown}
+                size="sm"
+                className={twMerge(isDisabled && "opacity-30")}
+              />
+            </SelectPrimitive.Icon>
+          </SelectPrimitive.Trigger>
+          <SelectPrimitive.Portal>
+            <SelectPrimitive.Content
+              className={twMerge(
+                "relative top-1 z-[100] overflow-hidden rounded-md border border-mineshaft-600 bg-mineshaft-900 font-inter text-bunker-100 shadow-md",
+                position === "popper" && "max-h-72",
+                dropdownContainerClassName
              )}
-            </SelectPrimitive.Viewport>
-            <SelectPrimitive.ScrollDownButton>
-              <div className="flex items-center justify-center">
-                <FontAwesomeIcon icon={faCaretDown} size="sm" />
-              </div>
-            </SelectPrimitive.ScrollDownButton>
-          </SelectPrimitive.Content>
-        </SelectPrimitive.Portal>
-      </SelectPrimitive.Root>
+              position={position}
+              style={{ width: "var(--radix-select-trigger-width)" }}
+            >
+              <SelectPrimitive.ScrollUpButton>
+                <div className="flex items-center justify-center">
+                  <FontAwesomeIcon icon={faCaretUp} size="sm" />
+                </div>
+              </SelectPrimitive.ScrollUpButton>
+              <SelectPrimitive.Viewport className="p-1">
+                {isLoading ? (
+                  <div className="flex items-center justify-center">
+                    <Spinner size="xs" />
+                    <span className="ml-2 text-xs text-gray-500">Loading...</span>
+                  </div>
+                ) : (
+                  children
+                )}
+              </SelectPrimitive.Viewport>
+              <SelectPrimitive.ScrollDownButton>
+                <div className="flex items-center justify-center">
+                  <FontAwesomeIcon icon={faCaretDown} size="sm" />
+                </div>
+              </SelectPrimitive.ScrollDownButton>
+            </SelectPrimitive.Content>
+          </SelectPrimitive.Portal>
+        </SelectPrimitive.Root>
+      </div>
    );
  }
 );
@@ -114,7 +126,7 @@ export const SelectItem = forwardRef<HTMLDivElement, SelectItemProps>(
          outline-none transition-all hover:bg-mineshaft-500 data-[highlighted]:bg-mineshaft-700/80`,
          isSelected && "bg-primary",
          isDisabled &&
-          "cursor-not-allowed text-gray-600 hover:bg-transparent hover:text-mineshaft-600",
+            "cursor-not-allowed text-gray-600 hover:bg-transparent hover:text-mineshaft-600",
          className
        )}
        ref={forwardedRef}
@@ -129,3 +141,45 @@ export const SelectItem = forwardRef<HTMLDivElement, SelectItemProps>(
 );

 SelectItem.displayName = "SelectItem";
+
+export type SelectClearProps = Omit<SelectItemProps, "disabled" | "value"> & {
+  onClear: () => void;
+  selectValue: string;
+};
+
+export const SelectClear = forwardRef<HTMLDivElement, SelectClearProps>(
+  (
+    { children, className, isSelected, isDisabled, onClear, selectValue, ...props },
+    forwardedRef
+  ) => {
+    return (
+      <SelectPrimitive.Item
+        {...props}
+        value="EMPTY-VALUE"
+        onSelect={() => onClear()}
+        onClick={() => onClear()}
+        className={twMerge(
+          `relative mb-0.5 flex
+          cursor-pointer select-none items-center rounded-md py-2 pl-10 pr-4 text-sm
+          outline-none transition-all hover:bg-mineshaft-500 data-[highlighted]:bg-mineshaft-700/80`,
+          isSelected && "bg-primary",
+          isDisabled &&
+            "cursor-not-allowed text-gray-600 hover:bg-transparent hover:text-mineshaft-600",
+          className
+        )}
+        ref={forwardedRef}
+      >
+        <div
+          className={twMerge(
+            "absolute left-3.5 text-primary",
+            selectValue === "" ? "visible" : "hidden"
+          )}
+        >
+          <FontAwesomeIcon icon={faCheck} />
+        </div>
+        <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+      </SelectPrimitive.Item>
+    );
+  }
+);
+SelectClear.displayName = "SelectClear";
@@ -1,2 +1,2 @@
 export type { SelectItemProps, SelectProps } from "./Select";
-export { Select, SelectItem } from "./Select";
+export { Select, SelectClear, SelectItem } from "./Select";
@@ -5,7 +5,10 @@ export type TServerConfig = {
  isMigrationModeOn?: boolean;
  trustSamlEmails: boolean;
  trustLdapEmails: boolean;
+  trustOidcEmails: boolean;
  isSecretScanningDisabled: boolean;
+  defaultAuthOrgSlug: string | null;
+  defaultAuthOrgId: string | null;
 };

 export type TCreateAdminUserDTO = {
@@ -81,6 +81,7 @@ export type TCreateCertificateDTO = {
  caId: string;
  friendlyName?: string;
  commonName: string;
+  altNames: string; // sans
  ttl: string; // string compatible with ms
  notBefore?: string;
  notAfter?: string;
@@ -6,6 +6,7 @@ export type TCertificate = {
  status: CertStatus;
  friendlyName: string;
  commonName: string;
+  altNames: string;
  serialNumber: string;
  notBefore: string;
  notAfter: string;
@@ -17,6 +17,7 @@ export * from "./integrationAuth";
 export * from "./integrations";
 export * from "./keys";
 export * from "./ldapConfig";
+export * from "./oidcConfig";
 export * from "./organization";
 export * from "./projectUserAdditionalPrivilege";
 export * from "./rateLimit";
@@ -0,0 +1 @@
+export * from "./queries";
@@ -0,0 +1,111 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { oidcConfigKeys } from "./queries";
+
+export const useUpdateOIDCConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      issuer,
+      authorizationEndpoint,
+      configurationType,
+      discoveryURL,
+      jwksUri,
+      tokenEndpoint,
+      userinfoEndpoint,
+      allowedEmailDomains,
+      clientId,
+      clientSecret,
+      isActive,
+      orgSlug
+    }: {
+      allowedEmailDomains?: string;
+      issuer?: string;
+      authorizationEndpoint?: string;
+      discoveryURL?: string;
+      jwksUri?: string;
+      tokenEndpoint?: string;
+      userinfoEndpoint?: string;
+      clientId?: string;
+      clientSecret?: string;
+      isActive?: boolean;
+      configurationType?: string;
+      orgSlug: string;
+    }) => {
+      const { data } = await apiRequest.patch("/api/v1/sso/oidc/config", {
+        issuer,
+        allowedEmailDomains,
+        authorizationEndpoint,
+        discoveryURL,
+        configurationType,
+        jwksUri,
+        tokenEndpoint,
+        userinfoEndpoint,
+        clientId,
+        orgSlug,
+        clientSecret,
+        isActive
+      });
+
+      return data;
+    },
+    onSuccess(_, dto) {
+      queryClient.invalidateQueries(oidcConfigKeys.getOIDCConfig(dto.orgSlug));
+    }
+  });
+};
+
+export const useCreateOIDCConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: async ({
+      issuer,
+      configurationType,
+      discoveryURL,
+      authorizationEndpoint,
+      allowedEmailDomains,
+      jwksUri,
+      tokenEndpoint,
+      userinfoEndpoint,
+      clientId,
+      clientSecret,
+      isActive,
+      orgSlug
+    }: {
+      issuer?: string;
+      configurationType: string;
+      discoveryURL?: string;
+      authorizationEndpoint?: string;
+      jwksUri?: string;
+      tokenEndpoint?: string;
+      userinfoEndpoint?: string;
+      clientId: string;
+      clientSecret: string;
+      isActive: boolean;
+      orgSlug: string;
+      allowedEmailDomains?: string;
+    }) => {
+      const { data } = await apiRequest.post("/api/v1/sso/oidc/config", {
+        issuer,
+        configurationType,
+        discoveryURL,
+        authorizationEndpoint,
+        allowedEmailDomains,
+        jwksUri,
+        tokenEndpoint,
+        userinfoEndpoint,
+        clientId,
+        clientSecret,
+        isActive,
+        orgSlug
+      });
+
+      return data;
+    },
+    onSuccess(_, dto) {
+      queryClient.invalidateQueries(oidcConfigKeys.getOIDCConfig(dto.orgSlug));
+    }
+  });
+};
@@ -0,0 +1,23 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { OIDCConfigData } from "./types";
+
+export const oidcConfigKeys = {
+  getOIDCConfig: (orgSlug: string) => [{ orgSlug }, "organization-oidc"] as const
+};
+
+export const useGetOIDCConfig = (orgSlug: string) => {
+  return useQuery({
+    queryKey: oidcConfigKeys.getOIDCConfig(orgSlug),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<OIDCConfigData>(
+        `/api/v1/sso/oidc/config?orgSlug=${orgSlug}`
+      );
+
+      return data;
+    },
+    enabled: true
+  });
+};
@@ -0,0 +1,15 @@
+export type OIDCConfigData = {
+  id: string;
+  issuer: string;
+  authorizationEndpoint: string;
+  configurationType: string;
+  discoveryURL: string;
+  jwksUri: string;
+  tokenEndpoint: string;
+  userinfoEndpoint: string;
+  isActive: boolean;
+  orgId: string;
+  clientId: string;
+  clientSecret: string;
+  allowedEmailDomains?: string;
+};
@@ -279,7 +279,28 @@ export const useGetImportedSecretsAllEnvs = ({
    [(secretImports || []).map((response) => response.data)]
  );

-  return { secretImports, isImportedSecretPresentInEnv };
+  const getImportedSecretByKey = useCallback(
+    (envSlug: string, secretName: string) => {
+      const selectedEnvIndex = environments.indexOf(envSlug);
+
+      if (selectedEnvIndex !== -1) {
+        const secret = secretImports?.[selectedEnvIndex]?.data?.find(({ secrets }) =>
+          secrets.find((s) => s.key === secretName)
+        );
+
+        if (!secret) return undefined;
+
+        return {
+          secret: secret?.secrets.find((s) => s.key === secretName),
+          environmentInfo: secret?.environmentInfo
+        };
+      }
+      return undefined;
+    },
+    [(secretImports || []).map((response) => response.data)]
+  );
+
+  return { secretImports, isImportedSecretPresentInEnv, getImportedSecretByKey };
 };

 export const useGetImportedFoldersByEnv = ({
@@ -7,7 +7,7 @@ import {
 } from "@app/components/utilities/cryptography/crypto";
 import { apiRequest } from "@app/config/request";

-import { DecryptedSecret } from "../secrets/types";
+import { DecryptedSecret, SecretType } from "../secrets/types";
 import {
  TGetSecretSnapshotsDTO,
  TSecretRollbackDTO,
@@ -112,7 +112,7 @@ export const useGetSnapshotSecrets = ({ decryptFileKey, snapshotId }: TSnapshotD
          version: encSecret.version
        };

-        if (encSecret.type === "personal") {
+        if (encSecret.type === SecretType.Personal) {
          personalSecrets[decryptedSecret.key] = { id: encSecret.secretId, value: secretValue };
        } else {
          sharedSecrets.push(decryptedSecret);
@@ -14,6 +14,7 @@ import {
  EncryptedSecret,
  EncryptedSecretVersion,
  GetSecretVersionsDTO,
+  SecretType,
  TGetProjectSecretsAllEnvDTO,
  TGetProjectSecretsDTO,
  TGetProjectSecretsKey
@@ -77,7 +78,7 @@ export const decryptSecrets = (
      skipMultilineEncoding: encSecret.skipMultilineEncoding
    };

-    if (encSecret.type === "personal") {
+    if (encSecret.type === SecretType.Personal) {
      personalSecrets[decryptedSecret.key] = {
        id: encSecret.id,
        value: secretValue
@@ -1,11 +1,16 @@
 import type { UserWsKeyPair } from "../keys/types";
 import type { WsTag } from "../tags/types";

+export enum SecretType {
+  Shared = "shared",
+  Personal = "personal"
+}
+
 export type EncryptedSecret = {
  id: string;
  version: number;
  workspace: string;
-  type: "shared" | "personal";
+  type: SecretType;
  environment: string;
  secretKeyCiphertext: string;
  secretKeyIV: string;
@@ -49,7 +54,7 @@ export type EncryptedSecretVersion = {
  secretId: string;
  version: number;
  workspace: string;
-  type: string;
+  type: SecretType;
  isDeleted: boolean;
  envId: string;
  secretKeyCiphertext: string;
@@ -101,14 +106,14 @@ export type TCreateSecretsV3DTO = {
  secretPath: string;
  workspaceId: string;
  environment: string;
-  type: string;
+  type: SecretType;
 };

 export type TUpdateSecretsV3DTO = {
  latestFileKey: UserWsKeyPair;
  workspaceId: string;
  environment: string;
-  type: string;
+  type: SecretType;
  secretPath: string;
  skipMultilineEncoding?: boolean;
  newSecretName?: string;
@@ -124,7 +129,7 @@ export type TUpdateSecretsV3DTO = {
 export type TDeleteSecretsV3DTO = {
  workspaceId: string;
  environment: string;
-  type: "shared" | "personal";
+  type: SecretType;
  secretPath: string;
  secretName: string;
  secretId?: string;
@@ -140,7 +145,7 @@ export type TCreateSecretBatchDTO = {
    secretValue: string;
    secretComment: string;
    skipMultilineEncoding?: boolean;
-    type: "shared" | "personal";
+    type: SecretType;
    metadata?: {
      source?: string;
    };
@@ -153,7 +158,7 @@ export type TUpdateSecretBatchDTO = {
  secretPath: string;
  latestFileKey: UserWsKeyPair;
  secrets: Array<{
-    type: "shared" | "personal";
+    type: SecretType;
    secretName: string;
    skipMultilineEncoding?: boolean;
    secretValue: string;
@@ -168,14 +173,14 @@ export type TDeleteSecretBatchDTO = {
  secretPath: string;
  secrets: Array<{
    secretName: string;
-    type: "shared" | "personal";
+    type: SecretType;
  }>;
 };

 export type CreateSecretDTO = {
  workspaceId: string;
  environment: string;
-  type: "shared" | "personal";
+  type: SecretType;
  secretKey: string;
  secretKeyCiphertext: string;
  secretKeyIV: string;
@@ -4,5 +4,5 @@ export type ServerStatus = {
  emailConfigured: boolean;
  secretScanningConfigured: boolean;
  redisConfigured: boolean;
-  samlDefaultOrgSlug: boolean
+  samlDefaultOrgSlug: string;
 };
@@ -23,6 +23,7 @@ export type SubscriptionPlan = {
  workspacesUsed: number;
  environmentLimit: number;
  samlSSO: boolean;
+  oidcSSO: boolean;
  scim: boolean;
  ldap: boolean;
  groups: boolean;
@@ -29,7 +29,8 @@ export type User = {

 export enum UserAliasType {
  LDAP = "ldap",
-  SAML = "saml"
+  SAML = "saml",
+  OIDC = "oidc"
 }

 export type UserEnc = {
@@ -297,6 +297,7 @@ export const IntegrationsSection = ({
          (popUp?.deleteConfirmation?.data as TIntegration)?.app ||
          (popUp?.deleteConfirmation?.data as TIntegration)?.owner ||
          (popUp?.deleteConfirmation?.data as TIntegration)?.path ||
+          (popUp?.deleteConfirmation?.data as TIntegration)?.integration ||
          ""
        }
        onDeleteApproved={async () =>
@@ -1,16 +1,15 @@
 import { useEffect, useState } from "react";
-import { useRouter } from "next/router";

 import { isLoggedIn } from "@app/reactQuery";

-import { InitialStep, MFAStep, SAMLSSOStep } from "./components";
-import { navigateUserToSelectOrg } from "./Login.utils";
+import { InitialStep, MFAStep, SSOStep } from "./components";
+import { useNavigateToSelectOrganization } from "./Login.utils";

 export const Login = () => {
-  const router = useRouter();
  const [step, setStep] = useState(0);
  const [email, setEmail] = useState("");
  const [password, setPassword] = useState("");
+  const { navigateToSelectOrganization } = useNavigateToSelectOrganization();

  const queryParams = new URLSearchParams(window.location.search);

@@ -21,10 +20,10 @@ export const Login = () => {
        const callbackPort = queryParams?.get("callback_port");
        // case: a callback port is set, meaning it's a cli login request: redirect to select org with callback port
        if (callbackPort) {
-          navigateUserToSelectOrg(router, callbackPort);
+          navigateToSelectOrganization(callbackPort);
        } else {
          // case: no callback port, meaning it's a regular login request: redirect to select org
-          navigateUserToSelectOrg(router);
+          navigateToSelectOrganization();
        }
      } catch (error) {
        console.log("Error - Not logged in yet");
@@ -57,7 +56,9 @@ export const Login = () => {
          />
        );
      case 2:
-        return <SAMLSSOStep setStep={setStep} />;
+        return <SSOStep setStep={setStep} type="SAML" />;
+      case 3:
+        return <SSOStep setStep={setStep} type="OIDC" />;
      default:
        return <div />;
    }
@@ -1,5 +1,7 @@
-import { NextRouter } from "next/router";
+import { NextRouter, useRouter } from "next/router";

+import { useServerConfig } from "@app/context";
+import { useSelectOrganization } from "@app/hooks/api";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { userKeys } from "@app/hooks/api/users/queries";
 import { queryClient } from "@app/reactQuery";
@@ -27,14 +29,29 @@ export const navigateUserToOrg = async (router: NextRouter, organizationId?: str
  }
 };

-export const navigateUserToSelectOrg = (router: NextRouter, cliCallbackPort?: string) => {
-  queryClient.invalidateQueries(userKeys.getUser);
+export const useNavigateToSelectOrganization = () => {
+  const { config } = useServerConfig();
+  const selectOrganization = useSelectOrganization();
+  const router = useRouter();

-  let redirectTo = "/login/select-organization";
+  const navigate = async (cliCallbackPort?: string) => {
+    if (config.defaultAuthOrgId) {
+      await selectOrganization.mutateAsync({
+        organizationId: config.defaultAuthOrgId
+      });

-  if (cliCallbackPort) {
-    redirectTo += `?callback_port=${cliCallbackPort}`;
-  }
+      await navigateUserToOrg(router, config.defaultAuthOrgId);
+    }

-  router.push(redirectTo, undefined, { shallow: true });
+    queryClient.invalidateQueries(userKeys.getUser);
+    let redirectTo = "/login/select-organization";
+
+    if (cliCallbackPort) {
+      redirectTo += `?callback_port=${cliCallbackPort}`;
+    }
+
+    router.push(redirectTo, undefined, { shallow: true });
+  };
+
+  return { navigateToSelectOrganization: navigate };
 };
@@ -4,15 +4,19 @@ import { useRouter } from "next/router";

 import { createNotification } from "@app/components/notifications";
 import { Button, Input } from "@app/components/v2";
+import { useServerConfig } from "@app/context";
 import { loginLDAPRedirect } from "@app/hooks/api/auth/queries";

 export const LoginLDAP = () => {
  const router = useRouter();
+  const { config } = useServerConfig();
  const queryParams = new URLSearchParams(window.location.search);
  const passedOrgSlug = queryParams.get("organizationSlug");
  const passedUsername = queryParams.get("username");

-  const [organizationSlug, setOrganizationSlug] = useState(passedOrgSlug || "");
+  const [organizationSlug, setOrganizationSlug] = useState(
+    config.defaultAuthOrgSlug || passedOrgSlug || ""
+  );
  const [username, setUsername] = useState(passedUsername || "");
  const [password, setPassword] = useState("");

@@ -63,21 +67,22 @@ export const LoginLDAP = () => {
        What&apos;s your LDAP Login?
      </p>
      <form onSubmit={handleSubmission}>
-        <div className="relative mx-auto flex max-h-24 w-1/4 w-full min-w-[20rem] items-center justify-center rounded-lg md:max-h-28 md:min-w-[22rem] lg:w-1/6">
-          <div className="flex max-h-24 w-full items-center justify-center rounded-lg md:max-h-28">
-            <Input
-              value={organizationSlug}
-              onChange={(e) => setOrganizationSlug(e.target.value)}
-              type="text"
-              placeholder="Enter your organization slug..."
-              isRequired
-              autoComplete="email"
-              id="email"
-              className="h-12"
-              isDisabled={passedOrgSlug !== null}
-            />
+        {!config.defaultAuthOrgSlug && !passedOrgSlug && (
+          <div className="relative mx-auto flex max-h-24 w-1/4 w-full min-w-[20rem] items-center justify-center rounded-lg md:max-h-28 md:min-w-[22rem] lg:w-1/6">
+            <div className="flex max-h-24 w-full items-center justify-center rounded-lg md:max-h-28">
+              <Input
+                value={organizationSlug}
+                onChange={(e) => setOrganizationSlug(e.target.value)}
+                type="text"
+                placeholder="Enter your organization slug..."
+                isRequired
+                autoComplete="email"
+                id="email"
+                className="h-12"
+              />
+            </div>
          </div>
-        </div>
+        )}
        <div className="relative mx-auto mt-2 flex max-h-24 w-1/4 w-full min-w-[20rem] items-center justify-center rounded-lg md:max-h-28 md:min-w-[22rem] lg:w-1/6">
          <div className="flex max-h-24 w-full items-center justify-center rounded-lg md:max-h-28">
            <Input
@@ -1,4 +1,4 @@
-import { FormEvent, useEffect, useRef, useState } from "react";
+import { FormEvent, useCallback, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -16,7 +16,7 @@ import { Button, Input } from "@app/components/v2";
 import { useServerConfig } from "@app/context";
 import { useFetchServerStatus } from "@app/hooks/api";

-import { navigateUserToSelectOrg } from "../../Login.utils";
+import { useNavigateToSelectOrganization } from "../../Login.utils";

 type Props = {
  setStep: (step: number) => void;
@@ -39,14 +39,28 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
  const captchaRef = useRef<HCaptcha>(null);
  const { data: serverDetails } = useFetchServerStatus();

+  const { navigateToSelectOrganization } = useNavigateToSelectOrganization();
+
+  const redirectToSaml = (orgSlug: string) => {
+    const callbackPort = queryParams.get("callback_port");
+    const redirectUrl = `/api/v1/sso/redirect/saml2/organizations/${orgSlug}${
+      callbackPort ? `?callback_port=${callbackPort}` : ""
+    }`;
+    router.push(redirectUrl);
+  };
+
  useEffect(() => {
-      if (serverDetails?.samlDefaultOrgSlug){
-        const callbackPort = queryParams.get("callback_port");
-        const redirectUrl = `/api/v1/sso/redirect/saml2/organizations/${serverDetails?.samlDefaultOrgSlug}${callbackPort ? `?callback_port=${callbackPort}` : ""}`
-        router.push(redirectUrl);
-      }
+    if (serverDetails?.samlDefaultOrgSlug) redirectToSaml(serverDetails.samlDefaultOrgSlug);
  }, [serverDetails?.samlDefaultOrgSlug]);

+  const handleSaml = useCallback((step: number) => {
+    if (config.defaultAuthOrgSlug) {
+      redirectToSaml(config.defaultAuthOrgSlug);
+    } else {
+      setStep(step);
+    }
+  }, []);
+
  const handleLogin = async (e: FormEvent<HTMLFormElement>) => {
    e.preventDefault();
    try {
@@ -73,7 +87,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
            return;
          }

-          navigateUserToSelectOrg(router, callbackPort!);
+          navigateToSelectOrganization(callbackPort!);
        } else {
          setLoginError(true);
          createNotification({
@@ -98,7 +112,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
            return;
          }

-          navigateUserToSelectOrg(router);
+          navigateToSelectOrganization();

          // case: login does not require MFA step
          createNotification({
@@ -209,7 +223,7 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
          colorSchema="primary"
          variant="outline_bg"
          onClick={() => {
-            setStep(2);
+            handleSaml(2);
          }}
          leftIcon={<FontAwesomeIcon icon={faLock} className="mr-2" />}
          className="mx-0 h-10 w-full"
@@ -217,6 +231,19 @@ export const InitialStep = ({ setStep, email, setEmail, password, setPassword }:
          Continue with SAML
        </Button>
      </div>
+      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
+        <Button
+          colorSchema="primary"
+          variant="outline_bg"
+          onClick={() => {
+            setStep(3);
+          }}
+          leftIcon={<FontAwesomeIcon icon={faLock} className="mr-2" />}
+          className="mx-0 h-10 w-full"
+        >
+          Continue with OIDC
+        </Button>
+      </div>
      <div className="mt-2 w-1/4 min-w-[21.2rem] rounded-md text-center md:min-w-[20.1rem] lg:w-1/6">
        <Button
          colorSchema="primary"
@@ -16,7 +16,7 @@ import { useSelectOrganization, verifyMfaToken } from "@app/hooks/api/auth/queri
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { fetchMyPrivateKey } from "@app/hooks/api/users/queries";

-import { navigateUserToOrg, navigateUserToSelectOrg } from "../../Login.utils";
+import { navigateUserToOrg, useNavigateToSelectOrganization } from "../../Login.utils";

 // The style for the verification code input
 const props = {
@@ -50,6 +50,7 @@ export const MFAStep = ({ email, password, providerAuthToken }: Props) => {
  const [isLoading, setIsLoading] = useState(false);
  const [isLoadingResend, setIsLoadingResend] = useState(false);
  const [mfaCode, setMfaCode] = useState("");
+  const { navigateToSelectOrganization } = useNavigateToSelectOrganization();
  const [triesLeft, setTriesLeft] = useState<number | undefined>(undefined);

  const { t } = useTranslation();
@@ -93,7 +94,7 @@ export const MFAStep = ({ email, password, providerAuthToken }: Props) => {

      // case: user has orgs, so we navigate the user to select an org
      if (userOrgs.length > 0) {
-        navigateUserToSelectOrg(router, callbackPort);
+        navigateToSelectOrganization(callbackPort);
      }
      // case: no orgs found, so we navigate the user to create an org
      // cli login will fail in this case
@@ -166,7 +167,7 @@ export const MFAStep = ({ email, password, providerAuthToken }: Props) => {

            // case: user has orgs, so we navigate the user to select an org
            if (userOrgs.length > 0) {
-              navigateUserToSelectOrg(router, callbackPort);
+              navigateToSelectOrganization(callbackPort);
            }
            // case: no orgs found, so we navigate the user to create an org
            // cli login will fail in this case
@@ -195,7 +196,7 @@ export const MFAStep = ({ email, password, providerAuthToken }: Props) => {
          if (organizationId) {
            await navigateUserToOrg(router, organizationId);
          } else {
-            navigateUserToSelectOrg(router);
+            navigateToSelectOrganization();
          }
        } else {
          createNotification({
@@ -1,4 +1,4 @@
-import { useEffect, useRef,useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import Link from "next/link";
 import { useRouter } from "next/router";
@@ -16,7 +16,7 @@ import { useOauthTokenExchange, useSelectOrganization } from "@app/hooks/api";
 import { fetchOrganizations } from "@app/hooks/api/organization/queries";
 import { fetchMyPrivateKey } from "@app/hooks/api/users/queries";

-import { navigateUserToOrg, navigateUserToSelectOrg } from "../../Login.utils";
+import { navigateUserToOrg, useNavigateToSelectOrganization } from "../../Login.utils";

 type Props = {
  providerAuthToken: string;
@@ -39,8 +39,11 @@ export const PasswordStep = ({
  const { mutateAsync: selectOrganization } = useSelectOrganization();
  const { mutateAsync: oauthTokenExchange } = useOauthTokenExchange();

-  const { callbackPort, organizationId, hasExchangedPrivateKey } =
-    jwt_decode(providerAuthToken) as any;
+  const { navigateToSelectOrganization } = useNavigateToSelectOrganization();
+
+  const { callbackPort, organizationId, hasExchangedPrivateKey } = jwt_decode(
+    providerAuthToken
+  ) as any;

  const handleExchange = async () => {
    try {
@@ -92,7 +95,7 @@ export const PasswordStep = ({

        // case: user has orgs, so we navigate the user to select an org
        if (userOrgs.length > 0) {
-          navigateUserToSelectOrg(router, callbackPort);
+          navigateToSelectOrganization(callbackPort);
        }
        // case: no orgs found, so we navigate the user to create an org
        else {
@@ -176,7 +179,7 @@ export const PasswordStep = ({

            // case: user has orgs, so we navigate the user to select an org
            if (userOrgs.length > 0) {
-              navigateUserToSelectOrg(router, callbackPort);
+              navigateToSelectOrganization(callbackPort);
            }
            // case: no orgs found, so we navigate the user to create an org
            else {
@@ -220,7 +223,7 @@ export const PasswordStep = ({
            const userOrgs = await fetchOrganizations();

            if (userOrgs.length > 0) {
-              navigateUserToSelectOrg(router);
+              navigateToSelectOrganization();
            } else {
              await navigateUserToOrg(router);
            }
@@ -270,7 +273,7 @@ export const PasswordStep = ({
    <form onSubmit={handleLogin} className="mx-auto h-full w-full max-w-md px-6 pt-8">
      <div className="mb-8">
        <p className="mx-auto mb-4 flex w-max justify-center bg-gradient-to-b from-white to-bunker-200 bg-clip-text text-center text-xl font-medium text-transparent">
-           What&apos;s your Infisical password?
+          What&apos;s your Infisical password?
        </p>
      </div>
      <div className="relative mx-auto flex max-h-24 w-1/4 w-full min-w-[22rem] items-center justify-center rounded-lg md:max-h-28 lg:w-1/6">
@@ -1 +0,0 @@
-export { SAMLSSOStep } from "./SAMLSSOStep";
@@ -5,9 +5,10 @@ import { Button, Input } from "@app/components/v2";

 type Props = {
  setStep: (step: number) => void;
+  type: "SAML" | "OIDC";
 };

-export const SAMLSSOStep = ({ setStep }: Props) => {
+export const SSOStep = ({ setStep, type }: Props) => {
  const [ssoIdentifier, setSSOIdentifier] = useState("");
  const { t } = useTranslation();

@@ -16,21 +17,30 @@ export const SAMLSSOStep = ({ setStep }: Props) => {
  const handleSubmission = (e: React.FormEvent) => {
    e.preventDefault();
    const callbackPort = queryParams.get("callback_port");
-    window.open(
-      `/api/v1/sso/redirect/saml2/organizations/${ssoIdentifier}${
-        callbackPort ? `?callback_port=${callbackPort}` : ""
-      }`
-    );
+    if (type === "SAML") {
+      window.open(
+        `/api/v1/sso/redirect/saml2/organizations/${ssoIdentifier}${
+          callbackPort ? `?callback_port=${callbackPort}` : ""
+        }`
+      );
+    } else {
+      window.open(
+        `/api/v1/sso/oidc/login?orgSlug=${ssoIdentifier}${
+          callbackPort ? `&callbackPort=${callbackPort}` : ""
+        }`
+      );
+    }
+
    window.close();
  };

  return (
    <div className="mx-auto w-full max-w-md md:px-6">
-      <p className="mx-auto mb-6 mb-8 flex w-max justify-center bg-gradient-to-b from-white to-bunker-200 bg-clip-text text-center text-xl font-medium text-transparent">
+      <p className="mx-auto mb-8 flex w-max justify-center bg-gradient-to-b from-white to-bunker-200 bg-clip-text text-center text-xl font-medium text-transparent">
        What&apos;s your organization slug?
      </p>
      <form onSubmit={handleSubmission}>
-        <div className="relative mx-auto flex max-h-24 w-1/4 w-full min-w-[20rem] items-center justify-center rounded-lg md:max-h-28 md:min-w-[22rem] lg:w-1/6">
+        <div className="relative mx-auto flex max-h-24 w-full min-w-[20rem] items-center justify-center rounded-lg md:max-h-28 md:min-w-[22rem] lg:w-1/6">
          <div className="flex max-h-24 w-full items-center justify-center rounded-lg md:max-h-28">
            <Input
              value={ssoIdentifier}
@@ -44,7 +54,7 @@ export const SAMLSSOStep = ({ setStep }: Props) => {
            />
          </div>
        </div>
-        <div className="mx-auto mt-4 flex w-1/4 w-full min-w-[20rem] items-center justify-center rounded-md text-center md:min-w-[22rem] lg:w-1/6">
+        <div className="mx-auto mt-4 flex w-full min-w-[20rem] items-center justify-center rounded-md text-center md:min-w-[22rem] lg:w-1/6">
          <Button
            type="submit"
            colorSchema="primary"
@@ -52,7 +62,7 @@ export const SAMLSSOStep = ({ setStep }: Props) => {
            isFullWidth
            className="h-14"
          >
-            Continue with SAML
+            Continue with {type}
          </Button>
        </div>
      </form>
@@ -0,0 +1 @@
+export { SSOStep } from "./SSOStep";
@@ -1,6 +1,6 @@
 export { InitialStep } from "./InitialStep";
 export { MFAStep } from "./MFAStep";
-export { SAMLSSOStep } from "./SAMLSSOStep";
+export { SSOStep } from "./SSOStep";

 // SSO-specific step
 export { PasswordStep } from "./PasswordStep";
@@ -24,6 +24,7 @@ const schema = z.object({
  caId: z.string(),
  friendlyName: z.string(),
  commonName: z.string().trim().min(1),
+  altNames: z.string(),
  ttl: z.string().trim()
 });

@@ -71,6 +72,7 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
        caId: cert.caId,
        friendlyName: cert.friendlyName,
        commonName: cert.commonName,
+        altNames: cert.altNames,
        ttl: ""
      });
    } else {
@@ -78,12 +80,13 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
        caId: "",
        friendlyName: "",
        commonName: "",
+        altNames: "",
        ttl: ""
      });
    }
  }, [cert]);

-  const onFormSubmit = async ({ caId, friendlyName, commonName, ttl }: FormData) => {
+  const onFormSubmit = async ({ caId, friendlyName, commonName, altNames, ttl }: FormData) => {
    try {
      if (!currentWorkspace?.slug) return;

@@ -92,6 +95,7 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
        caId,
        friendlyName,
        commonName,
+        altNames,
        ttl
      });

@@ -192,6 +196,24 @@ export const CertificateModal = ({ popUp, handlePopUpToggle }: Props) => {
                </FormControl>
              )}
            />
+            <Controller
+              control={control}
+              defaultValue=""
+              name="altNames"
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  label="Alternative Names (SANs)"
+                  isError={Boolean(error)}
+                  errorText={error?.message}
+                >
+                  <Input
+                    {...field}
+                    placeholder="app1.acme.com, app2.acme.com, ..."
+                    isDisabled={Boolean(cert)}
+                  />
+                </FormControl>
+              )}
+            />
            <Controller
              control={control}
              name="ttl"
@@ -47,7 +47,7 @@ import { ProjectPermissionActions, ProjectPermissionSub, useSubscription } from
 import { interpolateSecrets } from "@app/helpers/secret";
 import { usePopUp } from "@app/hooks";
 import { useCreateFolder, useDeleteSecretBatch, useGetUserWsKey } from "@app/hooks/api";
-import { DecryptedSecret, TImportedSecrets, WsTag } from "@app/hooks/api/types";
+import { DecryptedSecret, SecretType, TImportedSecrets, WsTag } from "@app/hooks/api/types";
 import { debounce } from "@app/lib/fn/debounce";

 import {
@@ -211,7 +211,7 @@ export const ActionBar = ({
        secretPath,
        workspaceId,
        environment,
-        secrets: bulkDeletedSecrets.map(({ key }) => ({ secretName: key, type: "shared" }))
+        secrets: bulkDeletedSecrets.map(({ key }) => ({ secretName: key, type: SecretType.Shared }))
      });
      resetSelectedSecret();
      handlePopUpClose("bulkDeleteSecrets");
@@ -6,7 +6,7 @@ import { createNotification } from "@app/components/notifications";
 import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2";
 import { InfisicalSecretInput } from "@app/components/v2/InfisicalSecretInput";
 import { useCreateSecretV3 } from "@app/hooks/api";
-import { UserWsKeyPair } from "@app/hooks/api/types";
+import { SecretType, UserWsKeyPair } from "@app/hooks/api/types";

 import { PopUpNames, usePopUpAction, usePopUpState } from "../../SecretMainPage.store";

@@ -56,7 +56,7 @@ export const CreateSecretForm = ({
        secretName: key,
        secretValue: value || "",
        secretComment: "",
-        type: "shared",
+        type: SecretType.Shared,
        latestFileKey: decryptFileKey
      });
      closePopUp(PopUpNames.CreateSecretForm);
@@ -16,7 +16,7 @@ import { usePopUp, useToggle } from "@app/hooks";
 import { useCreateSecretBatch, useUpdateSecretBatch } from "@app/hooks/api";
 import { secretApprovalRequestKeys } from "@app/hooks/api/secretApprovalRequest/queries";
 import { secretKeys } from "@app/hooks/api/secrets/queries";
-import { DecryptedSecret, UserWsKeyPair } from "@app/hooks/api/types";
+import { DecryptedSecret, SecretType, UserWsKeyPair } from "@app/hooks/api/types";

 import { PopUpNames, usePopUpAction } from "../../SecretMainPage.store";
 import { CopySecretsFromBoard } from "./CopySecretsFromBoard";
@@ -170,7 +170,7 @@ export const SecretDropzone = ({
          workspaceId,
          environment,
          secrets: Object.entries(create).map(([secretName, secData]) => ({
-            type: "shared",
+            type: SecretType.Shared,
            secretComment: secData.comments.join("\n"),
            secretValue: secData.value,
            secretName
@@ -184,7 +184,7 @@ export const SecretDropzone = ({
          workspaceId,
          environment,
          secrets: Object.entries(update).map(([secretName, secData]) => ({
-            type: "shared",
+            type: SecretType.Shared,
            secretComment: secData.comments.join("\n"),
            secretValue: secData.value,
            secretName
@@ -7,6 +7,7 @@ import {
  faCircleDot,
  faClock,
  faPlus,
+  faShare,
  faTag
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -57,6 +58,7 @@ type Props = {
  ) => Promise<void>;
  tags: WsTag[];
  onCreateTag: () => void;
+  handleSecretShare: (value: string) => void;
 };

 export const SecretDetailSidebar = ({
@@ -69,7 +71,8 @@ export const SecretDetailSidebar = ({
  tags,
  onCreateTag,
  environment,
-  secretPath
+  secretPath,
+  handleSecretShare
 }: Props) => {
  const {
    register,
@@ -381,7 +384,7 @@ export const SecretDetailSidebar = ({
                  rows={5}
                />
              </FormControl>
-              <div className="my-2 mb-6 border-b border-mineshaft-600 pb-4">
+              <div className="my-2 mb-4 border-b border-mineshaft-600 pb-4">
                <Controller
                  control={control}
                  name="skipMultilineEncoding"
@@ -412,7 +415,17 @@ export const SecretDetailSidebar = ({
                  )}
                />
              </div>
-              <div className="dark mb-4 flex-grow text-sm text-bunker-300">
+              <div className="ml-1 flex items-center space-x-2">
+                <Button
+                  className="px-2 py-1"
+                  variant="outline_bg"
+                  leftIcon={<FontAwesomeIcon icon={faShare} />}
+                  onClick={() => handleSecretShare(secret.valueOverride ?? secret.value)}
+                >
+                  Share Secret
+                </Button>
+              </div>
+              <div className="dark mt-4 mb-4 flex-grow text-sm text-bunker-300">
                <div className="mb-2">Version History</div>
                <div className="flex h-48 flex-col space-y-2 overflow-y-auto overflow-x-hidden rounded-md border border-mineshaft-600 bg-bunker-800 p-2 dark:[color-scheme:dark]">
                  {secretVersion?.map(({ createdAt, value, id }, i) => (
@@ -61,6 +61,7 @@ type Props = {
  onCreateTag: () => void;
  environment: string;
  secretPath: string;
+  handleSecretShare: () => void;
 };

 export const SecretItem = memo(
@@ -75,7 +76,8 @@ export const SecretItem = memo(
    onCreateTag,
    onToggleSecretSelect,
    environment,
-    secretPath
+    secretPath,
+    handleSecretShare
  }: Props) => {
    const { currentWorkspace } = useWorkspace();
    const { permission } = useProjectPermission();
@@ -420,8 +422,9 @@ export const SecretItem = memo(
                      <Tooltip
                        content={
                          secretReminderRepeatDays && secretReminderRepeatDays > 0
-                            ? `Every ${secretReminderRepeatDays} day${Number(secretReminderRepeatDays) > 1 ? "s" : ""
-                            }
+                            ? `Every ${secretReminderRepeatDays} day${
+                                Number(secretReminderRepeatDays) > 1 ? "s" : ""
+                              }
                          `
                            : "Reminder"
                        }
@@ -461,6 +464,20 @@ export const SecretItem = memo(
                        </PopoverTrigger>
                      )}
                    </ProjectPermissionCan>
+                    <IconButton
+                      className="w-0 overflow-hidden p-0 group-hover:mr-2 group-hover:w-5 data-[state=open]:w-6"
+                      variant="plain"
+                      size="md"
+                      ariaLabel="share-secret"
+                      onClick={handleSecretShare}
+                    >
+                      <Tooltip content="Share Secret">
+                        <FontAwesomeSymbol
+                          className="h-3.5 w-3.5"
+                          symbolName={FontAwesomeSpriteName.ShareSecret}
+                        />
+                      </Tooltip>
+                    </IconButton>
                    <PopoverContent
                      className="w-auto border border-mineshaft-600 bg-mineshaft-800 p-2 drop-shadow-2xl"
                      sticky="always"
@@ -10,9 +10,10 @@ import { usePopUp } from "@app/hooks";
 import { useCreateSecretV3, useDeleteSecretV3, useUpdateSecretV3 } from "@app/hooks/api";
 import { secretApprovalRequestKeys } from "@app/hooks/api/secretApprovalRequest/queries";
 import { secretKeys } from "@app/hooks/api/secrets/queries";
-import { DecryptedSecret } from "@app/hooks/api/secrets/types";
+import { DecryptedSecret, SecretType } from "@app/hooks/api/secrets/types";
 import { secretSnapshotKeys } from "@app/hooks/api/secretSnapshots/queries";
 import { UserWsKeyPair, WsTag } from "@app/hooks/api/types";
+import { AddShareSecretModal } from "@app/views/ShareSecretPage/components/AddShareSecretModal";

 import { useSelectedSecretActions, useSelectedSecrets } from "../../SecretMainPage.store";
 import { Filter, GroupBy, SortDir } from "../../SecretMainPage.types";
@@ -95,7 +96,8 @@ export const SecretListView = ({
  const { popUp, handlePopUpToggle, handlePopUpOpen, handlePopUpClose } = usePopUp([
    "deleteSecret",
    "secretDetail",
-    "createTag"
+    "createTag",
+    "createSharedSecret"
  ] as const);

  // strip of side effect queries
@@ -119,7 +121,7 @@ export const SecretListView = ({

  const handleSecretOperation = async (
    operation: "create" | "update" | "delete",
-    type: "shared" | "personal",
+    type: SecretType,
    key: string,
    {
      value,
@@ -227,23 +229,25 @@ export const SecretListView = ({
      try {
        // personal secret change
        if (overrideAction === "deleted") {
-          await handleSecretOperation("delete", "personal", oldKey, {
+          await handleSecretOperation("delete", SecretType.Personal, oldKey, {
            secretId: orgSecret.idOverride
          });
        } else if (overrideAction && idOverride) {
-          await handleSecretOperation("update", "personal", oldKey, {
+          await handleSecretOperation("update", SecretType.Personal, oldKey, {
            value: valueOverride,
            newKey: hasKeyChanged ? key : undefined,
            secretId: orgSecret.idOverride,
            skipMultilineEncoding: modSecret.skipMultilineEncoding
          });
        } else if (overrideAction) {
-          await handleSecretOperation("create", "personal", oldKey, { value: valueOverride });
+          await handleSecretOperation("create", SecretType.Personal, oldKey, {
+            value: valueOverride
+          });
        }

        // shared secret change
        if (!isSharedSecUnchanged) {
-          await handleSecretOperation("update", "shared", oldKey, {
+          await handleSecretOperation("update", SecretType.Shared, oldKey, {
            value,
            tags: tagIds,
            comment,
@@ -286,7 +290,7 @@ export const SecretListView = ({
  const handleSecretDelete = useCallback(async () => {
    const { key, id: secretId } = popUp.deleteSecret?.data as DecryptedSecret;
    try {
-      await handleSecretOperation("delete", "shared", key, { secretId });
+      await handleSecretOperation("delete", SecretType.Shared, key, { secretId });
      // wrap this in another function and then reuse
      queryClient.invalidateQueries(
        secretKeys.getProjectSecret({ workspaceId, environment, secretPath })
@@ -363,6 +367,11 @@ export const SecretListView = ({
                  onDeleteSecret={onDeleteSecret}
                  onDetailViewSecret={onDetailViewSecret}
                  onCreateTag={onCreateTag}
+                  handleSecretShare={() =>
+                    handlePopUpOpen("createSharedSecret", {
+                      value: secret.valueOverride ?? secret.value
+                    })
+                  }
                />
              ))}
            </div>
@@ -389,11 +398,18 @@ export const SecretListView = ({
        onSaveSecret={handleSaveSecret}
        tags={wsTags}
        onCreateTag={() => handlePopUpOpen("createTag")}
+        handleSecretShare={(value: string) => handlePopUpOpen("createSharedSecret", { value })}
      />
      <CreateTagModal
        isOpen={popUp.createTag.isOpen}
        onToggle={(isOpen) => handlePopUpToggle("createTag", isOpen)}
      />
+      <AddShareSecretModal
+        popUp={popUp}
+        handlePopUpToggle={handlePopUpToggle}
+        isPublic={false}
+        inModal
+      />
    </>
  );
 };
@@ -10,6 +10,7 @@ import {
  faCopy,
  faEllipsis,
  faKey,
+  faShare,
  faTags
 } from "@fortawesome/free-solid-svg-icons";
 import { z } from "zod";
@@ -66,7 +67,8 @@ export enum FontAwesomeSpriteName {
  Override = "secret-override",
  Close = "close",
  CheckedCircle = "check-circle",
-  ReplicatedSecretKey = "secret-replicated"
+  ReplicatedSecretKey = "secret-replicated",
+  ShareSecret = "share-secret"
 }

 // this is an optimization technique
@@ -82,5 +84,6 @@ export const FontAwesomeSpriteSymbols = [
  { icon: faCodeBranch, symbol: FontAwesomeSpriteName.Override },
  { icon: faClose, symbol: FontAwesomeSpriteName.Close },
  { icon: faCheckCircle, symbol: FontAwesomeSpriteName.CheckedCircle },
-  { icon: faClone, symbol: FontAwesomeSpriteName.ReplicatedSecretKey }
+  { icon: faClone, symbol: FontAwesomeSpriteName.ReplicatedSecretKey },
+  { icon: faShare, symbol: FontAwesomeSpriteName.ShareSecret }
 ];
@@ -64,7 +64,7 @@ import {
 } from "@app/hooks/api";
 import { useUpdateFolderBatch } from "@app/hooks/api/secretFolders/queries";
 import { TUpdateFolderBatchDTO } from "@app/hooks/api/secretFolders/types";
-import { TSecretFolder } from "@app/hooks/api/types";
+import { SecretType, TSecretFolder } from "@app/hooks/api/types";
 import { ProjectVersion } from "@app/hooks/api/workspace/types";

 import { FolderForm } from "../SecretMainPage/components/ActionBar/FolderForm";
@@ -188,7 +188,7 @@ export const SecretOverviewPage = () => {
    environments: userAvailableEnvs.map(({ slug }) => slug)
  });

-  const { isImportedSecretPresentInEnv } = useGetImportedSecretsAllEnvs({
+  const { isImportedSecretPresentInEnv, getImportedSecretByKey } = useGetImportedSecretsAllEnvs({
    projectId: workspaceId,
    decryptFileKey: latestFileKey!,
    path: secretPath,
@@ -320,7 +320,7 @@ export const SecretOverviewPage = () => {
        secretName: key,
        secretValue: value,
        secretComment: "",
-        type: "shared",
+        type: SecretType.Shared,
        latestFileKey: latestFileKey!
      });
      createNotification({
@@ -344,7 +344,13 @@ export const SecretOverviewPage = () => {
    }
  };

-  const handleSecretUpdate = async (env: string, key: string, value: string, secretId?: string) => {
+  const handleSecretUpdate = async (
+    env: string,
+    key: string,
+    value: string,
+    type = SecretType.Shared,
+    secretId?: string
+  ) => {
    try {
      await updateSecretV3({
        environment: env,
@@ -353,7 +359,7 @@ export const SecretOverviewPage = () => {
        secretId,
        secretName: key,
        secretValue: value,
-        type: "shared",
+        type,
        latestFileKey: latestFileKey!
      });
      createNotification({
@@ -377,7 +383,7 @@ export const SecretOverviewPage = () => {
        secretPath,
        secretName: key,
        secretId,
-        type: "shared"
+        type: SecretType.Shared
      });
      createNotification({
        type: "success",
@@ -807,6 +813,7 @@ export const SecretOverviewPage = () => {
                      isSelected={selectedEntries.secret[key]}
                      onToggleSecretSelect={() => toggleSelectedEntry(EntryType.SECRET, key)}
                      secretPath={secretPath}
+                      getImportedSecretByKey={getImportedSecretByKey}
                      isImportedSecretPresentInEnv={isImportedSecretPresentInEnv}
                      onSecretCreate={handleSecretCreate}
                      onSecretDelete={handleSecretDelete}
@@ -18,7 +18,7 @@ import {
 import { InfisicalSecretInput } from "@app/components/v2/InfisicalSecretInput";
 import { useWorkspace } from "@app/context";
 import { useCreateFolder, useCreateSecretV3, useUpdateSecretV3 } from "@app/hooks/api";
-import { DecryptedSecret, UserWsKeyPair } from "@app/hooks/api/types";
+import { DecryptedSecret, SecretType, UserWsKeyPair } from "@app/hooks/api/types";

 const typeSchema = z
  .object({
@@ -103,7 +103,7 @@ export const CreateSecretForm = ({
          secretPath,
          secretName: key,
          secretValue: value || "",
-          type: "shared",
+          type: SecretType.Shared,
          latestFileKey: decryptFileKey
        });
      }
@@ -115,7 +115,7 @@ export const CreateSecretForm = ({
        secretName: key,
        secretValue: value || "",
        secretComment: "",
-        type: "shared",
+        type: SecretType.Shared,
        latestFileKey: decryptFileKey
      });
    });
@@ -10,24 +10,33 @@ import { IconButton, Tooltip } from "@app/components/v2";
 import { InfisicalSecretInput } from "@app/components/v2/InfisicalSecretInput";
 import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
 import { useToggle } from "@app/hooks";
+import { SecretType } from "@app/hooks/api/types";

 type Props = {
  defaultValue?: string | null;
  secretName: string;
  secretId?: string;
+  isOverride?: boolean;
  isCreatable?: boolean;
  isVisible?: boolean;
  isImportedSecret: boolean;
  environment: string;
  secretPath: string;
  onSecretCreate: (env: string, key: string, value: string) => Promise<void>;
-  onSecretUpdate: (env: string, key: string, value: string, secretId?: string) => Promise<void>;
+  onSecretUpdate: (
+    env: string,
+    key: string,
+    value: string,
+    type?: SecretType,
+    secretId?: string
+  ) => Promise<void>;
  onSecretDelete: (env: string, key: string, secretId?: string) => Promise<void>;
 };

 export const SecretEditRow = ({
  defaultValue,
  isCreatable,
+  isOverride,
  isImportedSecret,
  onSecretUpdate,
  secretName,
@@ -73,7 +82,13 @@ export const SecretEditRow = ({
      if (isCreatable) {
        await onSecretCreate(environment, secretName, value);
      } else {
-        await onSecretUpdate(environment, secretName, value, secretId);
+        await onSecretUpdate(
+          environment,
+          secretName,
+          value,
+          isOverride ? SecretType.Personal : SecretType.Shared,
+          secretId
+        );
      }
    }
    reset({ value });
@@ -93,12 +108,13 @@ export const SecretEditRow = ({
    <div className="group flex w-full cursor-text items-center space-x-2">
      <div className="flex-grow border-r border-r-mineshaft-600 pr-2 pl-1">
        <Controller
-          disabled={isImportedSecret}
+          disabled={isImportedSecret && !defaultValue}
          control={control}
          name="value"
          render={({ field }) => (
            <InfisicalSecretInput
              {...field}
+              isReadOnly={isImportedSecret}
              value={field.value as string}
              key="secret-input"
              isVisible={isVisible}
@@ -13,7 +13,8 @@ import { twMerge } from "tailwind-merge";

 import { Button, Checkbox, TableContainer, Td, Tooltip, Tr } from "@app/components/v2";
 import { useToggle } from "@app/hooks";
-import { DecryptedSecret } from "@app/hooks/api/secrets/types";
+import { DecryptedSecret, SecretType } from "@app/hooks/api/secrets/types";
+import { WorkspaceEnv } from "@app/hooks/api/types";

 import { SecretEditRow } from "./SecretEditRow";
 import SecretRenameRow from "./SecretRenameRow";
@@ -27,9 +28,19 @@ type Props = {
  onToggleSecretSelect: (key: string) => void;
  getSecretByKey: (slug: string, key: string) => DecryptedSecret | undefined;
  onSecretCreate: (env: string, key: string, value: string) => Promise<void>;
-  onSecretUpdate: (env: string, key: string, value: string, secretId?: string) => Promise<void>;
+  onSecretUpdate: (
+    env: string,
+    key: string,
+    value: string,
+    type?: SecretType,
+    secretId?: string
+  ) => Promise<void>;
  onSecretDelete: (env: string, key: string, secretId?: string) => Promise<void>;
  isImportedSecretPresentInEnv: (env: string, secretName: string) => boolean;
+  getImportedSecretByKey: (
+    env: string,
+    secretName: string
+  ) => { secret?: DecryptedSecret; environmentInfo?: WorkspaceEnv } | undefined;
 };

 export const SecretOverviewTableRow = ({
@@ -41,6 +52,7 @@ export const SecretOverviewTableRow = ({
  onSecretCreate,
  onSecretDelete,
  isImportedSecretPresentInEnv,
+  getImportedSecretByKey,
  expandableColWidth,
  onToggleSecretSelect,
  isSelected
@@ -53,8 +65,9 @@ export const SecretOverviewTableRow = ({
    <>
      <Tr isHoverable isSelectable onClick={() => setIsFormExpanded.toggle()} className="group">
        <Td
-          className={`sticky left-0 z-10 bg-mineshaft-800 bg-clip-padding py-0 px-0 group-hover:bg-mineshaft-700 ${isFormExpanded && "border-t-2 border-mineshaft-500"
-            }`}
+          className={`sticky left-0 z-10 bg-mineshaft-800 bg-clip-padding py-0 px-0 group-hover:bg-mineshaft-700 ${
+            isFormExpanded && "border-t-2 border-mineshaft-500"
+          }`}
        >
          <div className="h-full w-full border-r border-mineshaft-600 py-2.5 px-5">
            <div className="flex items-center space-x-5">
@@ -107,8 +120,8 @@ export const SecretOverviewTableRow = ({
                        isSecretPresent
                          ? "Present secret"
                          : isSecretImported
-                            ? "Imported secret"
-                            : "Missing secret"
+                          ? "Imported secret"
+                          : "Missing secret"
                      }
                    >
                      <FontAwesomeIcon
@@ -132,8 +145,9 @@ export const SecretOverviewTableRow = ({
        <Tr>
          <Td
            colSpan={totalCols}
-            className={`bg-bunker-600 px-0 py-0 ${isFormExpanded && "border-b-2 border-mineshaft-500"
-              }`}
+            className={`bg-bunker-600 px-0 py-0 ${
+              isFormExpanded && "border-b-2 border-mineshaft-500"
+            }`}
          >
            <div
              className="ml-2 p-2"
@@ -179,6 +193,7 @@ export const SecretOverviewTableRow = ({
                      const isCreatable = !secret;

                      const isImportedSecret = isImportedSecretPresentInEnv(slug, secretKey);
+                      const importedSecret = getImportedSecretByKey(slug, secretKey);

                      return (
                        <tr
@@ -189,8 +204,15 @@ export const SecretOverviewTableRow = ({
                            className="flex h-full items-center"
                            style={{ padding: "0.25rem 1rem" }}
                          >
-                            <div title={name} className="flex h-8 w-[8rem] items-center ">
+                            <div title={name} className="flex h-8 w-[8rem] items-center space-x-2 ">
                              <span className="truncate">{name}</span>
+                              {isImportedSecret && (
+                                <Tooltip
+                                  content={`Imported secret from the '${importedSecret?.environmentInfo?.name}' environment`}
+                                >
+                                  <FontAwesomeIcon icon={faFileImport} />
+                                </Tooltip>
+                              )}
                            </div>
                          </td>
                          <td className="col-span-2 h-8 w-full">
@@ -198,8 +220,13 @@ export const SecretOverviewTableRow = ({
                              secretPath={secretPath}
                              isVisible={isSecretVisible}
                              secretName={secretKey}
-                              defaultValue={secret?.value}
+                              defaultValue={
+                                secret?.valueOverride ||
+                                secret?.value ||
+                                importedSecret?.secret?.value
+                              }
                              secretId={secret?.id}
+                              isOverride={Boolean(secret?.valueOverride)}
                              isImportedSecret={isImportedSecret}
                              isCreatable={isCreatable}
                              onSecretDelete={onSecretDelete}
@@ -18,7 +18,7 @@ import {
 } from "@app/context";
 import { useToggle } from "@app/hooks";
 import { useGetUserWsKey, useUpdateSecretV3 } from "@app/hooks/api";
-import { DecryptedSecret } from "@app/hooks/api/types";
+import { DecryptedSecret, SecretType } from "@app/hooks/api/types";
 import { SecretActionType } from "@app/views/SecretMainPage/components/SecretListView/SecretListView.utils";

 type Props = {
@@ -37,7 +37,6 @@ type TFormSchema = z.infer<typeof formSchema>;
 function SecretRenameRow({ environments, getSecretByKey, secretKey, secretPath }: Props) {
  const { currentWorkspace } = useWorkspace();
  const { permission } = useProjectPermission();
-  

  const secrets = environments.map((env) => getSecretByKey(env.slug, secretKey));

@@ -113,7 +112,7 @@ function SecretRenameRow({ environments, getSecretByKey, secretKey, secretPath }
          secretName: secret.key,
          secretId: secret.id,
          secretValue: secret.value || "",
-          type: "shared",
+          type: SecretType.Shared,
          latestFileKey: decryptFileKey!,
          tags: secret.tags.map((tag) => tag.id),
          secretComment: secret.comment,
@@ -13,7 +13,12 @@ import {
 } from "@app/context";
 import { usePopUp } from "@app/hooks";
 import { useDeleteFolder, useDeleteSecretBatch } from "@app/hooks/api";
-import { DecryptedSecret, TDeleteSecretBatchDTO, TSecretFolder } from "@app/hooks/api/types";
+import {
+  DecryptedSecret,
+  SecretType,
+  TDeleteSecretBatchDTO,
+  TSecretFolder
+} from "@app/hooks/api/types";

 export enum EntryType {
  FOLDER = "folder",
@@ -100,7 +105,7 @@ export const SelectionPanel = ({
              ...accum,
              {
                secretName: entry.key,
-                type: "shared" as "shared"
+                type: SecretType.Shared
              }
            ];
          }
@@ -0,0 +1,404 @@
+import { useEffect } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+
+import { createNotification } from "@app/components/notifications";
+import {
+  Button,
+  FormControl,
+  Input,
+  Modal,
+  ModalContent,
+  Select,
+  SelectItem
+} from "@app/components/v2";
+import { useOrganization } from "@app/context";
+import { useToggle } from "@app/hooks";
+import { useGetOIDCConfig } from "@app/hooks/api";
+import { useCreateOIDCConfig, useUpdateOIDCConfig } from "@app/hooks/api/oidcConfig/mutations";
+import { UsePopUpState } from "@app/hooks/usePopUp";
+
+enum ConfigurationType {
+  CUSTOM = "custom",
+  DISCOVERY_URL = "discoveryURL"
+}
+
+type Props = {
+  popUp: UsePopUpState<["addOIDC"]>;
+  handlePopUpClose: (popUpName: keyof UsePopUpState<["addOIDC"]>) => void;
+  handlePopUpToggle: (popUpName: keyof UsePopUpState<["addOIDC"]>, state?: boolean) => void;
+};
+
+const schema = z
+  .object({
+    configurationType: z.string(),
+    issuer: z.string().optional(),
+    discoveryURL: z.string().optional(),
+    authorizationEndpoint: z.string().optional(),
+    jwksUri: z.string().optional(),
+    tokenEndpoint: z.string().optional(),
+    userinfoEndpoint: z.string().optional(),
+    clientId: z.string().min(1),
+    clientSecret: z.string().min(1),
+    allowedEmailDomains: z.string().optional()
+  })
+  .superRefine((data, ctx) => {
+    if (data.configurationType === ConfigurationType.CUSTOM) {
+      if (!data.issuer) {
+        ctx.addIssue({
+          path: ["issuer"],
+          message: "Issuer is required",
+          code: z.ZodIssueCode.custom
+        });
+      }
+      if (!data.authorizationEndpoint) {
+        ctx.addIssue({
+          path: ["authorizationEndpoint"],
+          message: "Authorization endpoint is required",
+          code: z.ZodIssueCode.custom
+        });
+      }
+      if (!data.jwksUri) {
+        ctx.addIssue({
+          path: ["jwksUri"],
+          message: "JWKS URI is required",
+          code: z.ZodIssueCode.custom
+        });
+      }
+      if (!data.tokenEndpoint) {
+        ctx.addIssue({
+          path: ["tokenEndpoint"],
+          message: "Token endpoint is required",
+          code: z.ZodIssueCode.custom
+        });
+      }
+      if (!data.userinfoEndpoint) {
+        ctx.addIssue({
+          path: ["userinfoEndpoint"],
+          message: "Userinfo endpoint is required",
+          code: z.ZodIssueCode.custom
+        });
+      }
+    } else {
+      // eslint-disable-next-line no-lonely-if
+      if (!data.discoveryURL) {
+        ctx.addIssue({
+          path: ["discoveryURL"],
+          message: "Discovery URL is required",
+          code: z.ZodIssueCode.custom
+        });
+      }
+    }
+  });
+
+export type OIDCFormData = z.infer<typeof schema>;
+
+export const OIDCModal = ({ popUp, handlePopUpClose, handlePopUpToggle }: Props) => {
+  const { currentOrg } = useOrganization();
+
+  const { mutateAsync: createMutateAsync, isLoading: createIsLoading } = useCreateOIDCConfig();
+  const { mutateAsync: updateMutateAsync, isLoading: updateIsLoading } = useUpdateOIDCConfig();
+  const { data } = useGetOIDCConfig(currentOrg?.slug ?? "");
+
+  const { control, handleSubmit, reset, setValue, watch } = useForm<OIDCFormData>({
+    resolver: zodResolver(schema),
+    defaultValues: {
+      configurationType: ConfigurationType.DISCOVERY_URL
+    }
+  });
+
+  const [isClientIdFocused, setIsClientIdFocused] = useToggle();
+  const [isClientSecretFocused, setIsClientSecretFocused] = useToggle();
+
+  const configurationTypeValue = watch("configurationType");
+
+  useEffect(() => {
+    if (data) {
+      setValue("issuer", data.issuer);
+      setValue("authorizationEndpoint", data.authorizationEndpoint);
+      setValue("jwksUri", data.jwksUri);
+      setValue("tokenEndpoint", data.tokenEndpoint);
+      setValue("userinfoEndpoint", data.userinfoEndpoint);
+      setValue("discoveryURL", data.discoveryURL);
+      setValue("clientId", data.clientId);
+      setValue("clientSecret", data.clientSecret);
+      setValue("allowedEmailDomains", data.allowedEmailDomains);
+      setValue("configurationType", data.configurationType);
+    }
+  }, [data]);
+
+  const onOIDCModalSubmit = async ({
+    issuer,
+    authorizationEndpoint,
+    allowedEmailDomains,
+    jwksUri,
+    tokenEndpoint,
+    userinfoEndpoint,
+    configurationType,
+    discoveryURL,
+    clientId,
+    clientSecret
+  }: OIDCFormData) => {
+    try {
+      if (!currentOrg) {
+        return;
+      }
+
+      if (!data) {
+        await createMutateAsync({
+          issuer,
+          configurationType,
+          discoveryURL,
+          authorizationEndpoint,
+          allowedEmailDomains,
+          jwksUri,
+          tokenEndpoint,
+          userinfoEndpoint,
+          clientId,
+          clientSecret,
+          isActive: true,
+          orgSlug: currentOrg.slug
+        });
+      } else {
+        await updateMutateAsync({
+          issuer,
+          configurationType,
+          discoveryURL,
+          authorizationEndpoint,
+          allowedEmailDomains,
+          jwksUri,
+          tokenEndpoint,
+          userinfoEndpoint,
+          clientId,
+          clientSecret,
+          isActive: true,
+          orgSlug: currentOrg.slug
+        });
+      }
+
+      handlePopUpClose("addOIDC");
+
+      createNotification({
+        text: `Successfully ${!data ? "added" : "updated"} OIDC SSO configuration`,
+        type: "success"
+      });
+    } catch (err) {
+      console.error(err);
+      createNotification({
+        text: `Failed to ${!data ? "add" : "update"} OIDC SSO configuration`,
+        type: "error"
+      });
+    }
+  };
+
+  return (
+    <Modal
+      isOpen={popUp?.addOIDC?.isOpen}
+      onOpenChange={(isOpen) => {
+        handlePopUpToggle("addOIDC", isOpen);
+        reset();
+      }}
+    >
+      <ModalContent title="Manage OIDC configuration">
+        <form onSubmit={handleSubmit(onOIDCModalSubmit)}>
+          <Controller
+            control={control}
+            name="configurationType"
+            render={({ field: { onChange, ...field }, fieldState: { error } }) => (
+              <FormControl
+                label="Configuration Type"
+                errorText={error?.message}
+                isError={Boolean(error)}
+              >
+                <Select
+                  className="w-full"
+                  defaultValue="discoveryURL"
+                  {...field}
+                  onValueChange={(e) => onChange(e)}
+                >
+                  <SelectItem value={ConfigurationType.DISCOVERY_URL}>Discovery URL</SelectItem>
+                  <SelectItem value={ConfigurationType.CUSTOM}>Custom</SelectItem>
+                </Select>
+              </FormControl>
+            )}
+          />
+          {configurationTypeValue === ConfigurationType.DISCOVERY_URL && (
+            <Controller
+              control={control}
+              name="discoveryURL"
+              render={({ field, fieldState: { error } }) => (
+                <FormControl
+                  label="Discovery Document URL"
+                  errorText={error?.message}
+                  isError={Boolean(error)}
+                >
+                  <Input
+                    {...field}
+                    placeholder="https://accounts.google.com/.well-known/openid-configuration"
+                    autoComplete="off"
+                  />
+                </FormControl>
+              )}
+            />
+          )}
+          {configurationTypeValue === ConfigurationType.CUSTOM && (
+            <>
+              <Controller
+                control={control}
+                name="issuer"
+                render={({ field, fieldState: { error } }) => (
+                  <FormControl label="Issuer" errorText={error?.message} isError={Boolean(error)}>
+                    <Input
+                      {...field}
+                      placeholder="https://accounts.google.com"
+                      autoComplete="off"
+                    />
+                  </FormControl>
+                )}
+              />
+              <Controller
+                control={control}
+                name="authorizationEndpoint"
+                render={({ field, fieldState: { error } }) => (
+                  <FormControl
+                    label="Authorization Endpoint"
+                    errorText={error?.message}
+                    isError={Boolean(error)}
+                  >
+                    <Input
+                      {...field}
+                      placeholder="https://accounts.google.com/o/oauth2/v2/auth"
+                      autoComplete="off"
+                    />
+                  </FormControl>
+                )}
+              />
+              <Controller
+                control={control}
+                name="tokenEndpoint"
+                render={({ field, fieldState: { error } }) => (
+                  <FormControl
+                    label="Token Endpoint"
+                    errorText={error?.message}
+                    isError={Boolean(error)}
+                  >
+                    <Input
+                      {...field}
+                      placeholder="https://oauth2.googleapis.com/token"
+                      autoComplete="off"
+                    />
+                  </FormControl>
+                )}
+              />
+              <Controller
+                control={control}
+                name="userinfoEndpoint"
+                render={({ field, fieldState: { error } }) => (
+                  <FormControl
+                    label="User info endpoint"
+                    errorText={error?.message}
+                    isError={Boolean(error)}
+                  >
+                    <Input
+                      {...field}
+                      placeholder="https://openidconnect.googleapis.com/v1/userinfo"
+                      autoComplete="off"
+                    />
+                  </FormControl>
+                )}
+              />
+              <Controller
+                control={control}
+                name="jwksUri"
+                render={({ field, fieldState: { error } }) => (
+                  <FormControl label="JWKS URI" errorText={error?.message} isError={Boolean(error)}>
+                    <Input
+                      {...field}
+                      placeholder="https://www.googleapis.com/oauth2/v3/certs"
+                      autoComplete="off"
+                    />
+                  </FormControl>
+                )}
+              />
+            </>
+          )}
+          <Controller
+            control={control}
+            name="allowedEmailDomains"
+            render={({ field, fieldState: { error } }) => (
+              <FormControl
+                label="Allowed Email Domains (defaults to any)"
+                errorText={error?.message}
+                isError={Boolean(error)}
+              >
+                <Input {...field} placeholder="infisical.com, google.com" autoComplete="off" />
+              </FormControl>
+            )}
+          />
+          <Controller
+            control={control}
+            name="clientId"
+            render={({ field, fieldState: { error } }) => (
+              <FormControl label="Client ID" errorText={error?.message} isError={Boolean(error)}>
+                <Input
+                  placeholder="Client ID"
+                  type={isClientIdFocused ? "text" : "password"}
+                  onFocus={() => setIsClientIdFocused.on()}
+                  {...field}
+                  onBlur={() => {
+                    field.onBlur();
+                    setIsClientIdFocused.off();
+                  }}
+                  autoComplete="off"
+                  className="bg-mineshaft-800"
+                />
+              </FormControl>
+            )}
+          />
+          <Controller
+            control={control}
+            name="clientSecret"
+            render={({ field, fieldState: { error } }) => (
+              <FormControl
+                label="Client Secret"
+                errorText={error?.message}
+                isError={Boolean(error)}
+              >
+                <Input
+                  {...field}
+                  placeholder="Client Secret"
+                  type={isClientSecretFocused ? "text" : "password"}
+                  autoComplete="off"
+                  onFocus={() => setIsClientSecretFocused.on()}
+                  onBlur={() => {
+                    field.onBlur();
+                    setIsClientSecretFocused.off();
+                  }}
+                  className="bg-mineshaft-800"
+                />
+              </FormControl>
+            )}
+          />
+          <div className="mt-8 flex items-center">
+            <Button
+              className="mr-4"
+              size="sm"
+              type="submit"
+              isLoading={createIsLoading || updateIsLoading}
+            >
+              {!data ? "Add" : "Update"}
+            </Button>
+            <Button
+              colorSchema="secondary"
+              variant="plain"
+              onClick={() => handlePopUpClose("addOIDC")}
+            >
+              Cancel
+            </Button>
+          </div>
+        </form>
+      </ModalContent>
+    </Modal>
+  );
+};
@@ -3,6 +3,7 @@ import { withPermission } from "@app/hoc";

 import { OrgGeneralAuthSection } from "./OrgGeneralAuthSection";
 import { OrgLDAPSection } from "./OrgLDAPSection";
+import { OrgOIDCSection } from "./OrgOIDCSection";
 import { OrgScimSection } from "./OrgSCIMSection";
 import { OrgSSOSection } from "./OrgSSOSection";

@@ -12,6 +13,7 @@ export const OrgAuthTab = withPermission(
      <div className="rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-6">
        <OrgGeneralAuthSection />
        <OrgSSOSection />
+        <OrgOIDCSection />
        <OrgLDAPSection />
        <OrgScimSection />
      </div>
@@ -0,0 +1,118 @@
+import { createNotification } from "@app/components/notifications";
+import { OrgPermissionCan } from "@app/components/permissions";
+import { Button, Switch, UpgradePlanModal } from "@app/components/v2";
+import {
+  OrgPermissionActions,
+  OrgPermissionSubjects,
+  useOrganization,
+  useSubscription
+} from "@app/context";
+import { useGetOIDCConfig } from "@app/hooks/api";
+import { useUpdateOIDCConfig } from "@app/hooks/api/oidcConfig/mutations";
+import { usePopUp } from "@app/hooks/usePopUp";
+
+import { OIDCModal } from "./OIDCModal";
+
+export const OrgOIDCSection = (): JSX.Element => {
+  const { currentOrg } = useOrganization();
+  const { subscription } = useSubscription();
+
+  const { data, isLoading } = useGetOIDCConfig(currentOrg?.slug ?? "");
+  const { mutateAsync } = useUpdateOIDCConfig();
+  const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
+    "addOIDC",
+    "upgradePlan"
+  ] as const);
+
+  const handleOIDCToggle = async (value: boolean) => {
+    try {
+      if (!currentOrg?.id) return;
+
+      if (!subscription?.oidcSSO) {
+        handlePopUpOpen("upgradePlan");
+        return;
+      }
+
+      await mutateAsync({
+        orgSlug: currentOrg?.slug,
+        isActive: value
+      });
+
+      createNotification({
+        text: `Successfully ${value ? "enabled" : "disabled"} OIDC SSO`,
+        type: "success"
+      });
+    } catch (err) {
+      console.error(err);
+      createNotification({
+        text: `Failed to ${value ? "enable" : "disable"} OIDC SSO`,
+        type: "error"
+      });
+    }
+  };
+
+  const addOidcButtonClick = async () => {
+    if (subscription?.oidcSSO && currentOrg) {
+      handlePopUpOpen("addOIDC");
+    } else {
+      handlePopUpOpen("upgradePlan");
+    }
+  };
+
+  return (
+    <>
+      <hr className="border-mineshaft-600" />
+      <div className="py-4">
+        <div className="mb-2 flex items-center justify-between">
+          <h2 className="text-md text-mineshaft-100">OIDC</h2>
+          {!isLoading && (
+            <OrgPermissionCan I={OrgPermissionActions.Create} a={OrgPermissionSubjects.Sso}>
+              {(isAllowed) => (
+                <Button
+                  onClick={addOidcButtonClick}
+                  colorSchema="secondary"
+                  isDisabled={!isAllowed}
+                >
+                  Manage
+                </Button>
+              )}
+            </OrgPermissionCan>
+          )}
+        </div>
+        <p className="text-sm text-mineshaft-300">Manage OIDC authentication configuration</p>
+      </div>
+      {data && (
+        <div className="py-4">
+          <div className="mb-2 flex items-center justify-between">
+            <h2 className="text-md text-mineshaft-100">Enable OIDC</h2>
+            {!isLoading && (
+              <OrgPermissionCan I={OrgPermissionActions.Edit} a={OrgPermissionSubjects.Sso}>
+                {(isAllowed) => (
+                  <Switch
+                    id="enable-oidc-sso"
+                    onCheckedChange={(value) => handleOIDCToggle(value)}
+                    isChecked={data ? data.isActive : false}
+                    isDisabled={!isAllowed}
+                  />
+                )}
+              </OrgPermissionCan>
+            )}
+          </div>
+          <p className="text-sm text-mineshaft-300">
+            Allow members to authenticate into Infisical with OIDC
+          </p>
+        </div>
+      )}
+      <OIDCModal
+        popUp={popUp}
+        handlePopUpClose={handlePopUpClose}
+        handlePopUpToggle={handlePopUpToggle}
+      />
+      <UpgradePlanModal
+        isOpen={popUp.upgradePlan.isOpen}
+        onOpenChange={(isOpen) => handlePopUpToggle("upgradePlan", isOpen)}
+        text="You can use OIDC SSO if you switch to Infisical's Pro plan."
+      />
+    </>
+  );
+};
@@ -5,6 +5,7 @@ import { E2EESection } from "../E2EESection";
 import { EnvironmentSection } from "../EnvironmentSection";
 import { PointInTimeVersionLimitSection } from "../PointInTimeVersionLimitSection";
 import { ProjectNameChangeSection } from "../ProjectNameChangeSection";
+import { RebuildSecretIndicesSection } from "../RebuildSecretIndicesSection/RebuildSecretIndicesSection";
 import { SecretTagsSection } from "../SecretTagsSection";

 export const ProjectGeneralTab = () => {
@@ -17,6 +18,7 @@ export const ProjectGeneralTab = () => {
      <E2EESection />
      <PointInTimeVersionLimitSection />
      <BackfillSecretReferenceSecretion />
+      <RebuildSecretIndicesSection />
      <DeleteProjectSection />
    </div>
  );
@@ -0,0 +1,93 @@
+import { createNotification } from "@app/components/notifications";
+import {
+  decryptAssymmetric,
+  decryptSymmetric
+} from "@app/components/utilities/cryptography/crypto";
+import { Button } from "@app/components/v2";
+import { useProjectPermission, useWorkspace } from "@app/context";
+import { useToggle } from "@app/hooks";
+import { useGetUserWsKey, useNameWorkspaceSecrets } from "@app/hooks/api";
+import { ProjectMembershipRole } from "@app/hooks/api/roles/types";
+import { fetchWorkspaceSecrets } from "@app/hooks/api/workspace/queries";
+
+export const RebuildSecretIndicesSection = () => {
+  const { currentWorkspace } = useWorkspace();
+  const { membership } = useProjectPermission();
+  const nameWorkspaceSecrets = useNameWorkspaceSecrets();
+
+  const [isIndexing, setIsIndexing] = useToggle();
+  const { data: decryptFileKey } = useGetUserWsKey(currentWorkspace?.id!);
+
+  if (!currentWorkspace) return null;
+
+  const onRebuildIndices = async () => {
+    if (!currentWorkspace?.id) return;
+    setIsIndexing.on();
+    try {
+      const encryptedSecrets = await fetchWorkspaceSecrets(currentWorkspace.id);
+
+      if (!currentWorkspace || !decryptFileKey) {
+        return;
+      }
+
+      const key = decryptAssymmetric({
+        ciphertext: decryptFileKey.encryptedKey,
+        nonce: decryptFileKey.nonce,
+        publicKey: decryptFileKey.sender.publicKey,
+        privateKey: localStorage.getItem("PRIVATE_KEY") as string
+      });
+
+      const secretsToUpdate = encryptedSecrets.map((encryptedSecret) => {
+        const secretName = decryptSymmetric({
+          ciphertext: encryptedSecret.secretKeyCiphertext,
+          iv: encryptedSecret.secretKeyIV,
+          tag: encryptedSecret.secretKeyTag,
+          key
+        });
+
+        return {
+          secretName,
+          secretId: encryptedSecret.id
+        };
+      });
+      await nameWorkspaceSecrets.mutateAsync({
+        workspaceId: currentWorkspace.id,
+        secretsToUpdate
+      });
+
+      createNotification({
+        text: "Successfully rebuilt secret indices",
+        type: "success"
+      });
+    } catch (err) {
+      console.log(err);
+    } finally {
+      setIsIndexing.off();
+    }
+  };
+
+  const isAdmin = membership.roles.includes(ProjectMembershipRole.Admin);
+
+  if (!isAdmin) {
+    return null;
+  }
+
+  return (
+    <div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
+      <div className="flex w-full items-center justify-between">
+        <p className="text-xl font-semibold">Rebuild Secret Indices</p>
+      </div>
+      <p className="mb-4 mt-2 max-w-2xl text-sm text-gray-400">
+        This will rebuild indices of all secrets in the project.
+      </p>
+      <Button
+        variant="outline_bg"
+        isLoading={isIndexing}
+        onClick={onRebuildIndices}
+        isDisabled={!isAdmin}
+      >
+        Rebuild Secret Indices
+      </Button>
+    </div>
+  );
+};
@@ -6,15 +6,7 @@ import * as yup from "yup";

 import { createNotification } from "@app/components/notifications";
 import { encryptSymmetric } from "@app/components/utilities/cryptography/crypto";
-import {
-  Button,
-  FormControl,
-  Input,
-  ModalClose,
-  SecretInput,
-  Select,
-  SelectItem
-} from "@app/components/v2";
+import { Button, FormControl, Input, ModalClose, Select, SelectItem } from "@app/components/v2";
 import { useCreatePublicSharedSecret, useCreateSharedSecret } from "@app/hooks/api/secretSharing";

 const schema = yup.object({
@@ -32,7 +24,8 @@ export const AddShareSecretForm = ({
  handleSubmit,
  control,
  isSubmitting,
-  setNewSharedSecret
+  setNewSharedSecret,
+  isInputDisabled
 }: {
  isPublic: boolean;
  inModal: boolean;
@@ -40,6 +33,7 @@ export const AddShareSecretForm = ({
  control: any;
  isSubmitting: boolean;
  setNewSharedSecret: (value: string) => void;
+  isInputDisabled?: boolean;
 }) => {
  const publicSharedSecretCreator = useCreatePublicSharedSecret();
  const privateSharedSecretCreator = useCreateSharedSecret();
@@ -125,37 +119,39 @@ export const AddShareSecretForm = ({
  };
  return (
    <form className="flex w-full flex-col items-center" onSubmit={handleSubmit(onFormSubmit)}>
-      <div className={`${!inModal && "border border-mineshaft-600 bg-mineshaft-800 p-4"}`}>
+      <div
+        className={`${!inModal && "rounded-md border border-mineshaft-600 bg-mineshaft-800 p-6"}`}
+      >
        <div className="mb-4">
          <Controller
            control={control}
            name="value"
-            defaultValue=""
            render={({ field, fieldState: { error } }) => (
              <FormControl
                label="Shared Secret"
                isError={Boolean(error)}
                errorText={error?.message}
              >
-                <SecretInput
-                  isVisible
+                <textarea
+                  disabled={isInputDisabled}
+                  placeholder="Enter sensitive data to share via an encrypted link..."
                  {...field}
-                  containerClassName="py-1.5 rounded-md transition-all group-hover:mr-2 text-bunker-300 hover:border-primary-400/50 border border-mineshaft-600 bg-mineshaft-900 px-2 min-h-[70px]"
+                  className="h-40 min-h-[70px] w-full rounded-md border border-mineshaft-600 bg-mineshaft-900 py-1.5 px-2 text-bunker-300 outline-none transition-all placeholder:text-mineshaft-400 hover:border-primary-400/30 focus:border-primary-400/50 group-hover:mr-2"
                />
              </FormControl>
            )}
          />
        </div>
        <div className="flex w-full flex-row justify-center">
-          <div className="w-2/7 flex">
+          <div className="flex hidden sm:block sm:w-2/6">
            <Controller
              control={control}
              name="expiresAfterViews"
-              defaultValue={6}
+              defaultValue={1}
              render={({ field, fieldState: { error } }) => (
                <FormControl
                  className="mb-4 w-full"
-                  label="Expires After Views"
+                  label="Expires after Views"
                  isError={Boolean(error)}
                  errorText="Please enter a valid number of views"
                >
@@ -164,16 +160,16 @@ export const AddShareSecretForm = ({
              )}
            />
          </div>
-          <div className="w-1/7 flex items-center justify-center px-2">
+          <div className="sm:w-1/7 mx-auto hidden items-center justify-center px-2 sm:flex">
            <p className="px-4 text-sm text-gray-400">OR</p>
          </div>
-          <div className="w-4/7 flex">
-            <div className="flex w-full">
-              <div className="flex w-2/5 w-full justify-center">
+          <div className="flex w-full justify-end sm:w-3/6">
+            <div className="flex justify-start">
+              <div className="flex w-full justify-center pr-2">
                <Controller
                  control={control}
                  name="expiresInValue"
-                  defaultValue={6}
+                  defaultValue={10}
                  render={({ field, fieldState: { error } }) => (
                    <FormControl
                      label="Expires after Time"
@@ -185,7 +181,7 @@ export const AddShareSecretForm = ({
                  )}
                />
              </div>
-              <div className="flex w-3/5 w-full justify-center">
+              <div className="flex justify-center">
                <Controller
                  control={control}
                  name="expiresInUnit"
@@ -196,7 +192,7 @@ export const AddShareSecretForm = ({
                        defaultValue={field.value}
                        {...field}
                        onValueChange={(e) => onChange(e)}
-                        className="w-full"
+                        className="w-full border border-mineshaft-600"
                      >
                        {expirationUnitsAndActions.map(({ unit }) => (
                          <SelectItem value={unit} key={unit}>
@@ -211,7 +207,7 @@ export const AddShareSecretForm = ({
            </div>
          </div>
        </div>
-        <div className={`flex items-center ${!inModal && "justify-left pt-1"}`}>
+        <div className={`flex items-center ${!inModal && "justify-left pt-2"}`}>
          <Button className="mr-4" type="submit" isDisabled={isSubmitting} isLoading={isSubmitting}>
            {inModal ? "Create" : "Share Secret"}
          </Button>
@@ -34,6 +34,7 @@ export const AddShareSecretModal = ({ popUp, handlePopUpToggle, isPublic, inModa
    control,
    reset,
    handleSubmit,
+    setValue,
    formState: { isSubmitting }
  } = useForm<FormData>({
    resolver: yupResolver(schema)
@@ -45,6 +46,8 @@ export const AddShareSecretModal = ({ popUp, handlePopUpToggle, isPublic, inModa
    initialState: false
  });

+  const [isSecretInputDisabled, setIsSecretInputDisabled] = useState(false);
+
  const copyUrlToClipboard = () => {
    navigator.clipboard.writeText(newSharedSecret);
    setIsUrlCopied(true);
@@ -55,6 +58,13 @@ export const AddShareSecretModal = ({ popUp, handlePopUpToggle, isPublic, inModa
    }
  }, [isUrlCopied]);

+  useEffect(() => {
+    if (popUp.createSharedSecret.data) {
+      setValue("value", (popUp.createSharedSecret.data as { value: string }).value);
+      setIsSecretInputDisabled(true);
+    }
+  }, [popUp.createSharedSecret.data]);
+
  // eslint-disable-next-line no-nested-ternary
  return inModal ? (
    <Modal
@@ -63,6 +73,7 @@ export const AddShareSecretModal = ({ popUp, handlePopUpToggle, isPublic, inModa
        handlePopUpToggle("createSharedSecret", open);
        reset();
        setNewSharedSecret("");
+        setIsSecretInputDisabled(false);
      }}
    >
      <ModalContent
@@ -77,6 +88,7 @@ export const AddShareSecretModal = ({ popUp, handlePopUpToggle, isPublic, inModa
            handleSubmit={handleSubmit}
            isSubmitting={isSubmitting}
            setNewSharedSecret={setNewSharedSecret}
+            isInputDisabled={isSecretInputDisabled}
          />
        ) : (
          <ViewAndCopySharedSecret
@@ -96,6 +108,7 @@ export const AddShareSecretModal = ({ popUp, handlePopUpToggle, isPublic, inModa
      handleSubmit={handleSubmit}
      isSubmitting={isSubmitting}
      setNewSharedSecret={setNewSharedSecret}
+      isInputDisabled={isSecretInputDisabled}
    />
  ) : (
    <ViewAndCopySharedSecret
@@ -15,9 +15,9 @@ export const ViewAndCopySharedSecret = ({
  copyUrlToClipboard: () => void;
 }) => {
  return (
-    <div className={`flex w-full justify-center ${!inModal ? "mx-auto max-w-[40rem]" : ""}`}>
-      <div className={`${!inModal ? "border border-mineshaft-600 bg-mineshaft-800 p-4" : ""}`}>
-        <div className="my-2 flex items-center justify-end rounded-md bg-white/[0.07] p-2 text-base text-gray-400">
+    <div className={`flex w-full justify-center px-6 ${!inModal ? "mx-auto max-w-2xl" : ""}`}>
+      <div className={`${!inModal ? "border border-mineshaft-600 bg-mineshaft-800 rounded-md p-4" : ""}`}>
+        <div className="my-2 flex items-center justify-end rounded-md border border-mineshaft-500 bg-mineshaft-700 p-2 text-base text-gray-400">
          <p className="mr-4 break-all">{newSharedSecret}</p>
          <IconButton
            ariaLabel="copy icon"
@@ -3,7 +3,7 @@ import Head from "next/head";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
-import { faArrowRight, faPlus } from "@fortawesome/free-solid-svg-icons";
+import { faArrowRight } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";

 import { decryptSymmetric } from "@app/components/utilities/cryptography/crypto";
@@ -54,107 +54,114 @@ export const ShareSecretPublicPage = ({ isNewSession }: { isNewSession: boolean
    navigator.clipboard.writeText(decryptedSecret);
    setIsUrlCopied(true);
  };
-  const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["createSharedSecret"] as const);
+  const { popUp, handlePopUpToggle } = usePopUp(["createSharedSecret"] as const);

  return (
-    <div className="h-screen bg-gradient-to-tr from-mineshaft-700 to-bunker-800 text-gray-200">
+    <div className="h-screen dark:[color-scheme:dark] flex flex-col overflow-y-auto bg-gradient-to-tr from-mineshaft-700 to-bunker-800 text-gray-200">
      <Head>
        <title>Secret Shared | Infisical</title>
        <link rel="icon" href="/infisical.ico" />
      </Head>
-      <div className="h-screen w-full flex-col items-center justify-center dark:[color-scheme:dark]">
-        <div className="mb-4 flex justify-center pt-8 md:pt-16">
-          <Link href="https://infisical.com">
-            <Image
-              src="/images/gradientLogo.svg"
-              height={90}
-              width={120}
-              alt="Infisical logo"
-              className="cursor-pointer"
-            />
-          </Link>
-        </div>
-        <h1 className="mt-6 mb-4 bg-gradient-to-b from-white to-bunker-200 bg-clip-text px-4 text-center text-2xl font-medium text-transparent">
-          {id ? "Someone shared a secret on Infisical with you." : "Share Secrets with Infisical"}
-        </h1>
-        <div className="m-auto mt-8 flex w-full max-w-xl justify-center px-4">
-          {id && (
-            <SecretTable
-              isLoading={isLoading}
-              decryptedSecret={decryptedSecret}
-              isUrlCopied={isUrlCopied}
-              copyUrlToClipboard={copyUrlToClipboard}
-            />
-          )}
-        </div>
-
-        {isNewSession && (
-          <AddShareSecretModal
-            popUp={popUp}
-            handlePopUpToggle={handlePopUpToggle}
-            inModal={false}
-            isPublic
-          />
-        )}
-
-        <div className="m-auto my-6 flex w-full max-w-xl justify-center px-8 px-4 sm:my-8">
-          <div className="w-full border-t border-mineshaft-600" />
-        </div>
-
-        <div className="m-auto max-w-xl px-4">
-          {!isNewSession && (
-            <div className="flex flex-1 flex-col items-center justify-center px-4 pb-4">
-              <Button
-                className="bg-mineshaft-700 text-bunker-200"
-                colorSchema="primary"
-                variant="outline_bg"
-                size="sm"
-                onClick={() => {
-                  handlePopUpOpen("createSharedSecret");
-                }}
-                leftIcon={<FontAwesomeIcon icon={faPlus} />}
-              >
-                Share your own Secret
-              </Button>
-            </div>
-          )}
-          <div className="m-auto mb-8 flex flex max-w-xl flex-col justify-center gap-2 rounded-md border border-primary-500/30 bg-primary/5 p-6">
-            <p className="pb-2 font-semibold text-mineshaft-100 md:pb-4 md:text-xl">
-              Safe, Secure, & Open Source
-            </p>
-            <p className="md:text-md text-sm">
-              Infisical is the #1 {" "}
-              <a
-                href="https://github.com/infisical/infisical"
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-primary underline"
-              >
-                open source
-              </a>{" "}
-              secrets management platform for developers. <br className="hidden md:inline" />
-              <div className="pb-2" />
-              Infisical Secret Sharing uses end-to-end encrypted architecture to ensure that your secrets are truly private, even from our servers.
-            </p>
+      <div className="w-full flex flex-grow items-center justify-center dark:[color-scheme:dark]">
+        <div className="relative">
+          <div className="mb-4 flex justify-center pt-8">
            <Link href="https://infisical.com">
-              <span className="mt-4 cursor-pointer duration-200 hover:text-primary">
-                Learn More <FontAwesomeIcon icon={faArrowRight} />
-              </span>
+              <Image
+                src="/images/gradientLogo.svg"
+                height={90}
+                width={120}
+                alt="Infisical logo"
+                className="cursor-pointer"
+              />
            </Link>
          </div>
+          <div className="w-full flex justify-center">
+            <h1 className={`${id ? "max-w-sm mb-4": "max-w-md mt-4 mb-6"} bg-gradient-to-b from-white to-bunker-200 bg-clip-text px-4 text-center text-3xl font-medium text-transparent`}>
+              {id ? "Someone shared a secret on Infisical with you" : "Share a secret with Infisical"}
+            </h1>
+          </div>
+          <div className="m-auto mt-4 flex w-full max-w-2xl justify-center px-6">
+            {id && (
+              <SecretTable
+                isLoading={isLoading}
+                decryptedSecret={decryptedSecret}
+                isUrlCopied={isUrlCopied}
+                copyUrlToClipboard={copyUrlToClipboard}
+              />
+            )}
+          </div>
+
+          {isNewSession && (
+            <div className="px-0 sm:px-6">
+              <AddShareSecretModal
+                popUp={popUp}
+                handlePopUpToggle={handlePopUpToggle}
+                inModal={false}
+                isPublic
+              />
+            </div>
+          )}
+          {!isNewSession && (
+            <div className="flex flex-1 flex-col items-center justify-center px-6 pt-4">
+              <a
+                href="https://share.infisical.com/"
+                target="_blank"
+                rel="noopener noreferrer"
+                className="mt-3 w-full text-sm font-normal leading-[1.2rem] text-mineshaft-300 hover:text-mineshaft-100"
+              >
+                <Button
+                  className="bg-mineshaft-700 text-bunker-200 w-full py-3"
+                  colorSchema="primary"
+                  variant="outline_bg"
+                  size="sm"
+                  onClick={() => {}}
+                  rightIcon={<FontAwesomeIcon icon={faArrowRight} className="pl-2" />}
+                >
+                  Share your own Secret
+                </Button>
+              </a>
+            </div>
+          )}
+          <div className="m-auto my-6 flex w-full max-w-xl justify-center px-8 px-4 sm:my-8">
+            <div className="w-full border-t border-mineshaft-600" />
+          </div>
+          <div className="flex flex-col justify-center items-center m-auto max-w-2xl px-6">
+            <div className="m-auto mb-12 flex flex max-w-2xl w-full flex-col justify-center rounded-md border border-primary-500/30 bg-primary/5 p-6 pt-5">
+              <p className="pb-2 font-semibold text-mineshaft-100 md:pb-3 text-lg md:text-xl w-full">
+                Open source <span className="bg-clip-text text-transparent bg-gradient-to-tr from-yellow-500 to-primary-500">secret management</span> for developers
+              </p>
+              <div className="flex flex-col sm:flex-row gap-x-4">
+                <p className="md:text-md text-md">
+                  <a
+                    href="https://github.com/infisical/infisical"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="bg-clip-text text-transparent bg-gradient-to-tr from-yellow-500 to-primary-500 text-bold"
+                  >
+                    Infisical
+                  </a>{" "} is the all-in-one secret management platform to securely manage secrets, configs, and certificates across your team and infrastructure.
+                </p>
+                <Link href="https://infisical.com">
+                  <span className="mt-4 border border-mineshaft-400/40 w-[17.5rem] h-min py-2 px-3 rounded-md bg-mineshaft-600 cursor-pointer duration-200 hover:text-white hover:border-primary/60 hover:bg-primary/20">
+                    Try Infisical <FontAwesomeIcon icon={faArrowRight} className="pl-1"/>
+                  </span>
+                </Link>
+              </div>
+            </div>
+          </div>
+          <AddShareSecretModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} isPublic inModal />
        </div>
-        <div className="bottom-0 flex w-full items-center justify-center bg-mineshaft-600 p-2 sm:absolute">
-          <p className="text-center text-sm text-mineshaft-300">
-            © 2024{" "}
-            <a className="text-primary" href="https://infisical.com">
-              Infisical
-            </a>
-            . All rights reserved.
-            <br />
-            156 2nd st, 3rd Floor, San Francisco, California, 94105, United States. 🇺🇸
-          </p>
-        </div>
-        <AddShareSecretModal popUp={popUp} handlePopUpToggle={handlePopUpToggle} isPublic inModal />
+      </div>
+      <div className="mt-auto flex w-full items-center justify-center bg-mineshaft-600 p-2">
+        <p className="text-center text-sm text-mineshaft-300">
+          © 2024{" "}
+          <a className="text-primary" href="https://infisical.com">
+            Infisical
+          </a>
+          . All rights reserved.
+          <br />
+          156 2nd st, 3rd Floor, San Francisco, California, 94105, United States. 🇺🇸
+        </p>
      </div>
    </div>
  );
@@ -16,7 +16,7 @@ export const SecretTable = ({
  isUrlCopied,
  copyUrlToClipboard
 }: Props) => (
-  <div className="flex w-full items-center justify-center rounded border border-solid border-mineshaft-700 bg-mineshaft-800 p-2">
+  <div className="flex w-full items-center justify-center rounded-md border border-solid border-mineshaft-700 bg-mineshaft-800 p-2">
    {isLoading && <div className="bg-mineshaft-800 text-center text-bunker-400">Loading...</div>}
    {!isLoading && !decryptedSecret && (
      <Tr>
@@ -37,7 +37,7 @@ export const SecretTable = ({
          colorSchema="primary"
          ariaLabel="copy to clipboard"
          onClick={copyUrlToClipboard}
-          className="mx-1 flex max-h-8 items-center rounded"
+          className="mx-1 flex max-h-8 items-center rounded absolute top-1 sm:top-2 right-0 sm:right-5"
          size="xs"
        >
          <FontAwesomeIcon className="pr-2" icon={isUrlCopied ? faCheck : faCopy} /> Copy
@@ -92,6 +92,10 @@ export const EmailConfirmationStep = ({
          router.push(`/login/ldap?organizationSlug=${organizationSlug}`);
          break;
        }
+        case UserAliasType.OIDC: {
+          router.push(`/api/v1/sso/oidc/login?orgSlug=${organizationSlug}`);
+          break;
+        }
        default: {
          setStep(1);
          break;
@@ -13,6 +13,7 @@ import {
  FormControl,
  Input,
  Select,
+  SelectClear,
  SelectItem,
  Switch,
  Tab,
@@ -21,7 +22,7 @@ import {
  Tabs
 } from "@app/components/v2";
 import { useOrganization, useServerConfig, useUser } from "@app/context";
-import { useUpdateServerConfig } from "@app/hooks/api";
+import { useGetOrganizations, useUpdateServerConfig } from "@app/hooks/api";

 import { RateLimitPanel } from "./RateLimitPanel";

@@ -39,7 +40,9 @@ const formSchema = z.object({
  signUpMode: z.nativeEnum(SignUpModes),
  allowedSignUpDomain: z.string().optional().nullable(),
  trustSamlEmails: z.boolean(),
-  trustLdapEmails: z.boolean()
+  trustLdapEmails: z.boolean(),
+  trustOidcEmails: z.boolean(),
+  defaultAuthOrgId: z.string()
 });

 type TDashboardForm = z.infer<typeof formSchema>;
@@ -60,16 +63,21 @@ export const AdminDashboardPage = () => {
      signUpMode: config.allowSignUp ? SignUpModes.Anyone : SignUpModes.Disabled,
      allowedSignUpDomain: config.allowedSignUpDomain,
      trustSamlEmails: config.trustSamlEmails,
-      trustLdapEmails: config.trustLdapEmails
+      trustLdapEmails: config.trustLdapEmails,
+      trustOidcEmails: config.trustOidcEmails,
+      defaultAuthOrgId: config.defaultAuthOrgId ?? ""
    }
  });

-  const signupMode = watch("signUpMode");
+  const signUpMode = watch("signUpMode");
+  const defaultAuthOrgId = watch("defaultAuthOrgId");

  const { user, isLoading: isUserLoading } = useUser();
  const { orgs } = useOrganization();
  const { mutateAsync: updateServerConfig } = useUpdateServerConfig();

+  const organizations = useGetOrganizations();
+
  const isNotAllowed = !user?.superAdmin;

  // TODO(akhilmhdh): on nextjs 14 roadmap this will be properly addressed with context split
@@ -84,13 +92,15 @@ export const AdminDashboardPage = () => {

  const onFormSubmit = async (formData: TDashboardForm) => {
    try {
-      const { signUpMode, allowedSignUpDomain, trustSamlEmails, trustLdapEmails } = formData;
+      const { allowedSignUpDomain, trustSamlEmails, trustLdapEmails, trustOidcEmails } = formData;

      await updateServerConfig({
+        defaultAuthOrgId: defaultAuthOrgId || null,
        allowSignUp: signUpMode !== SignUpModes.Disabled,
        allowedSignUpDomain: signUpMode === SignUpModes.Anyone ? allowedSignUpDomain : null,
        trustSamlEmails,
-        trustLdapEmails
+        trustLdapEmails,
+        trustOidcEmails
      });
      createNotification({
        text: "Successfully changed sign up setting.",
@@ -126,7 +136,7 @@ export const AdminDashboardPage = () => {
            </TabList>
            <TabPanel value={TabSections.Settings}>
              <form
-                className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4"
+                className="mb-6 space-y-8 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4"
                onSubmit={handleSubmit(onFormSubmit)}
              >
                <div className="flex flex-col justify-start">
@@ -142,13 +152,13 @@ export const AdminDashboardPage = () => {
                    name="signUpMode"
                    render={({ field: { onChange, ...field }, fieldState: { error } }) => (
                      <FormControl
-                        className="max-w-72 w-72"
+                        className="max-w-sm"
                        errorText={error?.message}
                        isError={Boolean(error)}
                      >
                        <Select
-                          className="w-72 bg-mineshaft-700"
-                          dropdownContainerClassName="bg-mineshaft-700"
+                          className="w-full bg-mineshaft-700"
+                          dropdownContainerClassName="bg-mineshaft-800"
                          defaultValue={field.value}
                          onValueChange={(e) => onChange(e)}
                          {...field}
@@ -160,8 +170,8 @@ export const AdminDashboardPage = () => {
                    )}
                  />
                </div>
-                {signupMode === "anyone" && (
-                  <div className="mt-8 mb-8 flex flex-col justify-start">
+                {signUpMode === "anyone" && (
+                  <div className="flex flex-col justify-start">
                    <div className="mb-4 text-xl font-semibold text-mineshaft-100">
                      Restrict signup by email domain(s)
                    </div>
@@ -187,12 +197,57 @@ export const AdminDashboardPage = () => {
                    />
                  </div>
                )}
-                <div className="mt-8 mb-8 flex flex-col justify-start">
+
+                <div className="flex flex-col justify-start">
+                  <div className="mb-2 text-xl font-semibold text-mineshaft-100">
+                    Default organization
+                  </div>
+                  <div className="mb-4 max-w-sm text-sm text-mineshaft-400">
+                    Select the default organization you want to set for SAML/LDAP based logins. When selected, user logins will be automatically scoped to the selected organization.
+                  </div>
+                  <Controller
+                    control={control}
+                    name="defaultAuthOrgId"
+                    render={({ field: { onChange, ...field }, fieldState: { error } }) => (
+                      <FormControl
+                        className="max-w-sm"
+                        errorText={error?.message}
+                        isError={Boolean(error)}
+                      >
+                        <Select
+                          placeholder="Allow all organizations"
+                          className="w-full bg-mineshaft-700"
+                          dropdownContainerClassName="bg-mineshaft-800"
+                          defaultValue={field.value ?? " "}
+                          onValueChange={(e) => onChange(e)}
+                          {...field}
+                        >
+                          <SelectClear
+                            selectValue={defaultAuthOrgId}
+                            onClear={() => {
+                              console.log("clearing");
+                              onChange("");
+                            }}
+                          >
+                            Allow all organizations
+                          </SelectClear>
+                          {organizations.data?.map((org) => (
+                            <SelectItem key={org.id} value={org.id}>
+                              {org.name}
+                            </SelectItem>
+                          ))}
+                        </Select>
+                      </FormControl>
+                    )}
+                  />
+                </div>
+
+                <div className="flex flex-col justify-start">
                  <div className="mb-2 text-xl font-semibold text-mineshaft-100">Trust emails</div>
                  <div className="mb-4 max-w-sm text-sm text-mineshaft-400">
-                    Select if you want Infisical to trust external emails from SAML/LDAP identity
-                    providers. If set to false, then Infisical will prompt SAML/LDAP provisioned
-                    users to verify their email upon their first login.
+                    Select if you want Infisical to trust external emails from SAML/LDAP/OIDC
+                    identity providers. If set to false, then Infisical will prompt SAML/LDAP/OIDC
+                    provisioned users to verify their email upon their first login.
                  </div>
                  <Controller
                    control={control}
@@ -228,6 +283,23 @@ export const AdminDashboardPage = () => {
                      );
                    }}
                  />
+                  <Controller
+                    control={control}
+                    name="trustOidcEmails"
+                    render={({ field, fieldState: { error } }) => {
+                      return (
+                        <FormControl isError={Boolean(error)} errorText={error?.message}>
+                          <Switch
+                            id="trust-oidc-emails"
+                            onCheckedChange={(value) => field.onChange(value)}
+                            isChecked={field.value}
+                          >
+                            <p className="w-full">Trust OIDC emails</p>
+                          </Switch>
+                        </FormControl>
+                      );
+                    }}
+                  />
                </div>
                <Button
                  type="submit"
				`@@ -1 +0,0 @@`
				`export { SAMLSSOStep } from "./SAMLSSOStep";`