Address merge conflicts

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

@@ -29,18 +29,30 @@ export type IdentityMembershipOrg = {
 export type IdentityMembership = {
   id: string;
   identity: Identity;
-  roles: {
-    id: string;
-    role: "owner" | "admin" | "member" | "no-access" | "custom";
-    customRoleId: string;
-    customRoleName: string;
-    customRoleSlug: string;
-    isTemporary: boolean;
-    temporaryMode: string | null;
-    temporaryRange: string | null;
-    temporaryAccessStartTime: string | null;
-    temporaryAccessEndTime: string | null;
-  }[];
+  roles: Array<
+    {
+      id: string;
+      role: "owner" | "admin" | "member" | "no-access" | "custom";
+      customRoleId: string;
+      customRoleName: string;
+      customRoleSlug: string;
+    } & (
+      | {
+        isTemporary: false;
+        temporaryRange: null;
+        temporaryMode: null;
+        temporaryAccessEndTime: null;
+        temporaryAccessStartTime: null;
+      }
+      | {
+        isTemporary: true;
+        temporaryRange: string;
+        temporaryMode: string;
+        temporaryAccessEndTime: string;
+        temporaryAccessStartTime: string;
+      }
+    )
+  >;
   createdAt: string;
   updatedAt: string;
 };

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

@@ -0,0 +1,7 @@
+export {
+  useCreateIdentityProjectAdditionalPrivilege,
+  useDeleteIdentityProjectAdditionalPrivilege,
+  useUpdateIdentityProjectAdditionalPrivilege
+} from "./mutation";
+export { useGetIdentityProjectPrivilegeDetails } from "./queries";
+export type { TIdentityProjectPrivilege } from "./types";

frontend/src/hooks/api/identityProjectAdditionalPrivilege/mutation.tsx

@@ -0,0 +1,73 @@
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { identitiyProjectPrivilegeKeys } from "./queries";
+import {
+  TCreateIdentityProjectPrivilegeDTO,
+  TDeleteIdentityProjectPrivilegeDTO,
+  TIdentityProjectPrivilege,
+  TUpdateIdentityProjectPrivlegeDTO
+} from "./types";
+
+export const useCreateIdentityProjectAdditionalPrivilege = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<TIdentityProjectPrivilege, {}, TCreateIdentityProjectPrivilegeDTO>({
+    mutationFn: async (dto) => {
+      const { data } = await apiRequest.post(
+        "/api/v1/additional-privilege/identity/permanent",
+        dto
+      );
+      return data.privilege;
+    },
+    onSuccess: (_, { projectSlug, identityId }) => {
+      queryClient.invalidateQueries(
+        identitiyProjectPrivilegeKeys.list({ projectSlug, identityId })
+      );
+    }
+  });
+};
+
+export const useUpdateIdentityProjectAdditionalPrivilege = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<TIdentityProjectPrivilege, {}, TUpdateIdentityProjectPrivlegeDTO>({
+    mutationFn: async ({ privilegeSlug, projectSlug, identityId, privilegeDetails }) => {
+      const { data: res } = await apiRequest.patch("/api/v1/additional-privilege/identity", {
+        privilegeSlug,
+        projectSlug,
+        identityId,
+        privilegeDetails
+      });
+      return res.privilege;
+    },
+    onSuccess: (_, { projectSlug, identityId }) => {
+      queryClient.invalidateQueries(
+        identitiyProjectPrivilegeKeys.list({ projectSlug, identityId })
+      );
+    }
+  });
+};
+
+export const useDeleteIdentityProjectAdditionalPrivilege = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<TIdentityProjectPrivilege, {}, TDeleteIdentityProjectPrivilegeDTO>({
+    mutationFn: async ({ identityId, projectSlug, privilegeSlug }) => {
+      const { data } = await apiRequest.delete("/api/v1/additional-privilege/identity", {
+        data: {
+          identityId,
+          projectSlug,
+          privilegeSlug
+        }
+      });
+      return data.privilege;
+    },
+    onSuccess: (_, { projectSlug, identityId }) => {
+      queryClient.invalidateQueries(
+        identitiyProjectPrivilegeKeys.list({ projectSlug, identityId })
+      );
+    }
+  });
+};

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

@@ -0,0 +1,77 @@
+import { PackRule, unpackRules } from "@casl/ability/extra";
+import { useQuery } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { TProjectPermission } from "../roles/types";
+import {
+  TGetIdentityProejctPrivilegeDetails as TGetIdentityProjectPrivilegeDetails,
+  TIdentityProjectPrivilege,
+  TListIdentityUserPrivileges as TListIdentityProjectPrivileges
+} from "./types";
+
+export const identitiyProjectPrivilegeKeys = {
+  details: ({ identityId, privilegeSlug, projectSlug }: TGetIdentityProjectPrivilegeDetails) =>
+    [
+      "identity-user-privilege",
+      {
+        identityId,
+        projectSlug,
+        privilegeSlug
+      }
+    ] as const,
+  list: ({ projectSlug, identityId }: TListIdentityProjectPrivileges) =>
+    ["identity-user-privileges", { identityId, projectSlug }] as const
+};
+
+export const useGetIdentityProjectPrivilegeDetails = ({
+  projectSlug,
+  identityId,
+  privilegeSlug
+}: TGetIdentityProjectPrivilegeDetails) => {
+  return useQuery({
+    enabled: Boolean(projectSlug && identityId && privilegeSlug),
+    queryKey: identitiyProjectPrivilegeKeys.details({ projectSlug, privilegeSlug, identityId }),
+    queryFn: async () => {
+      const {
+        data: { privilege }
+      } = await apiRequest.get<{
+        privilege: Omit<TIdentityProjectPrivilege, "permissions"> & { permissions: unknown };
+      }>(`/api/v1/additional-privilege/identity/${privilegeSlug}`, {
+        params: {
+          identityId,
+          projectSlug
+        }
+      });
+      return {
+        ...privilege,
+        permissions: unpackRules(privilege.permissions as PackRule<TProjectPermission>[])
+      };
+    }
+  });
+};
+
+export const useListIdentityProjectPrivileges = ({
+  projectSlug,
+  identityId
+}: TListIdentityProjectPrivileges) => {
+  return useQuery({
+    enabled: Boolean(projectSlug && identityId),
+    queryKey: identitiyProjectPrivilegeKeys.list({ projectSlug, identityId }),
+    queryFn: async () => {
+      const {
+        data: { privileges }
+      } = await apiRequest.get<{
+        privileges: Array<
+          Omit<TIdentityProjectPrivilege, "permissions"> & { permissions: unknown }
+        >;
+      }>("/api/v1/additional-privilege/identity", {
+        params: { identityId, projectSlug, unpacked: false }
+      });
+      return privileges.map((el) => ({
+        ...el,
+        permissions: unpackRules(el.permissions as PackRule<TProjectPermission>[])
+      }));
+    }
+  });
+};

frontend/src/hooks/api/identityProjectAdditionalPrivilege/types.tsx

@@ -0,0 +1,64 @@
+import { TProjectPermission } from "../roles/types";
+
+export enum IdentityProjectAdditionalPrivilegeTemporaryMode {
+  Relative = "relative"
+}
+
+export type TIdentityProjectPrivilege = {
+  projectMembershipId: string;
+  slug: string;
+  id: string;
+  createdAt: Date;
+  updatedAt: Date;
+  permissions?: TProjectPermission[];
+} & (
+    | {
+      isTemporary: true;
+      temporaryMode: string;
+      temporaryRange: string;
+      temporaryAccessStartTime: string;
+      temporaryAccessEndTime?: string;
+    }
+    | {
+      isTemporary: false;
+      temporaryMode?: null;
+      temporaryRange?: null;
+      temporaryAccessStartTime?: null;
+      temporaryAccessEndTime?: null;
+    }
+  );
+
+export type TCreateIdentityProjectPrivilegeDTO = {
+  identityId: string;
+  projectSlug: string;
+  slug?: string;
+  isTemporary?: boolean;
+  temporaryMode?: IdentityProjectAdditionalPrivilegeTemporaryMode;
+  temporaryRange?: string;
+  temporaryAccessStartTime?: string;
+  permissions: TProjectPermission[];
+};
+
+export type TUpdateIdentityProjectPrivlegeDTO = {
+  projectSlug: string;
+  identityId: string;
+  privilegeSlug: string;
+  privilegeDetails: Partial<Omit<TCreateIdentityProjectPrivilegeDTO, "projectMembershipId" | "projectId">>;
+};
+
+export type TDeleteIdentityProjectPrivilegeDTO = {
+  projectSlug: string;
+  identityId: string;
+  privilegeSlug: string;
+};
+
+export type TListIdentityUserPrivileges = {
+  projectSlug: string;
+  identityId: string;
+};
+
+export type TGetIdentityProejctPrivilegeDetails = {
+  projectSlug: string;
+  identityId: string;
+  privilegeSlug: string;
+};

frontend/src/hooks/api/index.tsx

@@ -7,12 +7,14 @@ export * from "./dynamicSecret";
 export * from "./dynamicSecretLease";
 export * from "./groups";
 export * from "./identities";
+export * from "./identityProjectAdditionalPrivilege";
 export * from "./incidentContacts";
 export * from "./integrationAuth";
 export * from "./integrations";
 export * from "./keys";
 export * from "./ldapConfig";
 export * from "./organization";
+export * from "./projectUserAdditionalPrivilege";
 export * from "./roles";
 export * from "./scim";
 export * from "./secretApproval";

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

@@ -0,0 +1,7 @@
+export {
+  useCreateProjectUserAdditionalPrivilege,
+  useDeleteProjectUserAdditionalPrivilege,
+  useUpdateProjectUserAdditionalPrivilege
+} from "./mutation";
+export { useGetProjectUserPrivilegeDetails, useListProjectUserPrivileges } from "./queries";
+export type { TProjectUserPrivilege } from "./types";

frontend/src/hooks/api/projectUserAdditionalPrivilege/mutation.tsx

@@ -0,0 +1,62 @@
+import { packRules } from "@casl/ability/extra";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { projectUserPrivilegeKeys } from "./queries";
+import {
+  TCreateProjectUserPrivilegeDTO,
+  TDeleteProjectUserPrivilegeDTO,
+  TProjectUserPrivilege,
+  TUpdateProjectUserPrivlegeDTO
+} from "./types";
+
+export const useCreateProjectUserAdditionalPrivilege = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<{ privilege: TProjectUserPrivilege }, {}, TCreateProjectUserPrivilegeDTO>({
+    mutationFn: async (dto) => {
+      const { data } = await apiRequest.post("/api/v1/additional-privilege/users/permanent", {
+        ...dto,
+        permissions: packRules(dto.permissions)
+      });
+      return data.privilege;
+    },
+    onSuccess: (_, { projectMembershipId }) => {
+      queryClient.invalidateQueries(projectUserPrivilegeKeys.list(projectMembershipId));
+    }
+  });
+};
+
+export const useUpdateProjectUserAdditionalPrivilege = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<{ privilege: TProjectUserPrivilege }, {}, TUpdateProjectUserPrivlegeDTO>({
+    mutationFn: async (dto) => {
+      const { data } = await apiRequest.patch(
+        `/api/v1/additional-privilege/users/${dto.privilegeId}`,
+        { ...dto, permissions: dto.permissions ? packRules(dto.permissions) : undefined }
+      );
+      return data.privilege;
+    },
+    onSuccess: (_, { projectMembershipId }) => {
+      queryClient.invalidateQueries(projectUserPrivilegeKeys.list(projectMembershipId));
+    }
+  });
+};
+
+export const useDeleteProjectUserAdditionalPrivilege = () => {
+  const queryClient = useQueryClient();
+
+  return useMutation<{ privilege: TProjectUserPrivilege }, {}, TDeleteProjectUserPrivilegeDTO>({
+    mutationFn: async (dto) => {
+      const { data } = await apiRequest.delete(
+        `/api/v1/additional-privilege/users/${dto.privilegeId}`
+      );
+      return data.privilege;
+    },
+    onSuccess: (_, { projectMembershipId }) => {
+      queryClient.invalidateQueries(projectUserPrivilegeKeys.list(projectMembershipId));
+    }
+  });
+};

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

@@ -0,0 +1,51 @@
+import { PackRule, unpackRules } from "@casl/ability/extra";
+import { useQuery } from "@tanstack/react-query";
+
+import { apiRequest } from "@app/config/request";
+
+import { TProjectPermission } from "../roles/types";
+import { TProjectUserPrivilege } from "./types";
+
+export const projectUserPrivilegeKeys = {
+  details: (privilegeId: string) => ["project-user-privilege", { privilegeId }] as const,
+  list: (projectMembershipId: string) =>
+    ["project-user-privileges", { projectMembershipId }] as const
+};
+
+const fetchProjectUserPrivilegeDetails = async (privilegeId: string) => {
+  const {
+    data: { privilege }
+  } = await apiRequest.get<{
+    privilege: Omit<TProjectUserPrivilege, "permissions"> & { permissions: unknown };
+  }>(`/api/v1/additional-privilege/users/${privilegeId}`);
+  return {
+    ...privilege,
+    permissions: unpackRules(privilege.permissions as PackRule<TProjectPermission>[])
+  };
+};
+
+export const useGetProjectUserPrivilegeDetails = (privilegeId: string) => {
+  return useQuery({
+    enabled: Boolean(privilegeId),
+    queryKey: projectUserPrivilegeKeys.details(privilegeId),
+    queryFn: () => fetchProjectUserPrivilegeDetails(privilegeId)
+  });
+};
+
+export const useListProjectUserPrivileges = (projectMembershipId: string) => {
+  return useQuery({
+    enabled: Boolean(projectMembershipId),
+    queryKey: projectUserPrivilegeKeys.list(projectMembershipId),
+    queryFn: async () => {
+      const {
+        data: { privileges }
+      } = await apiRequest.get<{
+        privileges: Array<Omit<TProjectUserPrivilege, "permissions"> & { permissions: unknown }>;
+      }>("/api/v1/additional-privilege/users", { params: { projectMembershipId } });
+      return privileges.map((el) => ({
+        ...el,
+        permissions: unpackRules(el.permissions as PackRule<TProjectPermission>[])
+      }));
+    }
+  });
+};

frontend/src/hooks/api/projectUserAdditionalPrivilege/types.tsx

@@ -0,0 +1,57 @@
+import { TProjectPermission } from "../roles/types";
+
+export enum ProjectUserAdditionalPrivilegeTemporaryMode {
+  Relative = "relative"
+}
+
+export type TProjectUserPrivilege = {
+  projectMembershipId: string;
+  slug: string;
+  id: string;
+  createdAt: Date;
+  updatedAt: Date;
+  permissions?: TProjectPermission[];
+} & (
+    | {
+      isTemporary: true;
+      temporaryMode: string;
+      temporaryRange: string;
+      temporaryAccessStartTime: string;
+      temporaryAccessEndTime?: string;
+    }
+    | {
+      isTemporary: false;
+      temporaryMode?: null;
+      temporaryRange?: null;
+      temporaryAccessStartTime?: null;
+      temporaryAccessEndTime?: null;
+    }
+  );
+
+export type TCreateProjectUserPrivilegeDTO = {
+  projectMembershipId: string;
+  slug?: string;
+  isTemporary?: boolean;
+  temporaryMode?: ProjectUserAdditionalPrivilegeTemporaryMode;
+  temporaryRange?: string;
+  temporaryAccessStartTime?: string;
+  permissions: TProjectPermission[];
+};
+
+export type TUpdateProjectUserPrivlegeDTO = {
+  privilegeId: string;
+  projectMembershipId: string;
+} & Partial<Omit<TCreateProjectUserPrivilegeDTO, "projectMembershipId">>;
+
+export type TDeleteProjectUserPrivilegeDTO = {
+  privilegeId: string;
+  projectMembershipId: string;
+};
+
+export type TGetProjectUserPrivilegeDetails = {
+  privilegeId: string;
+};
+
+export type TListProjectUserPrivileges = {
+  projectMembershipId: string;
+};

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

@@ -8,6 +8,7 @@ export enum AuthMethod {
   OKTA_SAML = "okta-saml",
   AZURE_SAML = "azure-saml",
   JUMPCLOUD_SAML = "jumpcloud-saml",
+  KEYCLOAK_SAML = "keycloak-saml",
   LDAP = "ldap"
 }
 
@@ -76,18 +77,32 @@ export type TWorkspaceUser = {
   };
   inviteEmail: string;
   organization: string;
-  roles: {
-    id: string;
-    role: "owner" | "admin" | "member" | "no-access" | "custom";
-    customRoleId: string;
-    customRoleName: string;
-    customRoleSlug: string;
-    isTemporary: boolean;
-    temporaryMode: string | null;
-    temporaryRange: string | null;
-    temporaryAccessStartTime: string | null;
-    temporaryAccessEndTime: string | null;
-  }[];
+  roles: (
+    | {
+      id: string;
+      role: "owner" | "admin" | "member" | "no-access" | "custom";
+      customRoleId: string;
+      customRoleName: string;
+      customRoleSlug: string;
+      isTemporary: false;
+      temporaryRange: null;
+      temporaryMode: null;
+      temporaryAccessEndTime: null;
+      temporaryAccessStartTime: null;
+    }
+    | {
+      id: string;
+      role: "owner" | "admin" | "member" | "no-access" | "custom";
+      customRoleId: string;
+      customRoleName: string;
+      customRoleSlug: string;
+      isTemporary: true;
+      temporaryRange: string;
+      temporaryMode: string;
+      temporaryAccessEndTime: string;
+      temporaryAccessStartTime: string;
+    }
+  )[];
   status: "invited" | "accepted" | "verified" | "completed";
   deniedPermissions: any[];
 };