merge main and deconflict

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

@@ -1,8 +1,7 @@
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
-import { AxiosError } from "axios";
 
-import { createNotification } from "@app/components/notifications";
 import { apiRequest } from "@app/config/request";
+import { onRequestError } from "@app/hooks/api/reactQuery";
 import { TReactQueryOptions } from "@app/types/reactQuery";
 
 import { Actor, AuditLog, TGetAuditLogsFilter } from "./types";
@@ -46,12 +45,7 @@ export const useGetAuditLogs = (
         );
         return data.auditLogs;
       } catch (error) {
-        if (error instanceof AxiosError) {
-          createNotification({
-            type: "error",
-            text: error.response?.data.message
-          });
-        }
+        onRequestError(error);
         return [];
       }
     },

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

@@ -8,26 +8,24 @@ import { organizationKeys } from "../organization/queries";
 import { setAuthToken } from "../reactQuery";
 import { workspaceKeys } from "../workspace";
 import {
-  ChangePasswordDTO,
   CompleteAccountDTO,
   CompleteAccountSignupDTO,
   GetAuthTokenAPI,
   GetBackupEncryptedPrivateKeyDTO,
-  IssueBackupPrivateKeyDTO,
   Login1DTO,
   Login1Res,
   Login2DTO,
   Login2Res,
   LoginLDAPDTO,
   LoginLDAPRes,
+  LoginV3DTO,
+  LoginV3Res,
   MfaMethod,
   ResetPasswordDTO,
   ResetPasswordV2DTO,
   ResetUserPasswordV2DTO,
   SendMfaTokenDTO,
   SetupPasswordDTO,
-  SRP1DTO,
-  SRPR1Res,
   TOauthTokenExchangeDTO,
   UserAgentType,
   UserEncryptionVersion,
@@ -50,21 +48,14 @@ export const login2 = async (loginDetails: Login2DTO) => {
   return data;
 };
 
-export const loginLDAPRedirect = async (loginLDAPDetails: LoginLDAPDTO) => {
-  const { data } = await apiRequest.post<LoginLDAPRes>("/api/v1/ldap/login", loginLDAPDetails); // return if account is complete or not + provider auth token
+export const loginV3 = async (loginDetails: LoginV3DTO) => {
+  const { data } = await apiRequest.post<LoginV3Res>("/api/v3/auth/login", loginDetails);
   return data;
 };
 
-export const useLogin1 = () => {
-  return useMutation({
-    mutationFn: async (details: {
-      email: string;
-      clientPublicKey: string;
-      providerAuthToken?: string;
-    }) => {
-      return login1(details);
-    }
-  });
+export const loginLDAPRedirect = async (loginLDAPDetails: LoginLDAPDTO) => {
+  const { data } = await apiRequest.post<LoginLDAPRes>("/api/v1/ldap/login", loginLDAPDetails); // return if account is complete or not + provider auth token
+  return data;
 };
 
 export const selectOrganization = async (data: {
@@ -143,11 +134,6 @@ export const useOauthTokenExchange = () => {
   });
 };
 
-export const srp1 = async (details: SRP1DTO) => {
-  const { data } = await apiRequest.post<SRPR1Res>("/api/v1/password/srp1", details);
-  return data;
-};
-
 export const completeAccountSignup = async (details: CompleteAccountSignupDTO) => {
   const { data } = await apiRequest.post("/api/v3/signup/complete-account/signup", details);
   return data;
@@ -158,14 +144,6 @@ export const completeAccountSignupInvite = async (details: CompleteAccountDTO) =
   return data;
 };
 
-export const useCompleteAccountSignup = () => {
-  return useMutation({
-    mutationFn: async (details: CompleteAccountSignupDTO) => {
-      return completeAccountSignup(details);
-    }
-  });
-};
-
 export const useSendMfaToken = () => {
   return useMutation<object, object, SendMfaTokenDTO>({
     mutationFn: async ({ email }) => {
@@ -263,11 +241,6 @@ export const useVerifyPasswordResetCode = () => {
   });
 };
 
-export const issueBackupPrivateKey = async (details: IssueBackupPrivateKeyDTO) => {
-  const { data } = await apiRequest.post("/api/v1/password/backup-private-key", details);
-  return data;
-};
-
 export const getBackupEncryptedPrivateKey = async ({
   verificationToken
 }: GetBackupEncryptedPrivateKeyDTO) => {
@@ -328,20 +301,6 @@ export const useResetUserPasswordV2 = () => {
   });
 };
 
-export const changePassword = async (details: ChangePasswordDTO) => {
-  const { data } = await apiRequest.post("/api/v1/password/change-password", details);
-  return data;
-};
-
-export const useChangePassword = () => {
-  // note: use after srp1
-  return useMutation({
-    mutationFn: async (details: ChangePasswordDTO) => {
-      return changePassword(details);
-    }
-  });
-};
-
 // Refresh token is set as cookie when logged in
 // Using that we fetch the auth bearer token needed for auth calls
 export const fetchAuthToken = async () => {

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

@@ -49,13 +49,19 @@ export type Login2DTO = {
   password: string;
 };
 
+export type LoginV3DTO = {
+  email: string;
+  password: string;
+  providerAuthToken?: string;
+  captchaToken?: string;
+};
+
 export type Login1Res = {
   serverPublicKey: string;
   salt: string;
 };
 
 export type Login2Res = {
-  mfaEnabled: boolean;
   token: string;
   encryptionVersion?: number;
   protectedKey?: string;
@@ -67,6 +73,11 @@ export type Login2Res = {
   tag?: string;
 };
 
+export type LoginV3Res = {
+  accessToken: string;
+  mfaEnabled: boolean;
+};
+
 export type LoginLDAPDTO = {
   organizationSlug: string;
   username: string;
@@ -77,28 +88,10 @@ export type LoginLDAPRes = {
   nextUrl: string;
 };
 
-export type SRP1DTO = {
-  clientPublicKey: string;
-};
-
-export type SRPR1Res = {
-  serverPublicKey: string;
-  salt: string;
-};
-
 export type CompleteAccountDTO = {
   email: string;
   firstName: string;
   lastName: string;
-  protectedKey: string;
-  protectedKeyIV: string;
-  protectedKeyTag: string;
-  publicKey: string;
-  encryptedPrivateKey: string;
-  encryptedPrivateKeyIV: string;
-  encryptedPrivateKeyTag: string;
-  salt: string;
-  verifier: string;
   password: string;
   tokenMetadata?: string;
 };
@@ -116,19 +109,6 @@ export type VerifySignupInviteDTO = {
   organizationId: string;
 };
 
-export type ChangePasswordDTO = {
-  password: string;
-  clientProof: string;
-  protectedKey: string;
-  protectedKeyIV: string;
-  protectedKeyTag: string;
-  encryptedPrivateKey: string;
-  encryptedPrivateKeyIV: string;
-  encryptedPrivateKeyTag: string;
-  salt: string;
-  verifier: string;
-};
-
 export type ResetPasswordDTO = {
   protectedKey: string;
   protectedKeyIV: string;
@@ -153,27 +133,11 @@ export type ResetUserPasswordV2DTO = {
 };
 
 export type SetupPasswordDTO = {
-  protectedKey: string;
-  protectedKeyIV: string;
-  protectedKeyTag: string;
-  encryptedPrivateKey: string;
-  encryptedPrivateKeyIV: string;
-  encryptedPrivateKeyTag: string;
-  salt: string;
-  verifier: string;
+  email: string;
   token: string;
   password: string;
 };
 
-export type IssueBackupPrivateKeyDTO = {
-  encryptedPrivateKey: string;
-  iv: string;
-  tag: string;
-  salt: string;
-  verifier: string;
-  clientProof: string;
-};
-
 export type GetBackupEncryptedPrivateKeyDTO = {
   verificationToken: string;
 };

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

@@ -1385,6 +1385,7 @@ export const useAddIdentityLdapAuth = () => {
   return useMutation<IdentityLdapAuth, object, AddIdentityLdapAuthDTO>({
     mutationFn: async ({
       identityId,
+      templateId,
       url,
       bindDN,
       bindPass,
@@ -1400,6 +1401,7 @@ export const useAddIdentityLdapAuth = () => {
       const { data } = await apiRequest.post<{ identityLdapAuth: IdentityLdapAuth }>(
         `/api/v1/auth/ldap-auth/identities/${identityId}`,
         {
+          templateId,
           url,
           bindDN,
           bindPass,
@@ -1432,6 +1434,7 @@ export const useUpdateIdentityLdapAuth = () => {
   return useMutation<IdentityLdapAuth, object, UpdateIdentityLdapAuthDTO>({
     mutationFn: async ({
       identityId,
+      templateId,
       url,
       bindDN,
       bindPass,
@@ -1447,6 +1450,7 @@ export const useUpdateIdentityLdapAuth = () => {
       const { data } = await apiRequest.patch<{ identityLdapAuth: IdentityLdapAuth }>(
         `/api/v1/auth/ldap-auth/identities/${identityId}`,
         {
+          templateId,
           url,
           bindDN,
           bindPass,

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

@@ -567,10 +567,11 @@ export type IdentityTokenAuth = {
 export type AddIdentityLdapAuthDTO = {
   organizationId: string;
   identityId: string;
-  url: string;
-  bindDN: string;
-  bindPass: string;
-  searchBase: string;
+  templateId?: string;
+  url?: string;
+  bindDN?: string;
+  bindPass?: string;
+  searchBase?: string;
   searchFilter: string;
   ldapCaCertificate?: string;
   allowedFields?: {
@@ -588,6 +589,7 @@ export type AddIdentityLdapAuthDTO = {
 export type UpdateIdentityLdapAuthDTO = {
   identityId: string;
   organizationId: string;
+  templateId?: string;
   url?: string;
   bindDN?: string;
   bindPass?: string;
@@ -612,10 +614,11 @@ export type DeleteIdentityLdapAuthDTO = {
 };
 
 export type IdentityLdapAuth = {
-  url: string;
-  bindDN: string;
-  bindPass: string;
-  searchBase: string;
+  url?: string;
+  bindDN?: string;
+  templateId?: string;
+  bindPass?: string;
+  searchBase?: string;
   searchFilter: string;
   ldapCaCertificate?: string;
   allowedFields?: {

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

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

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

@@ -0,0 +1,97 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { identityAuthTemplatesKeys } from "./queries";
+import {
+  CreateIdentityAuthTemplateDTO,
+  DeleteIdentityAuthTemplateDTO,
+  IdentityAuthTemplate,
+  MachineAuthTemplateUsage,
+  UnlinkTemplateUsageDTO,
+  UpdateIdentityAuthTemplateDTO
+} from "./types";
+
+export const useCreateIdentityAuthTemplate = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (dto: CreateIdentityAuthTemplateDTO) => {
+      const { data } = await apiRequest.post<{ template: IdentityAuthTemplate }>(
+        "/api/v1/identity-templates",
+        dto
+      );
+      return data.template;
+    },
+    onSuccess: (_, { organizationId }) => {
+      queryClient.invalidateQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplates({ organizationId })
+      });
+    }
+  });
+};
+
+export const useUpdateIdentityAuthTemplate = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (dto: UpdateIdentityAuthTemplateDTO) => {
+      const { data } = await apiRequest.patch<{ template: IdentityAuthTemplate }>(
+        `/api/v1/identity-templates/${dto.templateId}`,
+        dto
+      );
+      return data.template;
+    },
+    onSuccess: (_, { organizationId, templateId }) => {
+      queryClient.invalidateQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplates({ organizationId })
+      });
+      queryClient.invalidateQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplate(templateId)
+      });
+    }
+  });
+};
+
+export const useDeleteIdentityAuthTemplate = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (dto: DeleteIdentityAuthTemplateDTO) => {
+      await apiRequest.delete(`/api/v1/identity-templates/${dto.templateId}`, {
+        params: { organizationId: dto.organizationId }
+      });
+    },
+    onSuccess: (_, { organizationId, templateId }) => {
+      queryClient.invalidateQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplates({ organizationId })
+      });
+      queryClient.removeQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplate(templateId)
+      });
+    }
+  });
+};
+
+export const useUnlinkTemplateUsage = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: async (dto: UnlinkTemplateUsageDTO) => {
+      const { data } = await apiRequest.post<MachineAuthTemplateUsage[]>(
+        `/api/v1/identity-templates/${dto.templateId}/delete-usage`,
+        { identityIds: dto.identityIds },
+        { params: { organizationId: dto.organizationId } }
+      );
+      return data;
+    },
+    onSuccess: (_, { templateId, organizationId }) => {
+      queryClient.invalidateQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplateUsages(templateId)
+      });
+      queryClient.invalidateQueries({
+        queryKey: identityAuthTemplatesKeys.getTemplates({ organizationId })
+      });
+    }
+  });
+};

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

@@ -0,0 +1,89 @@
+import { useQuery } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import {
+  GetIdentityAuthTemplatesDTO,
+  GetTemplateUsagesDTO,
+  IdentityAuthTemplate,
+  MachineAuthTemplateUsage,
+  MachineIdentityAuthMethod
+} from "./types";
+
+export const identityAuthTemplatesKeys = {
+  all: ["identity-auth-templates"] as const,
+  getTemplates: (dto: GetIdentityAuthTemplatesDTO) =>
+    [...identityAuthTemplatesKeys.all, "list", dto] as const,
+  getTemplate: (templateId: string) =>
+    [...identityAuthTemplatesKeys.all, "single", templateId] as const,
+  getAvailableTemplates: (authMethod: MachineIdentityAuthMethod) =>
+    [...identityAuthTemplatesKeys.all, "available", authMethod] as const,
+  getTemplateUsages: (templateId: string) =>
+    [...identityAuthTemplatesKeys.all, "usages", templateId] as const
+};
+
+export const useGetIdentityAuthTemplates = (dto: GetIdentityAuthTemplatesDTO) => {
+  return useQuery({
+    queryKey: identityAuthTemplatesKeys.getTemplates(dto),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<{
+        templates: IdentityAuthTemplate[];
+        totalCount: number;
+      }>("/api/v1/identity-templates/search", {
+        params: {
+          organizationId: dto.organizationId,
+          limit: dto.limit || 50,
+          offset: dto.offset || 0,
+          ...(dto.search && { search: dto.search })
+        }
+      });
+      return data;
+    },
+    enabled: Boolean(dto.organizationId)
+  });
+};
+
+export const useGetIdentityAuthTemplate = (templateId: string, organizationId: string) => {
+  return useQuery({
+    queryKey: identityAuthTemplatesKeys.getTemplate(templateId),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<IdentityAuthTemplate>(
+        `/api/v1/identity-templates/${templateId}`,
+        {
+          params: { organizationId }
+        }
+      );
+      return data;
+    },
+    enabled: Boolean(templateId) && Boolean(organizationId)
+  });
+};
+
+export const useGetAvailableTemplates = (authMethod: MachineIdentityAuthMethod) => {
+  return useQuery({
+    queryKey: identityAuthTemplatesKeys.getAvailableTemplates(authMethod),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<IdentityAuthTemplate[]>("/api/v1/identity-templates", {
+        params: { authMethod }
+      });
+      return data;
+    },
+    enabled: Boolean(authMethod)
+  });
+};
+
+export const useGetTemplateUsages = (dto: GetTemplateUsagesDTO) => {
+  return useQuery({
+    queryKey: identityAuthTemplatesKeys.getTemplateUsages(dto.templateId),
+    queryFn: async () => {
+      const { data } = await apiRequest.get<MachineAuthTemplateUsage[]>(
+        `/api/v1/identity-templates/${dto.templateId}/usage`,
+        {
+          params: { organizationId: dto.organizationId }
+        }
+      );
+      return data;
+    },
+    enabled: Boolean(dto.templateId) && Boolean(dto.organizationId)
+  });
+};

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

@@ -0,0 +1,78 @@
+export enum MachineIdentityAuthMethod {
+  LDAP = "ldap"
+}
+
+export interface LdapTemplateFields {
+  url: string;
+  bindDN: string;
+  bindPass: string;
+  searchBase: string;
+  ldapCaCertificate?: string;
+}
+
+export interface IdentityAuthTemplate {
+  id: string;
+  name: string;
+  authMethod: MachineIdentityAuthMethod;
+  organizationId: string;
+  templateFields: LdapTemplateFields;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface CreateIdentityAuthTemplateDTO {
+  organizationId: string;
+  name: string;
+  authMethod: MachineIdentityAuthMethod;
+  templateFields: LdapTemplateFields;
+}
+
+export interface UpdateIdentityAuthTemplateDTO {
+  templateId: string;
+  organizationId: string;
+  name?: string;
+  templateFields?: Partial<LdapTemplateFields>;
+}
+
+export interface DeleteIdentityAuthTemplateDTO {
+  templateId: string;
+  organizationId: string;
+}
+
+export interface GetIdentityAuthTemplatesDTO {
+  organizationId: string;
+  limit?: number;
+  offset?: number;
+  search?: string;
+}
+
+export interface MachineAuthTemplateUsage {
+  identityId: string;
+  identityName: string;
+}
+
+export interface GetTemplateUsagesDTO {
+  templateId: string;
+  organizationId: string;
+}
+
+export interface UnlinkTemplateUsageDTO {
+  templateId: string;
+  identityIds: string[];
+  organizationId: string;
+}
+
+export const TEMPLATE_ERROR_MESSAGES = {
+  UNLINK_SUCCESS: "Successfully unlinked template usages",
+  UNLINK_FAILED: "Failed to unlink template usages",
+  SINGLE_UNLINK_SUCCESS: "Successfully unlinked template usage",
+  SINGLE_UNLINK_FAILED: "Failed to unlink template usage"
+} as const;
+
+export const TEMPLATE_UI_LABELS = {
+  VIEW_USAGES: "View Usages",
+  EDIT_TEMPLATE: "Edit Template",
+  DELETE_TEMPLATE: "Delete Template",
+  UNLINK: "Unlink",
+  UNSELECT_ALL: "Unselect All"
+} as const;

frontend/src/hooks/api/index.tsx

@@ -15,6 +15,7 @@ export * from "./gateways";
 export * from "./githubOrgSyncConfig";
 export * from "./groups";
 export * from "./identities";
+export * from "./identityAuthTemplates";
 export * from "./identityProjectAdditionalPrivilege";
 export * from "./incidentContacts";
 export * from "./integrationAuth";

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

@@ -53,4 +53,5 @@ export type SubscriptionPlan = {
   secretScanning: boolean;
   enterpriseSecretSyncs: boolean;
   enterpriseAppConnections: boolean;
+  machineIdentityAuthTemplates: boolean;
 };

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

@@ -495,14 +495,6 @@ export const useGetMyOrganizationProjects = (orgId: string) => {
   });
 };
 
-export const fetchMyPrivateKey = async () => {
-  const {
-    data: { privateKey }
-  } = await apiRequest.get<{ privateKey: string }>("/api/v1/user/private-key");
-
-  return privateKey;
-};
-
 export const useListUserGroupMemberships = (username: string) => {
   return useQuery({
     queryKey: userKeys.listUserGroupMemberships(username),