deconflict merge

frontend/src/hooks/api/appConnections/auth0/index.ts

@@ -0,0 +1 @@
+export * from "./queries";

frontend/src/hooks/api/appConnections/auth0/queries.tsx

@@ -0,0 +1,37 @@
+import { useQuery, UseQueryOptions } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { appConnectionKeys } from "../queries";
+import { TAuth0Client } from "./types";
+
+const auth0ConnectionKeys = {
+  all: [...appConnectionKeys.all, "auth0"] as const,
+  listClients: (connectionId: string) =>
+    [...auth0ConnectionKeys.all, "clients", connectionId] as const
+};
+
+export const useAuth0ConnectionListClients = (
+  connectionId: string,
+  options?: Omit<
+    UseQueryOptions<
+      TAuth0Client[],
+      unknown,
+      TAuth0Client[],
+      ReturnType<typeof auth0ConnectionKeys.listClients>
+    >,
+    "queryKey" | "queryFn"
+  >
+) => {
+  return useQuery({
+    queryKey: auth0ConnectionKeys.listClients(connectionId),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<{ clients: TAuth0Client[] }>(
+        `/api/v1/app-connections/auth0/${connectionId}/clients`
+      );
+
+      return data.clients;
+    },
+    ...options
+  });
+};

frontend/src/hooks/api/appConnections/auth0/types.ts

@@ -0,0 +1,4 @@
+export type TAuth0Client = {
+  name: string;
+  id: string;
+};

frontend/src/hooks/api/appConnections/enums.ts

@@ -11,5 +11,6 @@ export enum AppConnection {
   Postgres = "postgres",
   MsSql = "mssql",
   Camunda = "camunda",
-  Windmill = "windmill"
+  Windmill = "windmill",
+  Auth0 = "auth0"
 }

frontend/src/hooks/api/appConnections/queries.tsx

@@ -59,7 +59,7 @@ export const useGetAppConnectionOption = <T extends AppConnection>(app: T) => {
       option: (options.find((opt) => opt.app === app) as TAppConnectionOptionMap[T]) ?? {},
       isLoading: isPending
     }),
-    [options, app]
+    [options, app, isPending]
   );
 };
 

frontend/src/hooks/api/appConnections/types/app-options.ts

@@ -63,6 +63,10 @@ export type TWindmillConnectionOption = TAppConnectionOptionBase & {
   app: AppConnection.Windmill;
 };
 
+export type TAuth0ConnectionOption = TAppConnectionOptionBase & {
+  app: AppConnection.Auth0;
+};
+
 export type TAppConnectionOption =
   | TAwsConnectionOption
   | TGitHubConnectionOption
@@ -76,7 +80,8 @@ export type TAppConnectionOption =
   | TPostgresConnectionOption
   | TMsSqlConnectionOption
   | TCamundaConnectionOption
-  | TWindmillConnectionOption;
+  | TWindmillConnectionOption
+  | TAuth0ConnectionOption;
 
 export type TAppConnectionOptionMap = {
   [AppConnection.AWS]: TAwsConnectionOption;
@@ -92,4 +97,5 @@ export type TAppConnectionOptionMap = {
   [AppConnection.MsSql]: TMsSqlConnectionOption;
   [AppConnection.Camunda]: TCamundaConnectionOption;
   [AppConnection.Windmill]: TWindmillConnectionOption;
+  [AppConnection.Auth0]: TAuth0ConnectionOption;
 };

frontend/src/hooks/api/appConnections/types/auth0-connection.ts

@@ -0,0 +1,17 @@
+import { AppConnection } from "../enums";
+import { TRootAppConnection } from "./root-connection";
+
+export enum Auth0ConnectionMethod {
+  ClientCredentials = "client-credentials"
+}
+
+export type TAuth0Connection = TRootAppConnection & {
+  app: AppConnection.Auth0;
+} & {
+  method: Auth0ConnectionMethod.ClientCredentials;
+  credentials: {
+    domain: string;
+    clientId: string;
+    audience: string;
+  };
+};

frontend/src/hooks/api/appConnections/types/index.ts

@@ -1,5 +1,6 @@
 import { AppConnection } from "../enums";
 import { TAppConnectionOption } from "./app-options";
+import { TAuth0Connection } from "./auth0-connection";
 import { TAwsConnection } from "./aws-connection";
 import { TAzureAppConfigurationConnection } from "./azure-app-configuration-connection";
 import { TAzureKeyVaultConnection } from "./azure-key-vault-connection";
@@ -14,6 +15,7 @@ import { TTerraformCloudConnection } from "./terraform-cloud-connection";
 import { TVercelConnection } from "./vercel-connection";
 import { TWindmillConnection } from "./windmill-connection";
 
+export * from "./auth0-connection";
 export * from "./aws-connection";
 export * from "./azure-app-configuration-connection";
 export * from "./azure-key-vault-connection";
@@ -41,7 +43,8 @@ export type TAppConnection =
   | TPostgresConnection
   | TMsSqlConnection
   | TCamundaConnection
-  | TWindmillConnection;
+  | TWindmillConnection
+  | TAuth0Connection;
 
 export type TAvailableAppConnection = Pick<TAppConnection, "name" | "id">;
 
@@ -82,4 +85,5 @@ export type TAppConnectionMap = {
   [AppConnection.MsSql]: TMsSqlConnection;
   [AppConnection.Camunda]: TCamundaConnection;
   [AppConnection.Windmill]: TWindmillConnection;
+  [AppConnection.Auth0]: TAuth0Connection;
 };

frontend/src/hooks/api/oidcConfig/mutations.tsx

@@ -4,6 +4,7 @@ import { apiRequest } from "@app/config/request";
 
 import { organizationKeys } from "../organization/queries";
 import { oidcConfigKeys } from "./queries";
+import { OIDCJWTSignatureAlgorithm } from "./types";
 
 export const useUpdateOIDCConfig = () => {
   const queryClient = useQueryClient();
@@ -21,7 +22,8 @@ export const useUpdateOIDCConfig = () => {
       clientSecret,
       isActive,
       orgSlug,
-      manageGroupMemberships
+      manageGroupMemberships,
+      jwtSignatureAlgorithm
     }: {
       allowedEmailDomains?: string;
       issuer?: string;
@@ -36,6 +38,7 @@ export const useUpdateOIDCConfig = () => {
       configurationType?: string;
       orgSlug: string;
       manageGroupMemberships?: boolean;
+      jwtSignatureAlgorithm?: OIDCJWTSignatureAlgorithm;
     }) => {
       const { data } = await apiRequest.patch("/api/v1/sso/oidc/config", {
         issuer,
@@ -50,7 +53,8 @@ export const useUpdateOIDCConfig = () => {
         orgSlug,
         clientSecret,
         isActive,
-        manageGroupMemberships
+        manageGroupMemberships,
+        jwtSignatureAlgorithm
       });
 
       return data;
@@ -78,7 +82,8 @@ export const useCreateOIDCConfig = () => {
       clientSecret,
       isActive,
       orgSlug,
-      manageGroupMemberships
+      manageGroupMemberships,
+      jwtSignatureAlgorithm
     }: {
       issuer?: string;
       configurationType: string;
@@ -93,6 +98,7 @@ export const useCreateOIDCConfig = () => {
       orgSlug: string;
       allowedEmailDomains?: string;
       manageGroupMemberships?: boolean;
+      jwtSignatureAlgorithm?: OIDCJWTSignatureAlgorithm;
     }) => {
       const { data } = await apiRequest.post("/api/v1/sso/oidc/config", {
         issuer,
@@ -107,7 +113,8 @@ export const useCreateOIDCConfig = () => {
         clientSecret,
         isActive,
         orgSlug,
-        manageGroupMemberships
+        manageGroupMemberships,
+        jwtSignatureAlgorithm
       });
 
       return data;

frontend/src/hooks/api/oidcConfig/types.ts

@@ -13,4 +13,11 @@ export type OIDCConfigData = {
   clientSecret: string;
   allowedEmailDomains?: string;
   manageGroupMemberships: boolean;
+  jwtSignatureAlgorithm: OIDCJWTSignatureAlgorithm;
 };
+
+export enum OIDCJWTSignatureAlgorithm {
+  RS256 = "RS256",
+  HS256 = "HS256",
+  RS512 = "RS512"
+}

frontend/src/hooks/api/organization/queries.tsx

@@ -110,7 +110,8 @@ export const useUpdateOrg = () => {
       defaultMembershipRoleSlug,
       enforceMfa,
       selectedMfaMethod,
-      allowSecretSharingOutsideOrganization
+      allowSecretSharingOutsideOrganization,
+      bypassOrgAuthEnabled
     }) => {
       return apiRequest.patch(`/api/v1/organization/${orgId}`, {
         name,
@@ -120,7 +121,8 @@ export const useUpdateOrg = () => {
         defaultMembershipRoleSlug,
         enforceMfa,
         selectedMfaMethod,
-        allowSecretSharingOutsideOrganization
+        allowSecretSharingOutsideOrganization,
+        bypassOrgAuthEnabled
       });
     },
     onSuccess: () => {

frontend/src/hooks/api/organization/types.ts

@@ -9,6 +9,7 @@ export type Organization = {
   createAt: string;
   updatedAt: string;
   authEnforced: boolean;
+  bypassOrgAuthEnabled: boolean;
   orgAuthMethod: string;
   scimEnabled: boolean;
   slug: string;
@@ -17,6 +18,7 @@ export type Organization = {
   selectedMfaMethod?: MfaMethod;
   shouldUseNewPrivilegeSystem: boolean;
   allowSecretSharingOutsideOrganization?: boolean;
+  userRole: string;
 };
 
 export type UpdateOrgDTO = {
@@ -29,6 +31,7 @@ export type UpdateOrgDTO = {
   enforceMfa?: boolean;
   selectedMfaMethod?: MfaMethod;
   allowSecretSharingOutsideOrganization?: boolean;
+  bypassOrgAuthEnabled?: boolean;
 };
 
 export type BillingDetails = {

frontend/src/hooks/api/secretRotationsV2/enums.ts

@@ -1,6 +1,7 @@
 export enum SecretRotation {
   PostgresCredentials = "postgres-credentials",
-  MsSqlCredentials = "mssql-credentials"
+  MsSqlCredentials = "mssql-credentials",
+  Auth0ClientSecret = "auth0-client-secret"
 }
 
 export enum SecretRotationStatus {

frontend/src/hooks/api/secretRotationsV2/queries.tsx

@@ -1,9 +1,12 @@
+import { useMemo } from "react";
 import { useQuery, UseQueryOptions } from "@tanstack/react-query";
 
 import { apiRequest } from "@app/config/request";
 import { SecretRotation } from "@app/hooks/api/secretRotationsV2/enums";
 import {
   TListSecretRotationV2Options,
+  TSecretRotationGeneratedCredentialsResponseMap,
+  TSecretRotationOptionMap,
   TSecretRotationV2Option,
   TViewSecretRotationGeneratedCredentialsResponse,
   TViewSecretRotationV2GeneratedCredentialsDTO
@@ -40,15 +43,21 @@ export const useSecretRotationV2Options = (
   });
 };
 
-export const useSecretRotationV2Option = (type: SecretRotation) => {
+export const useSecretRotationV2Option = <T extends SecretRotation>(type: T) => {
   const { data: rotationOptions, isPending } = useSecretRotationV2Options();
-  const rotationOption = rotationOptions?.find((option) => option.type === type);
-
-  return { rotationOption, isPending };
+  return useMemo(
+    () => ({
+      rotationOption:
+        (rotationOptions?.find((opt) => opt.type === type) as TSecretRotationOptionMap[T]) ??
+        undefined,
+      isLoading: isPending
+    }),
+    [rotationOptions, type, isPending]
+  );
 };
 
-export const useViewSecretRotationV2GeneratedCredentials = (
-  { rotationId, type }: TViewSecretRotationV2GeneratedCredentialsDTO,
+export const useViewSecretRotationV2GeneratedCredentials = <T extends SecretRotation>(
+  { rotationId, type }: { rotationId: string; type: T },
   options?: Omit<
     UseQueryOptions<
       TViewSecretRotationGeneratedCredentialsResponse,
@@ -66,7 +75,7 @@ export const useViewSecretRotationV2GeneratedCredentials = (
         `/api/v2/secret-rotations/${type}/${rotationId}/generated-credentials`
       );
 
-      return data;
+      return data as TSecretRotationGeneratedCredentialsResponseMap[T];
     },
     ...options
   });

frontend/src/hooks/api/secretRotationsV2/types/auth0-client-secret-rotation.ts

@@ -0,0 +1,37 @@
+import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { SecretRotation } from "@app/hooks/api/secretRotationsV2";
+import {
+  TSecretRotationV2Base,
+  TSecretRotationV2GeneratedCredentialsResponseBase
+} from "@app/hooks/api/secretRotationsV2/types/shared";
+
+export type TAuth0ClientSecretRotation = TSecretRotationV2Base & {
+  type: SecretRotation.Auth0ClientSecret;
+  parameters: {
+    clientId: string;
+  };
+  secretsMapping: {
+    clientId: string;
+    clientSecret: string;
+  };
+};
+
+export type TAuth0ClientSecretRotationGeneratedCredentials = {
+  clientId: string;
+  clientSecret: string;
+};
+
+export type TAuth0ClientSecretRotationGeneratedCredentialsResponse =
+  TSecretRotationV2GeneratedCredentialsResponseBase<
+    SecretRotation.Auth0ClientSecret,
+    TAuth0ClientSecretRotationGeneratedCredentials
+  >;
+
+export type TAuth0ClientSecretRotationOption = {
+  name: string;
+  type: SecretRotation.Auth0ClientSecret;
+  connection: AppConnection.Auth0;
+  template: {
+    secretsMapping: TAuth0ClientSecretRotation["secretsMapping"];
+  };
+};

frontend/src/hooks/api/secretRotationsV2/types/index.ts

@@ -1,5 +1,9 @@
-import { AppConnection } from "@app/hooks/api/appConnections/enums";
 import { SecretRotation } from "@app/hooks/api/secretRotationsV2";
+import {
+  TAuth0ClientSecretRotation,
+  TAuth0ClientSecretRotationGeneratedCredentialsResponse,
+  TAuth0ClientSecretRotationOption
+} from "@app/hooks/api/secretRotationsV2/types/auth0-client-secret-rotation";
 import {
   TMsSqlCredentialsRotation,
   TMsSqlCredentialsRotationGeneratedCredentialsResponse
@@ -8,20 +12,21 @@ import {
   TPostgresCredentialsRotation,
   TPostgresCredentialsRotationGeneratedCredentialsResponse
 } from "@app/hooks/api/secretRotationsV2/types/postgres-credentials-rotation";
-import { TSqlOptionTemplate } from "@app/hooks/api/secretRotationsV2/types/shared";
+import { TSqlCredentialsRotationOption } from "@app/hooks/api/secretRotationsV2/types/shared";
 import { SecretV3RawSanitized } from "@app/hooks/api/secrets/types";
 import { DiscriminativePick } from "@app/types";
 
-export type TSecretRotationV2 = (TPostgresCredentialsRotation | TMsSqlCredentialsRotation) & {
+export type TSecretRotationV2 = (
+  | TPostgresCredentialsRotation
+  | TMsSqlCredentialsRotation
+  | TAuth0ClientSecretRotation
+) & {
   secrets: (SecretV3RawSanitized | null)[];
 };
 
-export type TSecretRotationV2Option = {
-  name: string;
-  type: SecretRotation;
-  connection: AppConnection;
-  template: TSqlOptionTemplate;
-};
+export type TSecretRotationV2Option =
+  | TSqlCredentialsRotationOption
+  | TAuth0ClientSecretRotationOption;
 
 export type TListSecretRotationV2Options = { secretRotationOptions: TSecretRotationV2Option[] };
 
@@ -29,7 +34,8 @@ export type TSecretRotationV2Response = { secretRotation: TSecretRotationV2 };
 
 export type TViewSecretRotationGeneratedCredentialsResponse =
   | TPostgresCredentialsRotationGeneratedCredentialsResponse
-  | TMsSqlCredentialsRotationGeneratedCredentialsResponse;
+  | TMsSqlCredentialsRotationGeneratedCredentialsResponse
+  | TAuth0ClientSecretRotationGeneratedCredentialsResponse;
 
 export type TCreateSecretRotationV2DTO = DiscriminativePick<
   TSecretRotationV2,
@@ -71,3 +77,15 @@ export type TViewSecretRotationV2GeneratedCredentialsDTO = {
   rotationId: string;
   type: SecretRotation;
 };
+
+export type TSecretRotationOptionMap = {
+  [SecretRotation.PostgresCredentials]: TSqlCredentialsRotationOption;
+  [SecretRotation.MsSqlCredentials]: TSqlCredentialsRotationOption;
+  [SecretRotation.Auth0ClientSecret]: TAuth0ClientSecretRotationOption;
+};
+
+export type TSecretRotationGeneratedCredentialsResponseMap = {
+  [SecretRotation.PostgresCredentials]: TPostgresCredentialsRotationGeneratedCredentialsResponse;
+  [SecretRotation.MsSqlCredentials]: TMsSqlCredentialsRotationGeneratedCredentialsResponse;
+  [SecretRotation.Auth0ClientSecret]: TAuth0ClientSecretRotationGeneratedCredentialsResponse;
+};

frontend/src/hooks/api/secretRotationsV2/types/shared/sql-credentials-rotation.ts

@@ -1,3 +1,6 @@
+import { AppConnection } from "@app/hooks/api/appConnections/enums";
+import { SecretRotation } from "@app/hooks/api/secretRotationsV2";
+
 export type TSqlCredentialsRotationProperties = {
   parameters: {
     username1: string;
@@ -9,9 +12,14 @@ export type TSqlCredentialsRotationProperties = {
   };
 };
 
-export type TSqlOptionTemplate = {
-  secretsMapping: TSqlCredentialsRotationProperties["secretsMapping"];
-  createUserStatement: string;
+export type TSqlCredentialsRotationOption = {
+  name: string;
+  type: SecretRotation.PostgresCredentials | SecretRotation.MsSqlCredentials;
+  connection: AppConnection.Postgres | AppConnection.MsSql;
+  template: {
+    secretsMapping: TSqlCredentialsRotationProperties["secretsMapping"];
+    createUserStatement: string;
+  };
 };
 
 export type TSqlCredentialsRotationGeneratedCredentials = {

frontend/src/hooks/api/workspace/queries.tsx

@@ -33,6 +33,7 @@ import {
   TGetUpgradeProjectStatusDTO,
   TListProjectIdentitiesDTO,
   ToggleAutoCapitalizationDTO,
+  ToggleDeleteProjectProtectionDTO,
   TSearchProjectsDTO,
   TUpdateWorkspaceIdentityRoleDTO,
   TUpdateWorkspaceUserRoleDTO,
@@ -306,6 +307,25 @@ export const useToggleAutoCapitalization = () => {
   });
 };
 
+export const useToggleDeleteProjectProtection = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<Workspace, object, ToggleDeleteProjectProtectionDTO>({
+    mutationFn: async ({ workspaceID, state }) => {
+      const { data } = await apiRequest.post<{ workspace: Workspace }>(
+        `/api/v1/workspace/${workspaceID}/delete-protection`,
+        {
+          hasDeleteProtection: state
+        }
+      );
+      return data.workspace;
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
+    }
+  });
+};
+
 export const useUpdateWorkspaceVersionLimit = () => {
   const queryClient = useQueryClient();
 
@@ -316,8 +336,8 @@ export const useUpdateWorkspaceVersionLimit = () => {
       });
       return data.workspace;
     },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace() });
+    onSuccess: (dto) => {
+      queryClient.invalidateQueries({ queryKey: workspaceKeys.getAllUserWorkspace(dto.type) });
     }
   });
 };

frontend/src/hooks/api/workspace/types.ts

@@ -36,6 +36,7 @@ export type Workspace = {
   slug: string;
   createdAt: string;
   roles?: TProjectRole[];
+  hasDeleteProtection: boolean;
 };
 
 export type WorkspaceEnv = {
@@ -80,6 +81,7 @@ export type UpdateProjectDTO = {
 export type UpdatePitVersionLimitDTO = { projectSlug: string; pitVersionLimit: number };
 export type UpdateAuditLogsRetentionDTO = { projectSlug: string; auditLogsRetentionDays: number };
 export type ToggleAutoCapitalizationDTO = { workspaceID: string; state: boolean };
+export type ToggleDeleteProjectProtectionDTO = { workspaceID: string; state: boolean };
 
 export type DeleteWorkspaceDTO = { workspaceID: string };