Skip to content

Commit 187dea5

Browse files
authored
Merge pull request #123 from puzed/codex/remove-legacy-group-surface
refactor(brochureware,user-ui,test-suite): remove legacy group references
2 parents 2ea730c + 41479ea commit 187dea5

8 files changed

Lines changed: 13 additions & 19 deletions

File tree

packages/brochureware/src/pages/Features.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const features: Feature[] = [
3737
title: "TOTP MFA (Users & Admins)",
3838
bullets: [
3939
"Setup and verify with backup codes",
40-
"Per-group and cohort enforcement with rate limits",
40+
"Per-organization enforcement with rate limits",
4141
"AMR includes otp; ACR indicates MFA",
4242
],
4343
tags: ["OTP", "TOTP", "MFA"],
@@ -84,7 +84,7 @@ const features: Feature[] = [
8484
icon: Settings,
8585
title: "Admin: Clients, Settings, RBAC",
8686
bullets: [
87-
"Manage clients, settings, users, groups, permissions",
87+
"Manage clients, settings, users, roles, permissions, and organizations",
8888
"JWKS list and rotate",
8989
"OpenAPI served for Admin APIs",
9090
],
@@ -119,10 +119,10 @@ const features: Feature[] = [
119119
},
120120
{
121121
icon: Hash,
122-
title: "Claims: Permissions and Groups",
122+
title: "Claims: Permissions",
123123
bullets: [
124-
"ID tokens can include permissions and groups",
125-
"Computed from direct and group‑derived access",
124+
"ID tokens can include permissions",
125+
"Computed from direct and organization role-derived access",
126126
],
127127
tags: ["Custom Claims"],
128128
},

packages/brochureware/src/pages/docs/api/Admin.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,14 @@ POST /admin/users
1313
GET /admin/users/{sub}
1414
PATCH /admin/users/{sub}
1515
DELETE /admin/users/{sub}
16-
PUT /admin/users/{sub}/groups
1716
GET /admin/users/{sub}/permissions`;
1817

1918
const authzOps = `GET /admin/clients
2019
POST /admin/clients
2120
GET /admin/roles
2221
POST /admin/roles
2322
GET /admin/permissions
24-
POST /admin/permissions
25-
GET /admin/groups
26-
POST /admin/groups`;
23+
POST /admin/permissions`;
2724

2825
const adminApiPage = () => {
2926
return (
@@ -67,7 +64,7 @@ const adminApiPage = () => {
6764
<code>{userOps}</code>
6865
</pre>
6966
<p className="mt-2 text-sm text-muted-foreground">
70-
Includes admin user CRUD and user-to-group/permission management.
67+
Includes admin user CRUD and direct permission management.
7168
</p>
7269
</CardContent>
7370
</Card>
@@ -81,7 +78,7 @@ const adminApiPage = () => {
8178
<code>{authzOps}</code>
8279
</pre>
8380
<p className="mt-2 text-sm text-muted-foreground">
84-
Manage clients, roles, permissions, groups, and org structures.
81+
Manage clients, roles, permissions, and org structures.
8582
</p>
8683
</CardContent>
8784
</Card>

packages/brochureware/src/pages/docs/api/ApiOverview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const ApiOverviewPage = () => {
4747
</div>
4848
<ul className="list-disc space-y-2 pl-5 text-base text-muted-foreground">
4949
<li>Tenant bootstrapping and identity providers.</li>
50-
<li>Full RBAC management: clients, users, roles, permissions, groups, orgs.</li>
50+
<li>Full RBAC management: clients, users, roles, permissions, and orgs.</li>
5151
<li>Audit trail and settings surfaces.</li>
5252
<li>Admin-only OTP and security tooling.</li>
5353
</ul>

packages/brochureware/src/pages/docs/developers/client-apis/UsersApi.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ const managementResponseExample = `{
6969
"email": "target@example.com",
7070
"name": "Directory Target",
7171
"createdAt": "2026-01-24T19:17:27.000Z",
72-
"groups": ["support", "ops"],
7372
"permissions": ["darkauth.users:read"]
7473
}
7574
]

packages/brochureware/src/pages/docs/guides/OtpPolicy.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ const OtpPolicyPage = () => {
2323
</CardHeader>
2424
<CardContent>
2525
<p className="text-base text-muted-foreground">
26-
OTP in DarkAuth is implemented as an explicit policy layer. It can be enabled for users, users
27-
in groups, or role-based scenarios where step-up authentication is required.
26+
OTP in DarkAuth is implemented as an explicit policy layer. It can be enabled for users,
27+
organizations, or role-based scenarios where step-up authentication is required.
2828
</p>
2929
</CardContent>
3030
</Card>

packages/test-suite/tests/admin/groups/groups-default.spec.ts renamed to packages/test-suite/tests/admin/organizations/default-organization.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test.describe('Admin - Organizations Default', () => {
1111
let adminCred = { email: FIXED_TEST_ADMIN.email, password: FIXED_TEST_ADMIN.password };
1212

1313
test.beforeAll(async () => {
14-
servers = await createTestServers({ testName: 'admin-groups-default' });
14+
servers = await createTestServers({ testName: 'admin-organizations-default' });
1515
await installDarkAuth({
1616
adminUrl: servers.adminUrl,
1717
adminEmail: FIXED_TEST_ADMIN.email,

packages/test-suite/tests/admin/users/default-group-assignment.spec.ts renamed to packages/test-suite/tests/admin/users/default-organization-membership.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test.describe('Admin - Default organization membership', () => {
99
let servers: TestServers;
1010

1111
test.beforeAll(async () => {
12-
servers = await createTestServers({ testName: 'admin-default-group-assignment' });
12+
servers = await createTestServers({ testName: 'admin-default-organization-membership' });
1313
await installDarkAuth({
1414
adminUrl: servers.adminUrl,
1515
adminEmail: FIXED_TEST_ADMIN.email,

packages/user-ui/src/pages/Authorize.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ function getScopeDescription(scope: string): string {
166166
return "Access your basic profile information";
167167
case "email":
168168
return "Access your email address";
169-
case "groups":
170-
return "Access your group memberships";
171169
case "permissions":
172170
return "Access your permissions";
173171
default:

0 commit comments

Comments
 (0)