Merge branch 'main' into feat/orgUserAuthTokenExpiration

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

@@ -25,9 +25,18 @@ export type DashboardProjectSecretsOverviewResponse = {
   totalUniqueFoldersInPage: number;
   totalUniqueSecretImportsInPage: number;
   importedByEnvs?: { environment: string; importedBy: ProjectSecretsImportedBy[] }[];
+  usedBySecretSyncs?: UsedBySecretSyncs[];
   totalUniqueSecretRotationsInPage: number;
 };
 
+export type UsedBySecretSyncs = {
+  name: string;
+  destination: string;
+  environment: string;
+  id: string;
+  path: string;
+};
+
 export type DashboardProjectSecretsDetailsResponse = {
   imports?: TSecretImport[];
   folders?: TSecretFolder[];
@@ -43,13 +52,14 @@ export type DashboardProjectSecretsDetailsResponse = {
   totalSecretRotationCount?: number;
   totalCount: number;
   importedBy?: ProjectSecretsImportedBy[];
+  usedBySecretSyncs?: UsedBySecretSyncs[];
 };
 
 export type ProjectSecretsImportedBy = {
   environment: { name: string; slug: string };
   folders: {
     name: string;
-    secrets?: { secretId: string; referencedSecretKey: string }[];
+    secrets?: { secretId: string; referencedSecretKey: string; referencedSecretEnv: string }[];
     isImported: boolean;
   }[];
 };

frontend/src/hooks/api/githubOrgSyncConfig/index.tsx

@@ -0,0 +1,6 @@
+export {
+  useCreateGithubSyncOrgConfig,
+  useDeleteGithubSyncOrgConfig,
+  useUpdateGithubSyncOrgConfig
+} from "./mutations";
+export { githubOrgSyncConfigQueryKeys } from "./queries";

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

@@ -0,0 +1,42 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { githubOrgSyncConfigQueryKeys } from "./queries";
+import { TCreateGithubOrgSyncDTO, TUpdateGithubOrgSyncDTO } from "./types";
+
+export const useCreateGithubSyncOrgConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (dto: TCreateGithubOrgSyncDTO) => {
+      return apiRequest.post("/api/v1/github-org-sync-config", dto);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries(githubOrgSyncConfigQueryKeys.get());
+    }
+  });
+};
+
+export const useUpdateGithubSyncOrgConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (dto: TUpdateGithubOrgSyncDTO) => {
+      return apiRequest.patch("/api/v1/github-org-sync-config", dto);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries(githubOrgSyncConfigQueryKeys.get());
+    }
+  });
+};
+
+export const useDeleteGithubSyncOrgConfig = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: () => {
+      return apiRequest.delete("/api/v1/github-org-sync-config");
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries(githubOrgSyncConfigQueryKeys.get());
+    }
+  });
+};

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

@@ -0,0 +1,20 @@
+import { queryOptions } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { TGithubOrgSyncConfig } from "./types";
+
+export const githubOrgSyncConfigQueryKeys = {
+  allKey: () => ["github-org-sync-config"],
+  getKey: () => [...githubOrgSyncConfigQueryKeys.allKey(), "list"],
+  get: () =>
+    queryOptions({
+      queryKey: githubOrgSyncConfigQueryKeys.getKey(),
+      queryFn: async () => {
+        const { data } = await apiRequest.get<{ githubOrgSyncConfig: TGithubOrgSyncConfig }>(
+          "/api/v1/github-org-sync-config"
+        );
+        return data.githubOrgSyncConfig;
+      }
+    })
+};

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

@@ -0,0 +1,20 @@
+export type TGithubOrgSyncConfig = {
+  id: string;
+  orgId: string;
+  githubOrgAccessToken?: string;
+  githubOrgName: string;
+  createdAt: string;
+  isActive?: boolean;
+};
+
+export interface TCreateGithubOrgSyncDTO {
+  githubOrgName: string;
+  githubOrgAccessToken?: string;
+  isActive?: boolean;
+}
+
+export interface TUpdateGithubOrgSyncDTO {
+  githubOrgName?: string;
+  githubOrgAccessToken?: string;
+  isActive?: boolean;
+}

frontend/src/hooks/api/index.tsx

@@ -12,6 +12,7 @@ export * from "./certificateTemplates";
 export * from "./dynamicSecret";
 export * from "./dynamicSecretLease";
 export * from "./gateways";
+export * from "./githubOrgSyncConfig";
 export * from "./groups";
 export * from "./identities";
 export * from "./identityProjectAdditionalPrivilege";

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

@@ -19,5 +19,6 @@ export type OIDCConfigData = {
 export enum OIDCJWTSignatureAlgorithm {
   RS256 = "RS256",
   HS256 = "HS256",
-  RS512 = "RS512"
+  RS512 = "RS512",
+  EDDSA = "EdDSA"
 }

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

@@ -12,6 +12,7 @@ export type SubscriptionPlan = {
   customAlerts: boolean;
   customRateLimits: boolean;
   pitRecovery: boolean;
+  githubOrgSync: boolean;
   ipAllowlisting: boolean;
   rbac: boolean;
   secretVersioning: boolean;