Skip to content

Remove paid members from IAM manageable list #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 29, 2025
Merged

Remove paid members from IAM manageable list #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b592cf
remove paid members from IAM manageable list
devksingh4 Jun 29, 2025
f6d7590
fix remove error
devksingh4 Jun 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/api/routes/iam.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ const iamRoutes: FastifyPluginAsync = async (fastify, _options) => {
entry: {
module: Modules.IAM,
actor: request.username!,
target: request.body.add[i],
target: request.body.remove[i],
message: `remove target from group ID ${groupId}`,
requestId: request.id,
},
Expand All @@ -412,20 +412,20 @@ const iamRoutes: FastifyPluginAsync = async (fastify, _options) => {
entry: {
module: Modules.IAM,
actor: request.username!,
target: request.body.add[i],
target: request.body.remove[i],
message: `failed to remove target from group ID ${groupId}`,
requestId: request.id,
},
}),
);
if (result.reason instanceof EntraGroupError) {
response.failure.push({
email: request.body.add[i],
email: request.body.remove[i],
message: result.reason.message,
});
} else {
response.failure.push({
email: request.body.add[i],
email: request.body.remove[i],
message: "An unknown error occurred.",
});
}
Expand Down Expand Up @@ -597,7 +597,11 @@ No action is required from you at this time.
entraIdToken,
fastify.environmentConfig.EntraServicePrincipalId,
)
).filter((x) => !genericConfig.ProtectedEntraIDGroups.includes(x.id));
).filter(
(x) =>
!genericConfig.ProtectedEntraIDGroups.includes(x.id) &&
x.id !== fastify.environmentConfig.PaidMemberGroupId,
);
request.log.debug(
"Got manageable groups from Entra ID, setting to cache.",
);
Expand Down
5 changes: 4 additions & 1 deletion tests/live/iam.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
} from "../../src/common/types/iam.js";
import { allAppRoles, AppRoles } from "../../src/common/roles.js";
import { getBaseEndpoint } from "./utils.js";
import { genericConfig } from "../../src/common/config.js";
import { environmentConfig, genericConfig } from "../../src/common/config.js";

const baseEndpoint = getBaseEndpoint();
test("getting groups", async () => {
Expand All @@ -28,6 +28,9 @@ test("getting groups", async () => {
expect(item["displayName"].length).greaterThan(0);
expect(item["id"].length).greaterThan(0);
expect(genericConfig.ProtectedEntraIDGroups).not.toContain(item["id"]);
expect(genericConfig.ProtectedEntraIDGroups).not.toStrictEqual(
environmentConfig["dev"].PaidMemberGroupId,
);
}
});

Expand Down
Loading