awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-13 08:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ST V3 to machine identity

Browse Source
This commit is contained in:
Tuan Dang
2023-11-24 19:19:31 +07:00
parent 41c41a647f
commit 595a26a366
71 changed files with 651 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/api/auditLogs/constants.tsx
+3 -3
View File
@@ -16,9 +16,9 @@ export const eventToNameMap: { [K in EventType]: string } = {
[EventType.DELETE_TRUSTED_IP]: "Delete trusted IP",
[EventType.CREATE_SERVICE_TOKEN]: "Create service token",
[EventType.DELETE_SERVICE_TOKEN]: "Delete service token",
[EventType.CREATE_SERVICE_TOKEN_V3]: "Create (new) service token",
[EventType.UPDATE_SERVICE_TOKEN_V3]: "Update (new) service token",
[EventType.DELETE_SERVICE_TOKEN_V3]: "Delete (new) service token",
[EventType.CREATE_MACHINE_IDENTITY]: "Create machine identity",
[EventType.UPDATE_MACHINE_IDENTITY]: "Update machine identity",
[EventType.DELETE_MACHINE_IDENTITY]: "Delete machine identity",
[EventType.CREATE_ENVIRONMENT]: "Create environment",
[EventType.UPDATE_ENVIRONMENT]: "Update environment",
[EventType.DELETE_ENVIRONMENT]: "Delete environment",
frontend/src/hooks/api/auditLogs/enums.tsx
+3 -3
View File
@@ -27,9 +27,9 @@ export enum EventType {
DELETE_TRUSTED_IP = "delete-trusted-ip",
CREATE_SERVICE_TOKEN = "create-service-token", // v2
DELETE_SERVICE_TOKEN = "delete-service-token", // v2
CREATE_SERVICE_TOKEN_V3 = "create-service-token-v3", // v3
UPDATE_SERVICE_TOKEN_V3 = "update-service-token-v3", // v3
DELETE_SERVICE_TOKEN_V3 = "delete-service-token-v3", // v3
CREATE_MACHINE_IDENTITY = "create-machine-identity",
UPDATE_MACHINE_IDENTITY = "update-machine-identity",
DELETE_MACHINE_IDENTITY = "delete-machine-identity",
CREATE_ENVIRONMENT = "create-environment",
UPDATE_ENVIRONMENT = "update-environment",
DELETE_ENVIRONMENT = "delete-environment",
frontend/src/hooks/api/auditLogs/types.tsx
+9 -9
View File
@@ -188,8 +188,8 @@ interface DeleteServiceTokenEvent {
};
}
interface CreateServiceTokenV3Event {
type: EventType.CREATE_SERVICE_TOKEN_V3;
interface CreateMachineIdentityEvent {
type: EventType.CREATE_MACHINE_IDENTITY;
metadata: {
name: string;
isActive: boolean;
@@ -198,8 +198,8 @@ interface CreateServiceTokenV3Event {
}
}
interface UpdateServiceTokenV3Event {
type: EventType.UPDATE_SERVICE_TOKEN_V3;
interface UpdateMachineIdentityEvent {
type: EventType.UPDATE_MACHINE_IDENTITY;
metadata: {
name?: string;
isActive?: boolean;
@@ -208,8 +208,8 @@ interface UpdateServiceTokenV3Event {
}
}
interface DeleteServiceTokenV3Event {
type: EventType.DELETE_SERVICE_TOKEN_V3;
interface DeleteMachineIdentityEvent {
type: EventType.DELETE_MACHINE_IDENTITY;
metadata: {
name: string;
isActive: boolean;
@@ -414,9 +414,9 @@ export type Event =
| DeleteTrustedIPEvent
| CreateServiceTokenEvent
| DeleteServiceTokenEvent
| CreateServiceTokenV3Event
| UpdateServiceTokenV3Event
| DeleteServiceTokenV3Event
| CreateMachineIdentityEvent
| UpdateMachineIdentityEvent
| DeleteMachineIdentityEvent
| CreateEnvironmentEvent
| UpdateEnvironmentEvent
| DeleteEnvironmentEvent
frontend/src/hooks/api/index.tsx
+2 -1
View File
@@ -7,6 +7,7 @@ export * from "./incidentContacts";
export * from "./integrationAuth";
export * from "./integrations";
export * from "./keys";
export * from "./machineIdentities";
export * from "./organization";
export * from "./roles";
export * from "./secretApproval";
@@ -24,4 +25,4 @@ export * from "./tags";
export * from "./trustedIps";
export * from "./users";
export * from "./webhooks";
export * from "./workspace";
export * from "./workspace";
frontend/src/hooks/api/machineIdentities/index.tsx
+4
View File
@@ -0,0 +1,4 @@
export {
useCreateMachineIdentity,
useDeleteMachineIdentity,
useUpdateMachineIdentity} from "./mutations";
frontend/src/hooks/api/machineIdentities/mutations.tsx
+71
View File
@@ -0,0 +1,71 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
import { organizationKeys } from "../organization/queries";
import {
CreateMachineIdentityDTO,
CreateMachineIdentityRes,
DeleteMachineIdentityDTO,
MachineIdentity,
UpdateMachineIdentityDTO} from "./types";
export const useCreateMachineIdentity = () => {
const queryClient = useQueryClient();
return useMutation<CreateMachineIdentityRes, {}, CreateMachineIdentityDTO>({
mutationFn: async (body) => {
const { data } = await apiRequest.post("/api/v3/machines/", body);
return data;
},
onSuccess: ({ machineIdentity }) => {
queryClient.invalidateQueries(organizationKeys.getOrgServiceMemberships(machineIdentity.organization));
}
});
};
export const useUpdateMachineIdentity = () => {
const queryClient = useQueryClient();
return useMutation<MachineIdentity, {}, UpdateMachineIdentityDTO>({
mutationFn: async ({
machineId,
name,
role,
isActive,
trustedIps,
expiresIn,
accessTokenTTL,
isRefreshTokenRotationEnabled
}) => {
const { data: { machineIdentity } } = await apiRequest.patch(`/api/v3/machines/${machineId}`, {
name,
role,
isActive,
trustedIps,
expiresIn,
accessTokenTTL,
isRefreshTokenRotationEnabled
});
return machineIdentity;
},
onSuccess: ({ organization }) => {
queryClient.invalidateQueries(organizationKeys.getOrgServiceMemberships(organization));
}
});
};
export const useDeleteMachineIdentity = () => {
const queryClient = useQueryClient();
return useMutation<MachineIdentity, {}, DeleteMachineIdentityDTO>({
mutationFn: async ({
machineId
}) => {
const { data: { machineIdentity } } = await apiRequest.delete(`/api/v3/machines/${machineId}`);
return machineIdentity;
},
onSuccess: ({ organization }) => {
queryClient.invalidateQueries(organizationKeys.getOrgServiceMemberships(organization));
}
});
};
frontend/src/hooks/api/machineIdentities/types.ts
+79
View File
@@ -0,0 +1,79 @@
import { TRole } from "../roles/types";
export type MachineTrustedIp = {
_id: string;
ipAddress: string;
type: "ipv4" | "ipv6";
prefix?: number;
}
export type MachineIdentity = {
_id: string;
name: string;
organization: string;
isActive: boolean;
refreshTokenLastUsed?: string;
accessTokenLastUsed?: string;
refreshTokenUsageCount: number;
accessTokenUsageCount: number;
trustedIps: MachineTrustedIp[];
expiresAt?: string;
accessTokenTTL: number;
isRefreshTokenRotationEnabled: boolean;
createdAt: string;
updatedAt: string;
};
export type MachineMembershipOrg = {
_id: string;
machineIdentity: MachineIdentity;
organization: string;
role: "admin" | "member" | "viewer" | "custom";
customRole?: TRole;
createdAt: string;
updatedAt: string;
}
export type MachineMembership = {
_id: string;
machineIdentity: MachineIdentity;
organization: string;
role: "admin" | "member" | "viewer" | "custom";
customRole?: TRole;
createdAt: string;
updatedAt: string;
}
export type CreateMachineIdentityDTO = {
name: string;
organizationId: string;
role?: string;
trustedIps: {
ipAddress: string;
}[];
expiresIn?: number;
accessTokenTTL: number;
isRefreshTokenRotationEnabled: boolean;
}
export type CreateMachineIdentityRes = {
refreshToken: string;
machineIdentity: MachineIdentity;
}
export type UpdateMachineIdentityDTO = {
machineId: string;
isActive?: boolean;
name?: string;
role?: string;
trustedIps?: {
ipAddress: string;
}[];
expiresIn?: number;
accessTokenTTL?: number;
isRefreshTokenRotationEnabled?: boolean;
}
export type DeleteMachineIdentityDTO = {
machineId: string;
}
frontend/src/hooks/api/organization/index.ts
+1 -1
View File
@@ -6,6 +6,7 @@ export {
useDeleteOrgById,
useDeleteOrgPmtMethod,
useDeleteOrgTaxId,
useGetMachineMembershipOrgs,
useGetOrganizations,
useGetOrgBillingDetails,
useGetOrgInvoices,
@@ -14,7 +15,6 @@ export {
useGetOrgPlansTable,
useGetOrgPlanTable,
useGetOrgPmtMethods,
useGetOrgServiceMemberships,
useGetOrgTaxIds,
useGetOrgTrialUrl,
useRenameOrg,
frontend/src/hooks/api/organization/queries.tsx
+6 -6
View File
@@ -2,7 +2,7 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
import { ServiceMembershipOrg } from "../serviceTokens/types";
import { MachineMembershipOrg } from "../machineIdentities/types";
import {
BillingDetails,
Invoice,
@@ -351,17 +351,17 @@ export const useGetOrgLicenses = (organizationId: string) => {
});
};
export const useGetOrgServiceMemberships = (organizationId: string) => {
export const useGetMachineMembershipOrgs = (organizationId: string) => {
return useQuery({
queryKey: organizationKeys.getOrgServiceMemberships(organizationId),
queryFn: async () => {
const {
data: { serviceMemberships }
} = await apiRequest.get<{ serviceMemberships: ServiceMembershipOrg[] }>(
`/api/v2/organizations/${organizationId}/service-memberships`
data: { machineMemberships }
} = await apiRequest.get<{ machineMemberships: MachineMembershipOrg[] }>(
`/api/v2/organizations/${organizationId}/machine-memberships`
);
return serviceMemberships;
return machineMemberships;
},
enabled: true
});
frontend/src/hooks/api/serviceTokens/index.ts
-3
View File
@@ -1,8 +1,5 @@
export {
useCreateServiceToken,
useCreateServiceTokenV3,
useDeleteServiceToken,
useDeleteServiceTokenV3,
useGetUserWsServiceTokens,
useUpdateServiceTokenV3
} from "./queries";
frontend/src/hooks/api/serviceTokens/queries.tsx
+2 -66
View File
@@ -2,17 +2,12 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { apiRequest } from "@app/config/request";
import { organizationKeys } from "../organization/queries";
import {
CreateServiceTokenDataV3DTO,
CreateServiceTokenDataV3Res,
CreateServiceTokenDTO,
CreateServiceTokenRes,
DeleteServiceTokenDataV3DTO,
DeleteServiceTokenRes,
ServiceToken,
ServiceTokenDataV3,
UpdateServiceTokenDataV3DTO} from "./types";
ServiceToken
} from "./types";
const serviceTokenKeys = {
getAllWorkspaceServiceToken: (workspaceID: string) => [{ workspaceID }, "service-tokens"] as const
@@ -64,63 +59,4 @@ export const useDeleteServiceToken = () => {
queryClient.invalidateQueries(serviceTokenKeys.getAllWorkspaceServiceToken(workspace));
}
});
};
export const useCreateServiceTokenV3 = () => {
const queryClient = useQueryClient();
return useMutation<CreateServiceTokenDataV3Res, {}, CreateServiceTokenDataV3DTO>({
mutationFn: async (body) => {
const { data } = await apiRequest.post("/api/v3/service-token/", body);
return data;
},
onSuccess: ({ serviceTokenData }) => {
queryClient.invalidateQueries(organizationKeys.getOrgServiceMemberships(serviceTokenData.organization));
}
});
};
export const useUpdateServiceTokenV3 = () => {
const queryClient = useQueryClient();
return useMutation<ServiceTokenDataV3, {}, UpdateServiceTokenDataV3DTO>({
mutationFn: async ({
serviceTokenDataId,
name,
role,
isActive,
trustedIps,
expiresIn,
accessTokenTTL,
isRefreshTokenRotationEnabled
}) => {
const { data: { serviceTokenData } } = await apiRequest.patch(`/api/v3/service-token/${serviceTokenDataId}`, {
name,
role,
isActive,
trustedIps,
expiresIn,
accessTokenTTL,
isRefreshTokenRotationEnabled
});
return serviceTokenData;
},
onSuccess: ({ organization }) => {
queryClient.invalidateQueries(organizationKeys.getOrgServiceMemberships(organization));
}
});
};
export const useDeleteServiceTokenV3 = () => {
const queryClient = useQueryClient();
return useMutation<ServiceTokenDataV3, {}, DeleteServiceTokenDataV3DTO>({
mutationFn: async ({
serviceTokenDataId
}) => {
const { data: { serviceTokenData } } = await apiRequest.delete(`/api/v3/service-token/${serviceTokenDataId}`);
return serviceTokenData;
},
onSuccess: ({ organization }) => {
queryClient.invalidateQueries(organizationKeys.getOrgServiceMemberships(organization));
}
});
};
frontend/src/hooks/api/serviceTokens/types.ts
+1 -83
View File
@@ -1,5 +1,3 @@
import { TRole } from "../roles/types";
export type ServiceTokenScope = {
environment: string;
secretPath: string;
@@ -34,84 +32,4 @@ export type CreateServiceTokenRes = {
serviceTokenData: ServiceToken;
};
export type DeleteServiceTokenRes = { serviceTokenData: ServiceToken };
// --- v3
export type ServiceTokenV3TrustedIp = {
_id: string;
ipAddress: string;
type: "ipv4" | "ipv6";
prefix?: number;
}
export type ServiceTokenDataV3 = {
_id: string;
name: string;
organization: string;
isActive: boolean;
refreshTokenLastUsed?: string;
accessTokenLastUsed?: string;
refreshTokenUsageCount: number;
accessTokenUsageCount: number;
trustedIps: ServiceTokenV3TrustedIp[];
expiresAt?: string;
accessTokenTTL: number;
isRefreshTokenRotationEnabled: boolean;
createdAt: string;
updatedAt: string;
};
export type ServiceMembershipOrg = {
_id: string;
service: ServiceTokenDataV3;
organization: string;
role: "admin" | "member" | "viewer" | "custom";
customRole?: TRole;
createdAt: string;
updatedAt: string;
}
export type ServiceMembership = {
_id: string;
service: ServiceTokenDataV3;
organization: string;
role: "admin" | "member" | "viewer" | "custom";
customRole?: TRole;
createdAt: string;
updatedAt: string;
}
export type CreateServiceTokenDataV3DTO = {
name: string;
organizationId: string;
role?: string;
trustedIps: {
ipAddress: string;
}[];
expiresIn?: number;
accessTokenTTL: number;
isRefreshTokenRotationEnabled: boolean;
}
export type CreateServiceTokenDataV3Res = {
refreshToken: string;
serviceTokenData: ServiceTokenDataV3;
}
export type UpdateServiceTokenDataV3DTO = {
serviceTokenDataId: string;
isActive?: boolean;
name?: string;
role?: string;
trustedIps?: {
ipAddress: string;
}[];
expiresIn?: number;
accessTokenTTL?: number;
isRefreshTokenRotationEnabled?: boolean;
}
export type DeleteServiceTokenDataV3DTO = {
serviceTokenDataId: string;
}
export type DeleteServiceTokenRes = { serviceTokenData: ServiceToken };
frontend/src/hooks/api/workspace/index.tsx
+3 -3
View File
@@ -1,9 +1,9 @@
export {
useAddServiceToWorkspace,
useAddMachineToWorkspace,
useAddUserToWorkspace,
useCreateWorkspace,
useCreateWsEnvironment,
useDeleteServiceFromWorkspace,
useDeleteMachineFromWorkspace,
useDeleteUserFromWorkspace,
useDeleteWorkspace,
useDeleteWsEnvironment,
@@ -13,8 +13,8 @@ export {
useGetWorkspaceById,
useGetWorkspaceIndexStatus,
useGetWorkspaceIntegrations,
useGetWorkspaceMachineMemberships,
useGetWorkspaceSecrets,
useGetWorkspaceServiceMemberships,
useGetWorkspaceUsers,
useNameWorkspaceSecrets,
useRenameWorkspace,
frontend/src/hooks/api/workspace/queries.tsx
+15 -19
View File
@@ -4,8 +4,8 @@ import { apiRequest } from "@app/config/request";
import { IntegrationAuth } from "../integrationAuth/types";
import { TIntegration } from "../integrations/types";
import { MachineMembership } from "../machineIdentities/types";
import { EncryptedSecret } from "../secrets/types";
import { ServiceMembership } from "../serviceTokens/types";
import { TWorkspaceUser } from "../users/types";
import {
CreateEnvironmentDTO,
@@ -31,8 +31,6 @@ export const workspaceKeys = {
getAllUserWorkspace: ["workspaces"] as const,
getWorkspaceAuditLogs: (workspaceId: string) => [{ workspaceId }] as const,
getWorkspaceUsers: (workspaceId: string) => [{ workspaceId }] as const,
getWorkspaceServiceTokenDataV3: (workspaceId: string) =>
[{ workspaceId }, "workspace-service-token-data-v3"] as const,
getWorkspaceServiceMemberships: (workspaceId: string) => [{ workspaceId }, "organization-service-memberships"] as const
};
@@ -358,23 +356,22 @@ export const useUpdateUserWorkspaceRole = () => {
});
};
export const useAddServiceToWorkspace = () => {
export const useAddMachineToWorkspace = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: async ({
serviceId,
machineId,
workspaceId,
role
}: {
serviceId: string;
machineId: string;
workspaceId: string;
role?: string;
}) => {
const {
data: { serviceMembership }
} = await apiRequest.post(`/api/v2/workspace/${workspaceId}/service-memberships`, {
serviceId,
} = await apiRequest.post(`/api/v2/workspace/${workspaceId}/machine-memberships/${machineId}`, {
role
});
@@ -386,22 +383,20 @@ export const useAddServiceToWorkspace = () => {
});
};
// TODO: update
export const useDeleteServiceFromWorkspace = () => {
export const useDeleteMachineFromWorkspace = () => {
const queryClient = useQueryClient();
return useMutation({
mutationFn: async ({
serviceId,
machineId,
workspaceId,
}: {
serviceId: string;
machineId: string;
workspaceId: string;
}) => {
const {
data: { serviceMembership }
} = await apiRequest.delete(`/api/v2/workspace/${workspaceId}/service-memberships/${serviceId}`);
} = await apiRequest.delete(`/api/v2/workspace/${workspaceId}/machine-memberships/${machineId}`);
return serviceMembership;
},
@@ -411,18 +406,19 @@ export const useDeleteServiceFromWorkspace = () => {
});
};
export const useGetWorkspaceServiceMemberships = (workspaceId: string) => {
export const useGetWorkspaceMachineMemberships = (workspaceId: string) => {
return useQuery({
queryKey: workspaceKeys.getWorkspaceServiceMemberships(workspaceId),
queryFn: async () => {
const {
data: { serviceMemberships }
} = await apiRequest.get<{ serviceMemberships: ServiceMembership[] }>(
`/api/v2/workspace/${workspaceId}/service-memberships`
data: { machineMemberships }
} = await apiRequest.get<{ machineMemberships: MachineMembership[] }>(
`/api/v2/workspace/${workspaceId}/machine-memberships`
);
return serviceMemberships;
return machineMemberships;
},
enabled: true
});
frontend/src/views/Org/MembersPage/MembersPage.tsx
+6 -7
View File
@@ -4,15 +4,14 @@ import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
import { withPermission } from "@app/hoc";
import {
OrgMachineIdentityTab,
OrgMembersTab,
OrgRoleTabSection,
OrgServiceTokenTab
} from "./components";
OrgRoleTabSection} from "./components";
enum TabSections {
Member = "members",
Roles = "roles",
ServiceTokens = "service-tokens"
MachineIdentities = "machine-identities"
}
export const MembersPage = withPermission(
@@ -26,14 +25,14 @@ export const MembersPage = withPermission(
<Tabs defaultValue={TabSections.Member}>
<TabList>
<Tab value={TabSections.Member}>People</Tab>
<Tab value={TabSections.ServiceTokens}>Machine Identities</Tab>
<Tab value={TabSections.MachineIdentities}>Machine Identities</Tab>
<Tab value={TabSections.Roles}>Roles</Tab>
</TabList>
<TabPanel value={TabSections.Member}>
<OrgMembersTab />
</TabPanel>
<TabPanel value={TabSections.ServiceTokens}>
<OrgServiceTokenTab />
<TabPanel value={TabSections.MachineIdentities}>
<OrgMachineIdentityTab />
</TabPanel>
<TabPanel value={TabSections.Roles}>
<OrgRoleTabSection />
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/OrgServiceTokenTab.tsx → frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/OrgMachineIdentityTab.tsx
+3 -3
View File
@@ -1,8 +1,8 @@
import { motion } from "framer-motion";
import { ServiceTokenV3Section } from "./components";
import { MachineIdentitySection } from "./components";
export const OrgServiceTokenTab = () => {
export const OrgMachineIdentityTab = () => {
return (
<motion.div
key="panel-service-token"
@@ -11,7 +11,7 @@ export const OrgServiceTokenTab = () => {
animate={{ opacity: 1, translateX: 0 }}
exit={{ opacity: 0, translateX: 30 }}
>
<ServiceTokenV3Section />
<MachineIdentitySection />
</motion.div>
);
}
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx → frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/AddMachineIdentityModal.tsx
+35 -33
View File
@@ -28,9 +28,9 @@ import {
} from "@app/context";
import { useToggle } from "@app/hooks";
import {
useCreateServiceTokenV3,
useCreateMachineIdentity,
useGetRoles,
useUpdateServiceTokenV3
useUpdateMachineIdentity
} from "@app/hooks/api";
import { ServiceTokenV3TrustedIp } from "@app/hooks/api/serviceTokens/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -79,16 +79,17 @@ const schema = yup.object({
export type FormData = yup.InferType<typeof schema>;
type Props = {
popUp: UsePopUpState<["serviceTokenV3", "upgradePlan"]>;
popUp: UsePopUpState<["machineIdentity", "upgradePlan"]>;
handlePopUpOpen: (popUpName: keyof UsePopUpState<["upgradePlan"]>) => void;
handlePopUpToggle: (popUpName: keyof UsePopUpState<["serviceTokenV3", "upgradePlan"]>, state?: boolean) => void;
handlePopUpToggle: (popUpName: keyof UsePopUpState<["machineIdentity", "upgradePlan"]>, state?: boolean) => void;
};
export const AddServiceTokenV3Modal = ({
export const AddMachineIdentityModal = ({
popUp,
handlePopUpOpen,
handlePopUpToggle
}: Props) => {
const { createNotification } = useNotificationContext();
const [newServiceTokenJSON, setNewServiceTokenJSON] = useState("");
const [isServiceTokenJSONCopied, setIsServiceTokenJSONCopied] = useToggle(false);
@@ -101,9 +102,9 @@ export const AddServiceTokenV3Modal = ({
orgId
});
const { mutateAsync: createMutateAsync } = useCreateServiceTokenV3();
const { mutateAsync: updateMutateAsync } = useUpdateServiceTokenV3();
const { createNotification } = useNotificationContext();
const { mutateAsync: createMutateAsync } = useCreateMachineIdentity();
const { mutateAsync: updateMutateAsync } = useUpdateMachineIdentity();
const {
control,
handleSubmit,
@@ -136,8 +137,9 @@ export const AddServiceTokenV3Modal = ({
};
useEffect(() => {
const serviceTokenData = popUp?.serviceTokenV3?.data as {
serviceTokenDataId: string;
const machineIdentity = popUp?.machineIdentity?.data as {
machineId: string;
name: string;
role: string;
customRole: {
@@ -148,15 +150,15 @@ export const AddServiceTokenV3Modal = ({
accessTokenTTL: number;
isRefreshTokenRotationEnabled: boolean;
};
if (!roles?.length) return;
if (serviceTokenData) {
if (machineIdentity) {
reset({
name: serviceTokenData.name,
name: machineIdentity.name,
expiresIn: "",
role: serviceTokenData?.customRole?.slug ?? serviceTokenData.role,
trustedIps: serviceTokenData.trustedIps.map(({
role: machineIdentity?.customRole?.slug ?? machineIdentity.role,
trustedIps: machineIdentity.trustedIps.map(({
ipAddress,
prefix
}: ServiceTokenV3TrustedIp) => {
@@ -164,8 +166,8 @@ export const AddServiceTokenV3Modal = ({
ipAddress: `${ipAddress}${prefix !== undefined ? `/${prefix}` : ""}`
});
}),
accessTokenTTL: String(serviceTokenData.accessTokenTTL),
isRefreshTokenRotationEnabled: serviceTokenData.isRefreshTokenRotationEnabled
accessTokenTTL: String(machineIdentity.accessTokenTTL),
isRefreshTokenRotationEnabled: machineIdentity.isRefreshTokenRotationEnabled
});
} else {
reset({
@@ -178,7 +180,7 @@ export const AddServiceTokenV3Modal = ({
}]
});
}
}, [popUp?.serviceTokenV3?.data, roles]);
}, [popUp?.machineIdentity?.data, roles]);
const { fields: tokenTrustedIps, append: appendTrustedIp, remove: removeTrustedIp } = useFieldArray({ control, name: "trustedIps" });
@@ -192,17 +194,17 @@ export const AddServiceTokenV3Modal = ({
}: FormData) => {
try {
const serviceTokenData = popUp?.serviceTokenV3?.data as {
serviceTokenDataId: string;
const machineIdentity = popUp?.machineIdentity?.data as {
machineId: string;
name: string;
role: string;
};
if (serviceTokenData) {
if (machineIdentity) {
// update
await updateMutateAsync({
serviceTokenDataId: serviceTokenData.serviceTokenDataId,
machineId: machineIdentity.machineId,
name,
role,
trustedIps,
@@ -211,7 +213,7 @@ export const AddServiceTokenV3Modal = ({
isRefreshTokenRotationEnabled
});
handlePopUpToggle("serviceTokenV3", false);
handlePopUpToggle("machineIdentity", false);
} else {
const { refreshToken } = await createMutateAsync({
@@ -228,7 +230,7 @@ export const AddServiceTokenV3Modal = ({
}
createNotification({
text: `Successfully ${popUp?.serviceTokenV3?.data ? "updated" : "created"} service account`,
text: `Successfully ${popUp?.machineIdentity?.data ? "updated" : "created"} machine identity`,
type: "success"
});
@@ -236,7 +238,7 @@ export const AddServiceTokenV3Modal = ({
} catch (err) {
console.error(err);
createNotification({
text: `Failed to ${popUp?.serviceTokenV3?.data ? "updated" : "created"} service account`,
text: `Failed to ${popUp?.machineIdentity?.data ? "updated" : "created"} machine identity`,
type: "error"
});
}
@@ -246,14 +248,14 @@ export const AddServiceTokenV3Modal = ({
return (
<Modal
isOpen={popUp?.serviceTokenV3?.isOpen}
isOpen={popUp?.machineIdentity?.isOpen}
onOpenChange={(isOpen) => {
handlePopUpToggle("serviceTokenV3", isOpen);
handlePopUpToggle("machineIdentity", isOpen);
reset();
setNewServiceTokenJSON("");
}}
>
<ModalContent title={`${popUp?.serviceTokenV3?.data ? "Update" : "Create"} Service Account`}>
<ModalContent title={`${popUp?.machineIdentity?.data ? "Update" : "Create"} Machine Identity`}>
{!hasServiceTokenJSON ? (
<form onSubmit={handleSubmit(onFormSubmit)}>
<Tabs defaultValue={TabSections.General}>
@@ -283,7 +285,7 @@ export const AddServiceTokenV3Modal = ({
>
<Input
{...field}
placeholder="My ST V3"
placeholder="Machine 1"
/>
</FormControl>
)}
@@ -294,7 +296,7 @@ export const AddServiceTokenV3Modal = ({
defaultValue=""
render={({ field: { onChange, ...field }, fieldState: { error } }) => (
<FormControl
label={`${popUp?.serviceTokenV3?.data ? "Update" : ""} Role`}
label={`${popUp?.machineIdentity?.data ? "Update" : ""} Role`}
errorText={error?.message}
isError={Boolean(error)}
className="mt-4"
@@ -325,7 +327,7 @@ export const AddServiceTokenV3Modal = ({
defaultValue=""
render={({ field: { onChange, ...field }, fieldState: { error } }) => (
<FormControl
label={`${popUp?.serviceTokenV3?.data ? "Update" : ""} Refresh Token Expires In`}
label={`${popUp?.machineIdentity?.data ? "Update" : ""} Refresh Token Expires In`}
errorText={error?.message}
isError={Boolean(error)}
className="mt-4"
@@ -457,12 +459,12 @@ export const AddServiceTokenV3Modal = ({
isLoading={isSubmitting}
isDisabled={isSubmitting}
>
{popUp?.serviceTokenV3?.data ? "Update" : "Create"}
{popUp?.machineIdentity?.data ? "Update" : "Create"}
</Button>
<Button
colorSchema="secondary"
variant="plain"
onClick={() => handlePopUpToggle("serviceTokenV3", false)}
onClick={() => handlePopUpToggle("machineIdentity", false)}
>
Cancel
</Button>
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/components/ServiceTokenV3Section/ServiceTokenV3Section.tsx → frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/MachineIdentitySection.tsx
+20 -22
View File
@@ -9,35 +9,33 @@ import {
} from "@app/components/v2";
import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context";
import { withPermission } from "@app/hoc";
import {
useDeleteServiceTokenV3
} from "@app/hooks/api";
import { useDeleteMachineIdentity } from "@app/hooks/api";
import { usePopUp } from "@app/hooks/usePopUp";
import { AddServiceTokenV3Modal } from "./AddServiceTokenV3Modal";
import { ServiceTokenV3Table } from "./ServiceTokenV3Table";
import { AddMachineIdentityModal } from "./AddMachineIdentityModal";
import { MachineIdentityTable } from "./MachineIdentityTable";
export const ServiceTokenV3Section = withPermission(
export const MachineIdentitySection = withPermission(
() => {
const { createNotification } = useNotificationContext();
const { mutateAsync: deleteMutateAsync } = useDeleteServiceTokenV3();
const { mutateAsync: deleteMutateAsync } = useDeleteMachineIdentity();
const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
"serviceTokenV3",
"deleteServiceTokenV3",
"machineIdentity",
"deleteMachineIdentity",
"upgradePlan"
] as const);
const onDeleteServiceTokenDataSubmit = async (serviceTokenDataId: string) => {
const onDeleteMachineIdentitySubmit = async (machineId: string) => {
try {
await deleteMutateAsync({
serviceTokenDataId
machineId
});
createNotification({
text: "Successfully deleted service token v3",
type: "success"
});
handlePopUpClose("deleteServiceTokenV3");
handlePopUpClose("deleteMachineIdentity");
} catch (err) {
console.error(err);
createNotification({
@@ -51,7 +49,7 @@ export const ServiceTokenV3Section = withPermission(
<div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
<div className="flex justify-between mb-8">
<p className="text-xl font-semibold text-mineshaft-100">
Machines
Machine Identities (MIs)
</p>
<OrgPermissionCan
I={OrgPermissionActions.Create}
@@ -62,32 +60,32 @@ export const ServiceTokenV3Section = withPermission(
colorSchema="secondary"
type="submit"
leftIcon={<FontAwesomeIcon icon={faPlus} />}
onClick={() => handlePopUpOpen("serviceTokenV3")}
onClick={() => handlePopUpOpen("machineIdentity")}
isDisabled={!isAllowed}
>
Create account
Create MI
</Button>
)}
</OrgPermissionCan>
</div>
<ServiceTokenV3Table
<MachineIdentityTable
handlePopUpOpen={handlePopUpOpen}
/>
<AddServiceTokenV3Modal
<AddMachineIdentityModal
popUp={popUp}
handlePopUpOpen={handlePopUpOpen}
handlePopUpToggle={handlePopUpToggle}
/>
<DeleteActionModal
isOpen={popUp.deleteServiceTokenV3.isOpen}
isOpen={popUp.deleteMachineIdentity.isOpen}
title={`Are you sure want to delete ${
(popUp?.deleteServiceTokenV3?.data as { name: string })?.name || ""
(popUp?.deleteMachineIdentity?.data as { name: string })?.name || ""
}?`}
onChange={(isOpen) => handlePopUpToggle("deleteServiceTokenV3", isOpen)}
onChange={(isOpen) => handlePopUpToggle("deleteMachineIdentity", isOpen)}
deleteKey="confirm"
onDeleteApproved={() =>
onDeleteServiceTokenDataSubmit(
(popUp?.deleteServiceTokenV3?.data as { serviceTokenDataId: string })?.serviceTokenDataId
onDeleteMachineIdentitySubmit(
(popUp?.deleteMachineIdentity?.data as { machineId: string })?.machineId
)
}
/>
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/components/ServiceTokenV3Section/ServiceTokenV3Table.tsx → frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
+21 -20
View File
@@ -24,17 +24,18 @@ import {
OrgPermissionSubjects,
useOrganization} from "@app/context";
import {
useGetOrgServiceMemberships,
useGetMachineMembershipOrgs,
useGetRoles,
useUpdateServiceTokenV3} from "@app/hooks/api";
useUpdateMachineIdentity
} from "@app/hooks/api";
import { ServiceTokenV3TrustedIp } from "@app/hooks/api/serviceTokens/types"
import { UsePopUpState } from "@app/hooks/usePopUp";
type Props = {
handlePopUpOpen: (
popUpName: keyof UsePopUpState<["deleteServiceTokenV3", "serviceTokenV3"]>,
popUpName: keyof UsePopUpState<["deleteMachineIdentity", "machineIdentity"]>,
data?: {
serviceTokenDataId?: string;
machineId?: string;
name?: string;
role?: string;
customRole?: {
@@ -48,42 +49,42 @@ type Props = {
) => void;
};
export const ServiceTokenV3Table = ({
export const MachineIdentityTable = ({
handlePopUpOpen
}: Props) => {
const { createNotification } = useNotificationContext();
const { currentOrg } = useOrganization();
const orgId = currentOrg?._id || "";
const { mutateAsync: updateMutateAsync } = useUpdateServiceTokenV3();
const { data, isLoading } = useGetOrgServiceMemberships(currentOrg?._id || "");
const { mutateAsync: updateMutateAsync } = useUpdateMachineIdentity();
const { data, isLoading } = useGetMachineMembershipOrgs(currentOrg?._id || "");
const { data: roles } = useGetRoles({
orgId
});
const handleChangeRole = async ({
serviceTokenDataId,
machineId,
role
}: {
serviceTokenDataId: string;
machineId: string;
role: string;
}) => {
try {
await updateMutateAsync({
serviceTokenDataId,
machineId,
role
});
createNotification({
text: "Successfully updated service account role",
text: "Successfully updated machine identity role",
type: "success"
});
} catch (err) {
console.error(err);
createNotification({
text: "Failed to update service account role",
text: "Failed to update machine identity role",
type: "error"
});
}
@@ -138,12 +139,12 @@ export const ServiceTokenV3Table = ({
</Tr>
</THead>
<TBody>
{isLoading && <TableSkeleton columns={7} innerKey="service-tokens" />}
{isLoading && <TableSkeleton columns={7} innerKey="org-machine-identities" />}
{!isLoading &&
data &&
data.length > 0 &&
data.map(({
service: {
machineIdentity: {
_id,
name,
// isActive,
@@ -195,7 +196,7 @@ export const ServiceTokenV3Table = ({
dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
onValueChange={(selectedRole) =>
handleChangeRole({
serviceTokenDataId: _id,
machineId: _id,
role: selectedRole
})
}
@@ -235,8 +236,8 @@ export const ServiceTokenV3Table = ({
{(isAllowed) => (
<IconButton
onClick={async () => {
handlePopUpOpen("serviceTokenV3", {
serviceTokenDataId: _id,
handlePopUpOpen("machineIdentity", {
machineId: _id,
name,
role,
customRole,
@@ -262,8 +263,8 @@ export const ServiceTokenV3Table = ({
{(isAllowed) => (
<IconButton
onClick={() => {
handlePopUpOpen("deleteServiceTokenV3", {
serviceTokenDataId: _id,
handlePopUpOpen("deleteMachineIdentity", {
machineId: _id,
name
});
}}
@@ -285,7 +286,7 @@ export const ServiceTokenV3Table = ({
{!isLoading && data && data?.length === 0 && (
<Tr>
<Td colSpan={7}>
<EmptyState title="No system users have been created in this organization" icon={faServer} />
<EmptyState title="No MIs have been created in this organization" icon={faServer} />
</Td>
</Tr>
)}
frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/MachineIdentitySection/index.tsx
+1
View File
@@ -0,0 +1 @@
export { MachineIdentitySection } from "./MachineIdentitySection";
frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/components/index.tsx
+1
View File
@@ -0,0 +1 @@
export { MachineIdentitySection } from "./MachineIdentitySection";
frontend/src/views/Org/MembersPage/components/OrgMachineIdentityTab/index.tsx
+1
View File
@@ -0,0 +1 @@
export { OrgMachineIdentityTab } from "./OrgMachineIdentityTab";
frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+1 -1
View File
@@ -118,7 +118,7 @@ export const OrgMembersTable = ({
}
}
const isLoading = isMembersLoading || IsWsMembershipLoading || isRolesLoading;
const isLoading = isMembersLoading || isRolesLoading;
const isIamOwner = useMemo(
() => members?.find(({ user: u }) => userId === u?._id)?.role === "owner",
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/components/ServiceTokenV3Section/index.tsx
-1
View File
@@ -1 +0,0 @@
export { ServiceTokenV3Section } from "./ServiceTokenV3Section";
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/components/index.tsx
-1
View File
@@ -1 +0,0 @@
export { ServiceTokenV3Section } from "./ServiceTokenV3Section";
frontend/src/views/Org/MembersPage/components/OrgServiceTokenTab/index.tsx
-1
View File
@@ -1 +0,0 @@
export { OrgServiceTokenTab } from "./OrgServiceTokenTab";
frontend/src/views/Org/MembersPage/components/index.tsx
+2 -2
View File
@@ -1,3 +1,3 @@
export { OrgMachineIdentityTab } from "./OrgMachineIdentityTab";
export { OrgMembersTab } from "./OrgMembersTab";
export { OrgRoleTabSection } from "./OrgRoleTabSection";
export { OrgServiceTokenTab } from "./OrgServiceTokenTab";
export { OrgRoleTabSection } from "./OrgRoleTabSection";
frontend/src/views/Project/AuditLogsPage/components/LogsTableRow.tsx
+3 -3
View File
@@ -167,19 +167,19 @@ export const LogsTableRow = ({
<p>{`Name: ${event.metadata.name}`}</p>
</Td>
);
case EventType.CREATE_SERVICE_TOKEN_V3:
case EventType.CREATE_MACHINE_IDENTITY:
return (
<Td>
<p>{`Name: ${event.metadata.name}`}</p>
</Td>
);
case EventType.UPDATE_SERVICE_TOKEN_V3:
case EventType.UPDATE_MACHINE_IDENTITY:
return (
<Td>
<p>{`Name: ${event.metadata.name}`}</p>
</Td>
);
case EventType.DELETE_SERVICE_TOKEN_V3:
case EventType.DELETE_MACHINE_IDENTITY:
return (
<Td>
<p>{`Name: ${event.metadata.name}`}</p>
frontend/src/views/Project/MembersPage/MembersPage.tsx
+11 -9
View File
@@ -5,15 +5,17 @@ import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context";
import { withProjectPermission } from "@app/hoc";
import { MemberListTab } from "./components/MemberListTab";
import { ProjectRoleListTab } from "./components/ProjectRoleListTab";
import { ServiceAccountTab } from "./components/ServiceAccountTab";
import { ServiceTokenTab } from "./components/ServiceTokenTab";
import {
MachineIdentityTab,
MemberListTab,
ProjectRoleListTab,
ServiceTokenTab
} from "./components";
enum TabSections {
Member = "members",
Roles = "roles",
ServiceAccounts = "service-accounts",
MachineIdentities = "machine-identities",
ServiceTokens = "service-tokens"
}
@@ -27,8 +29,8 @@ export const MembersPage = withProjectPermission(
</p>
<Tabs defaultValue={TabSections.Member}>
<TabList>
<Tab value={TabSections.Member}>Members</Tab>
<Tab value={TabSections.ServiceAccounts}>Service Accounts</Tab>
<Tab value={TabSections.Member}>People</Tab>
<Tab value={TabSections.MachineIdentities}>Machine Identities</Tab>
<Tab value={TabSections.ServiceTokens}>Service Tokens</Tab>
<Tab value={TabSections.Roles}>Roles</Tab>
</TabList>
@@ -43,8 +45,8 @@ export const MembersPage = withProjectPermission(
<MemberListTab />
</motion.div>
</TabPanel>
<TabPanel value={TabSections.ServiceAccounts}>
<ServiceAccountTab />
<TabPanel value={TabSections.MachineIdentities}>
<MachineIdentityTab />
</TabPanel>
<TabPanel value={TabSections.ServiceTokens}>
<ServiceTokenTab />
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/ServiceAccountTab.tsx → frontend/src/views/Project/MembersPage/components/MachineIdentityTab/MachineIdentityTab.tsx
+4 -4
View File
@@ -1,19 +1,19 @@
import { motion } from "framer-motion";
import {
ServiceTokenV3Section
MachineIdentitySection
} from "./components";
export const ServiceAccountTab = () => {
export const MachineIdentityTab = () => {
return (
<motion.div
key="panel-service-token"
key="panel-machine-identity"
transition={{ duration: 0.15 }}
initial={{ opacity: 0, translateX: 30 }}
animate={{ opacity: 1, translateX: 0 }}
exit={{ opacity: 0, translateX: 30 }}
>
<ServiceTokenV3Section />
<MachineIdentitySection />
</motion.div>
);
}
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/components/ServiceTokenV3Section/AddServiceTokenV3Modal.tsx → frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/AddMachineIdentityModal.tsx
+38 -36
View File
@@ -17,25 +17,27 @@ import {
useOrganization,
useWorkspace
} from "@app/context";
import { useAddServiceToWorkspace ,
useGetOrgServiceMemberships,
import {
useAddMachineToWorkspace,
useGetMachineMembershipOrgs,
useGetRoles,
useGetWorkspaceServiceMemberships} from "@app/hooks/api";
useGetWorkspaceMachineMemberships
} from "@app/hooks/api";
import { UsePopUpState } from "@app/hooks/usePopUp";
const schema = yup.object({
serviceTokenDataId: yup.string().required("ST V3 id is required"),
machineId: yup.string().required("ST V3 id is required"),
role: yup.string().required("ST V3 role is required")
}).required();
export type FormData = yup.InferType<typeof schema>;
type Props = {
popUp: UsePopUpState<["serviceTokenV3"]>;
handlePopUpToggle: (popUpName: keyof UsePopUpState<["serviceTokenV3"]>, state?: boolean) => void;
popUp: UsePopUpState<["machineIdentity"]>;
handlePopUpToggle: (popUpName: keyof UsePopUpState<["machineIdentity"]>, state?: boolean) => void;
};
export const AddServiceTokenV3Modal = ({
export const AddMachineIdentityModal = ({
popUp,
handlePopUpToggle
}: Props) => {
@@ -47,26 +49,27 @@ export const AddServiceTokenV3Modal = ({
const orgId = currentOrg?._id || "";
const workspaceId = currentWorkspace?._id || "";
const { data: orgServices } = useGetOrgServiceMemberships(orgId);
const { data: services } = useGetWorkspaceServiceMemberships(workspaceId);
const { data: machineMembershipOrgs } = useGetMachineMembershipOrgs(orgId);
const { data: machineMemberships } = useGetWorkspaceMachineMemberships(workspaceId);
const { data: roles } = useGetRoles({
orgId,
workspaceId
});
const addServiceToWorkspace = useAddServiceToWorkspace();
const { mutateAsync: addMachineToWorkspaceMutateAsync } = useAddMachineToWorkspace();
const filteredOrgServices = useMemo(() => {
const wsServiceIds = new Map();
const filteredMachineMembershipOrgs = useMemo(() => {
const wsMachineIds = new Map();
services?.forEach((service) => {
wsServiceIds.set(service.service._id, true);
machineMemberships?.forEach((machineMembership) => {
wsMachineIds.set(machineMembership.machineIdentity._id, true);
});
return (orgServices || []).filter(
({ service: s }) => !wsServiceIds.has(s._id)
return (machineMembershipOrgs || []).filter(
({ machineIdentity: mi }) => !wsMachineIds.has(mi._id)
);
}, [orgServices, services]);
}, [machineMembershipOrgs, machineMemberships]);
const {
control,
@@ -78,28 +81,27 @@ export const AddServiceTokenV3Modal = ({
});
const onFormSubmit = async ({
serviceTokenDataId,
machineId,
role
}: FormData) => {
try {
await addServiceToWorkspace.mutateAsync({
await addMachineToWorkspaceMutateAsync({
workspaceId,
serviceId: serviceTokenDataId as string,
machineId,
role
});
createNotification({
text: "Successfully added service account to project",
text: "Successfully added machine identity to project",
type: "success"
});
reset();
handlePopUpToggle("serviceTokenV3", false);
handlePopUpToggle("machineIdentity", false);
} catch (err) {
console.error(err);
createNotification({
text: "Failed to add service account to project",
text: "Failed to add machine identity to project",
type: "error"
});
}
@@ -107,19 +109,19 @@ export const AddServiceTokenV3Modal = ({
return (
<Modal
isOpen={popUp?.serviceTokenV3?.isOpen}
isOpen={popUp?.machineIdentity?.isOpen}
onOpenChange={(isOpen) => {
handlePopUpToggle("serviceTokenV3", isOpen);
handlePopUpToggle("machineIdentity", isOpen);
reset();
}}
>
<ModalContent title="Add a service account to the project">
{filteredOrgServices.length ? (
<ModalContent title="Add Machine Identity to Project">
{filteredMachineMembershipOrgs.length ? (
<form onSubmit={handleSubmit(onFormSubmit)}>
<Controller
control={control}
name="serviceTokenDataId"
defaultValue={filteredOrgServices?.[0]?._id}
name="machineId"
defaultValue={filteredMachineMembershipOrgs?.[0]?._id}
render={({ field: { onChange, ...field }, fieldState: { error } }) => (
<FormControl
label="Service Account"
@@ -132,9 +134,9 @@ export const AddServiceTokenV3Modal = ({
onValueChange={(e) => onChange(e)}
className="w-full"
>
{filteredOrgServices.map(({ service }) => (
<SelectItem value={service._id} key={`org-service-${service._id}`}>
{service.name}
{filteredMachineMembershipOrgs.map(({ machineIdentity }) => (
<SelectItem value={machineIdentity._id} key={`org-service-${machineIdentity._id}`}>
{machineIdentity.name}
</SelectItem>
))}
</Select>
@@ -175,7 +177,7 @@ export const AddServiceTokenV3Modal = ({
isLoading={isSubmitting}
isDisabled={isSubmitting}
>
{popUp?.serviceTokenV3?.data ? "Update" : "Create"}
{popUp?.machineIdentity?.data ? "Update" : "Create"}
</Button>
<Button colorSchema="secondary" variant="plain">
Cancel
@@ -184,9 +186,9 @@ export const AddServiceTokenV3Modal = ({
</form>
) : (
<div className="flex flex-col space-y-4">
<div>All the service accounts in your organization are already added.</div>
<div>All the machine identities in your organization are already added.</div>
<Link href={`/org/${currentWorkspace?.organization}/members`}>
<Button variant="outline_bg">Add service accounts to organization</Button>
<Button variant="outline_bg">Create a new/another machine identities</Button>
</Link>
</div>
)}
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/components/ServiceTokenV3Section/ServiceTokenV3Section.tsx → frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/MachineIdentitySection.tsx
+19 -19
View File
@@ -13,33 +13,33 @@ import {
useWorkspace} from "@app/context";
import { withProjectPermission } from "@app/hoc";
import {
useDeleteServiceFromWorkspace
useDeleteMachineFromWorkspace
} from "@app/hooks/api";
import { usePopUp } from "@app/hooks/usePopUp";
import { AddServiceTokenV3Modal } from "./AddServiceTokenV3Modal";
import { ServiceTokenV3Table } from "./ServiceTokenV3Table";
import { AddMachineIdentityModal } from "./AddMachineIdentityModal";
import { MachineIdentityTable } from "./MachineIdentityTable";
export const ServiceTokenV3Section = withProjectPermission(
export const MachineIdentitySection = withProjectPermission(
() => {
const { createNotification } = useNotificationContext();
const { currentWorkspace } = useWorkspace();
const workspaceId = currentWorkspace?._id ?? "";
const { mutateAsync: deleteMutateAsync } = useDeleteServiceFromWorkspace();
const { mutateAsync: deleteMutateAsync } = useDeleteMachineFromWorkspace();
const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([
"serviceTokenV3",
"deleteServiceTokenV3",
"machineIdentity",
"deleteMachineIdentity",
"upgradePlan"
] as const);
const onRemoveServiceTokenDataSubmit = async (serviceTokenDataId: string) => {
const onRemoveServiceTokenDataSubmit = async (machineId: string) => {
try {
await deleteMutateAsync({
serviceId: serviceTokenDataId,
machineId,
workspaceId
});
@@ -48,7 +48,7 @@ export const ServiceTokenV3Section = withProjectPermission(
type: "success"
});
handlePopUpClose("deleteServiceTokenV3");
handlePopUpClose("deleteMachineIdentity");
} catch (err) {
console.error(err);
createNotification({
@@ -62,7 +62,7 @@ export const ServiceTokenV3Section = withProjectPermission(
<div className="mb-6 rounded-lg border border-mineshaft-600 bg-mineshaft-900 p-4">
<div className="flex justify-between mb-8">
<p className="text-xl font-semibold text-mineshaft-100">
Service Accounts
Machine Identities (MIs)
</p>
<ProjectPermissionCan
I={ProjectPermissionActions.Create}
@@ -73,31 +73,31 @@ export const ServiceTokenV3Section = withProjectPermission(
colorSchema="secondary"
type="submit"
leftIcon={<FontAwesomeIcon icon={faPlus} />}
onClick={() => handlePopUpOpen("serviceTokenV3")}
onClick={() => handlePopUpOpen("machineIdentity")}
isDisabled={!isAllowed}
>
Add service account
Add machine identity
</Button>
)}
</ProjectPermissionCan>
</div>
<ServiceTokenV3Table
<MachineIdentityTable
handlePopUpOpen={handlePopUpOpen}
/>
<AddServiceTokenV3Modal
<AddMachineIdentityModal
popUp={popUp}
handlePopUpToggle={handlePopUpToggle}
/>
<DeleteActionModal
isOpen={popUp.deleteServiceTokenV3.isOpen}
isOpen={popUp.deleteMachineIdentity.isOpen}
title={`Are you sure want to remove ${
(popUp?.deleteServiceTokenV3?.data as { name: string })?.name || ""
(popUp?.deleteMachineIdentity?.data as { name: string })?.name || ""
} from the project?`}
onChange={(isOpen) => handlePopUpToggle("deleteServiceTokenV3", isOpen)}
onChange={(isOpen) => handlePopUpToggle("deleteMachineIdentity", isOpen)}
deleteKey="confirm"
onDeleteApproved={() =>
onRemoveServiceTokenDataSubmit(
(popUp?.deleteServiceTokenV3?.data as { serviceTokenDataId: string })?.serviceTokenDataId
(popUp?.deleteMachineIdentity?.data as { machineId: string })?.machineId
)
}
/>
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/components/ServiceTokenV3Section/ServiceTokenV3Table.tsx → frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/MachineIdentityTable.tsx
+21 -19
View File
@@ -27,30 +27,30 @@ import {
} from "@app/context";
import {
useGetRoles,
useGetWorkspaceServiceMemberships} from "@app/hooks/api";
import { ServiceTokenV3TrustedIp } from "@app/hooks/api/serviceTokens/types"
useGetWorkspaceMachineMemberships
} from "@app/hooks/api";
import { MachineTrustedIp} from "@app/hooks/api/machineIdentities/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
type Props = {
handlePopUpOpen: (
popUpName: keyof UsePopUpState<["deleteServiceTokenV3", "serviceTokenV3"]>,
popUpName: keyof UsePopUpState<["deleteMachineIdentity", "machineIdentity"]>,
data?: {
serviceTokenDataId?: string;
machineId?: string;
name?: string;
role?: string;
customRole?: {
name: string;
slug: string;
};
trustedIps?: ServiceTokenV3TrustedIp[];
trustedIps?: MachineTrustedIp[];
accessTokenTTL?: number;
isRefreshTokenRotationEnabled?: boolean;
}
) => void;
};
// TODO: update roles thing here
export const ServiceTokenV3Table = ({
export const MachineIdentityTable = ({
handlePopUpOpen
}: Props) => {
const { createNotification } = useNotificationContext();
@@ -59,7 +59,7 @@ export const ServiceTokenV3Table = ({
const orgId = currentOrg?._id || "";
const workspaceId = currentWorkspace?._id || "";
const { data, isLoading } = useGetWorkspaceServiceMemberships(currentWorkspace?._id || "");
const { data, isLoading } = useGetWorkspaceMachineMemberships(currentWorkspace?._id || "");
const { data: roles } = useGetRoles({
orgId,
@@ -67,33 +67,35 @@ export const ServiceTokenV3Table = ({
});
const handleChangeRole = async ({
serviceTokenDataId,
machineId,
role
}: {
serviceTokenDataId: string;
machineId: string;
role: string;
}) => {
try {
console.log("handle project-level role change vals: ", {
serviceTokenDataId,
machineId,
role
});
// TODO: change role
// await updateMutateAsync({
// serviceTokenDataId,
// role
// });
createNotification({
text: "Successfully updated service account role",
text: "Successfully updated machine identity role",
type: "success"
});
} catch (err) {
console.error(err);
createNotification({
text: "Failed to update service account role",
text: "Failed to update machine identity role",
type: "error"
});
}
@@ -118,12 +120,12 @@ export const ServiceTokenV3Table = ({
</Tr>
</THead>
<TBody>
{isLoading && <TableSkeleton columns={7} innerKey="service-tokens" />}
{isLoading && <TableSkeleton columns={7} innerKey="project-machine-identities" />}
{!isLoading &&
data &&
data.length > 0 &&
data.map(({
service: {
machineIdentity: {
_id,
name
},
@@ -150,7 +152,7 @@ export const ServiceTokenV3Table = ({
dropdownContainerClassName="border border-mineshaft-600 bg-mineshaft-800"
onValueChange={(selectedRole) =>
handleChangeRole({
serviceTokenDataId: _id,
machineId: _id,
role: selectedRole
})
}
@@ -175,8 +177,8 @@ export const ServiceTokenV3Table = ({
{(isAllowed) => (
<IconButton
onClick={() => {
handlePopUpOpen("deleteServiceTokenV3", {
serviceTokenDataId: _id,
handlePopUpOpen("deleteMachineIdentity", {
machineId: _id,
name
});
}}
@@ -198,7 +200,7 @@ export const ServiceTokenV3Table = ({
{!isLoading && data && data?.length === 0 && (
<Tr>
<Td colSpan={7}>
<EmptyState title="No service accounts have been added to this project" icon={faServer} />
<EmptyState title="No machine identities have been added to this project" icon={faServer} />
</Td>
</Tr>
)}
frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/MachineIdentitySection/index.tsx
+1
View File
@@ -0,0 +1 @@
export { MachineIdentitySection } from "./MachineIdentitySection";
frontend/src/views/Project/MembersPage/components/MachineIdentityTab/components/index.tsx
+1
View File
@@ -0,0 +1 @@
export { MachineIdentitySection } from "./MachineIdentitySection";
frontend/src/views/Project/MembersPage/components/MachineIdentityTab/index.tsx
+1
View File
@@ -0,0 +1 @@
export { MachineIdentityTab } from "./MachineIdentityTab";
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/components/ServiceTokenV3Section/index.tsx
-1
View File
@@ -1 +0,0 @@
export { ServiceTokenV3Section } from "./ServiceTokenV3Section";
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/components/index.tsx
-1
View File
@@ -1 +0,0 @@
export { ServiceTokenV3Section } from "./ServiceTokenV3Section";
frontend/src/views/Project/MembersPage/components/ServiceAccountTab/index.tsx
-1
View File
@@ -1 +0,0 @@
export { ServiceAccountTab } from "./ServiceAccountTab";
frontend/src/views/Project/MembersPage/components/index.tsx
+4
View File
@@ -0,0 +1,4 @@
export { MachineIdentityTab } from "./MachineIdentityTab";
export { MemberListTab } from "./MemberListTab";
export { ProjectRoleListTab } from "./ProjectRoleListTab";
export { ServiceTokenTab } from "./ServiceTokenTab";