Skip to content

Commit bffa5cf

Browse files
guguclaude
andcommitted
revert: remove all backend changes from cedar-policy-editor branch
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent ae49d0b commit bffa5cf

8 files changed

Lines changed: 11 additions & 34 deletions

File tree

backend/src/entities/connection/application/data-structures/create-group-in-connection.ds.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ export class CreateGroupInConnectionDs {
22
group_parameters: {
33
title: string;
44
connectionId: string;
5-
cedarPolicy?: string | null;
65
};
76
creation_info: {
87
cognitoUserName: string;
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import { ApiProperty } from '@nestjs/swagger';
2-
import { IsNotEmpty, IsOptional, IsString } from 'class-validator';
2+
import { IsNotEmpty, IsString } from 'class-validator';
33

44
export class CreateGroupInConnectionDTO {
55
@IsNotEmpty()
66
@IsString()
77
@ApiProperty()
88
title: string;
9-
10-
@IsOptional()
11-
@IsString()
12-
@ApiProperty({ required: false, nullable: true })
13-
cedarPolicy?: string | null;
149
}

backend/src/entities/connection/connection.controller.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,15 +409,14 @@ export class ConnectionController {
409409
@SlugUuid('connectionId') connectionId: string,
410410
@UserId() userId: string,
411411
): Promise<FoundGroupResponseDto> {
412-
const { title, cedarPolicy } = groupData;
412+
const { title } = groupData;
413413
if (!title) {
414414
throw new BadRequestException(Messages.GROUP_TITLE_MISSING);
415415
}
416416
const inputData: CreateGroupInConnectionDs = {
417417
group_parameters: {
418418
title: title,
419419
connectionId: connectionId,
420-
cedarPolicy: cedarPolicy,
421420
},
422421
creation_info: {
423422
cognitoUserName: userId,

backend/src/entities/connection/use-cases/create-group-in-connection.use.case.ts

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class CreateGroupInConnectionUseCase
2626

2727
protected async implementation(inputData: CreateGroupInConnectionDs): Promise<FoundGroupResponseDto> {
2828
const {
29-
group_parameters: { connectionId, title, cedarPolicy },
29+
group_parameters: { connectionId, title },
3030
creation_info: { cognitoUserName },
3131
} = inputData;
3232
const connectionToUpdate = await this._dbContext.connectionRepository.findConnectionWithGroups(connectionId);
@@ -36,13 +36,11 @@ export class CreateGroupInConnectionUseCase
3636
const foundUser = await this._dbContext.userRepository.findOneUserById(cognitoUserName);
3737
const newGroupEntity = buildNewGroupEntityForConnectionWithUser(connectionToUpdate, foundUser, title);
3838
const savedGroup = await this._dbContext.groupRepository.saveNewOrUpdatedGroup(newGroupEntity);
39-
savedGroup.cedarPolicy =
40-
cedarPolicy ??
41-
generateCedarPolicyForGroup(connectionId, false, {
42-
connection: { connectionId, accessLevel: AccessLevelEnum.none },
43-
group: { groupId: savedGroup.id, accessLevel: AccessLevelEnum.none },
44-
tables: [],
45-
});
39+
savedGroup.cedarPolicy = generateCedarPolicyForGroup(connectionId, false, {
40+
connection: { connectionId, accessLevel: AccessLevelEnum.none },
41+
group: { groupId: savedGroup.id, accessLevel: AccessLevelEnum.none },
42+
tables: [],
43+
});
4644
await this._dbContext.groupRepository.saveNewOrUpdatedGroup(savedGroup);
4745
Cacher.invalidateCedarPolicyCache(connectionId);
4846
return buildFoundGroupResponseDto(savedGroup);

backend/src/entities/group/dto/found-group-response.dto.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ export class FoundGroupResponseDto {
1111
@ApiProperty()
1212
isMain: boolean;
1313

14-
@ApiProperty({ required: false, nullable: true })
15-
cedarPolicy?: string | null;
16-
1714
@ApiProperty({ required: false, isArray: true, type: SimpleFoundUserInfoDs })
1815
users?: Array<SimpleFoundUserInfoDs>;
1916
}
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ApiProperty } from '@nestjs/swagger';
2-
import { IsNotEmpty, IsOptional, IsString, IsUUID } from 'class-validator';
2+
import { IsNotEmpty, IsString, IsUUID } from 'class-validator';
33

44
export class UpdateGroupTitleDto {
55
@ApiProperty()
@@ -12,9 +12,4 @@ export class UpdateGroupTitleDto {
1212
@IsNotEmpty()
1313
@IsUUID()
1414
groupId: string;
15-
16-
@IsOptional()
17-
@IsString()
18-
@ApiProperty({ required: false, nullable: true })
19-
cedarPolicy?: string | null;
2015
}

backend/src/entities/group/use-cases/update-group-title.use.case.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import AbstractUseCase from '../../../common/abstract-use.case.js';
33
import { IGlobalDatabaseContext } from '../../../common/application/global-database-context.interface.js';
44
import { BaseType } from '../../../common/data-injection.tokens.js';
55
import { Messages } from '../../../exceptions/text/messages.js';
6-
import { Cacher } from '../../../helpers/cache/cacher.js';
76
import { FoundGroupDataInfoDs } from '../application/data-sctructures/found-user-groups.ds.js';
87
import { UpdateGroupTitleDto } from '../dto/update-group-title.dto.js';
98
import { IUpdateGroupTitle } from './use-cases.interfaces.js';
@@ -21,7 +20,7 @@ export class UpdateGroupTitleUseCase
2120
}
2221

2322
protected async implementation(groupData: UpdateGroupTitleDto): Promise<FoundGroupDataInfoDs> {
24-
const { groupId, title, cedarPolicy } = groupData;
23+
const { groupId, title } = groupData;
2524
const groupToUpdate = await this._dbContext.groupRepository.findGroupByIdWithConnectionAndUsers(groupId);
2625
if (!groupToUpdate) {
2726
throw new HttpException(
@@ -35,15 +34,11 @@ export class UpdateGroupTitleUseCase
3534
groupToUpdate.connection.id,
3635
);
3736

38-
if (connectionWithGroups.groups.find((group) => group.title === title && group.id !== groupId)) {
37+
if (connectionWithGroups.groups.find((group) => group.title === title)) {
3938
throw new BadRequestException(Messages.GROUP_NAME_UNIQUE);
4039
}
4140

4241
groupToUpdate.title = title;
43-
if (cedarPolicy !== undefined) {
44-
groupToUpdate.cedarPolicy = cedarPolicy;
45-
Cacher.invalidateCedarPolicyCache(groupToUpdate.connection.id);
46-
}
4742
const updatedGroup = await this._dbContext.groupRepository.saveNewOrUpdatedGroup(groupToUpdate);
4843
return {
4944
id: updatedGroup.id,

backend/src/entities/group/utils/biuld-found-group-response.dto.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export function buildFoundGroupResponseDto(group: GroupEntity): FoundGroupRespon
77
id: group.id,
88
title: group.title,
99
isMain: group.isMain,
10-
cedarPolicy: group.cedarPolicy,
1110
users: group.users?.map((user) => buildSimpleUserInfoDs(user)),
1211
};
1312
}

0 commit comments

Comments
 (0)