Files
twenty/packages/twenty-server/test/integration/metadata/suites/developers/api-keys.integration-spec.ts
T
c5564d9bd0 [BREAKING CHANGE] refactor: Add Entity suffix to TypeORM entity classes (#15239)
## Summary

This PR refactors all TypeORM entity classes in the Twenty codebase to
include an 'Entity' suffix (e.g., User → UserEntity, Workspace →
WorkspaceEntity) to improve code clarity and follow TypeORM naming
conventions.

## Changes

### Entity Renaming
-  Renamed **57 core TypeORM entities** with 'Entity' suffix
-  Updated all related imports, decorators, and type references
-  Fixed Repository<T>, @InjectRepository(), and
TypeOrmModule.forFeature() patterns
-  Fixed @ManyToOne/@OneToMany/@OneToOne decorator references

### Backward Compatibility
-  Preserved GraphQL schema names using @ObjectType('OriginalName')
decorators
-  **No breaking changes** to GraphQL API
-  **No database migrations** required
-  File names unchanged (user.entity.ts remains as-is)

### Code Quality
-  Fixed **497 TypeScript errors** (82% reduction from 606 to 109)
-  **All linter checks passing**
-  Improved type safety across the codebase

## Entities Renamed

```
User → UserEntity
Workspace → WorkspaceEntity
ApiKey → ApiKeyEntity
AppToken → AppTokenEntity
UserWorkspace → UserWorkspaceEntity
Webhook → WebhookEntity
FeatureFlag → FeatureFlagEntity
ApprovedAccessDomain → ApprovedAccessDomainEntity
TwoFactorAuthenticationMethod → TwoFactorAuthenticationMethodEntity
WorkspaceSSOIdentityProvider → WorkspaceSSOIdentityProviderEntity
EmailingDomain → EmailingDomainEntity
KeyValuePair → KeyValuePairEntity
PublicDomain → PublicDomainEntity
PostgresCredentials → PostgresCredentialsEntity
...and 43 more entities
```

## Impact

### Files Changed
- **400 files** modified
- **2,575 insertions**, **2,191 deletions**

### Progress
-  **82% complete** (497/606 errors fixed)
- ⚠️ **109 TypeScript errors** remain (18% of original)

## Remaining Work

The 109 remaining TypeScript errors are primarily:

1. **Function signature mismatches** (~15 errors) - Test mocks with
incorrect parameter counts
2. **Entity type mismatches** (~25 errors) - UserEntity vs
UserWorkspaceEntity confusion
3. **Pre-existing issues** (~50 errors) - Null safety and DTO
compatibility (unrelated to refactoring)
4. **Import type issues** (~10 errors) - Entities imported with 'import
type' but used as values
5. **Minor decorator issues** (~9 errors) - onDelete property
configurations

These can be addressed in follow-up PRs without blocking this
refactoring.

## Testing Checklist

- [x] Linter passing
- [ ] Unit tests should be run (CI will verify)
- [ ] Integration tests should be run (CI will verify)
- [ ] Manual testing recommended for critical user flows

## Breaking Changes

**None** - This is a pure refactoring with full backward compatibility:
- GraphQL API unchanged (uses original entity names)
- Database schema unchanged
- External APIs unchanged

## Notes

- Created comprehensive `REFACTORING_STATUS.md` documenting the entire
process
- All temporary scripts have been cleaned up
- Branch: `refactor/add-entity-suffix-to-typeorm-entities`

## Reviewers

Please review especially:
- Entity renaming patterns
- GraphQL backward compatibility
- Any areas where entity types are confused (UserEntity vs
UserWorkspaceEntity)

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
2025-10-22 09:55:20 +02:00

344 lines
9.1 KiB
TypeScript

import { gql } from 'graphql-tag';
import { makeMetadataAPIRequest } from 'test/integration/metadata/suites/utils/make-metadata-api-request.util';
describe('apiKeysResolver (e2e)', () => {
let createdApiKeyId: string | undefined;
let adminRoleId: string;
beforeAll(async () => {
const rolesResponse = await makeMetadataAPIRequest({
query: gql`
query GetRoles {
getRoles {
id
label
}
}
`,
});
if (rolesResponse.body.errors) {
throw new Error(
`Failed to get roles: ${JSON.stringify(rolesResponse.body.errors)}`,
);
}
adminRoleId = rolesResponse.body.data.getRoles.find(
(r: { label: string }) => r.label === 'Admin',
)?.id as string;
});
afterEach(async () => {
if (createdApiKeyId) {
await testDataSource
.query('DELETE FROM core."apiKey" WHERE id = $1', [createdApiKeyId])
.catch(() => {});
createdApiKeyId = undefined;
}
});
describe('apiKeys query', () => {
it('should find many API keys', async () => {
const response = await makeMetadataAPIRequest({
query: gql`
query GetApiKeys {
apiKeys {
id
name
expiresAt
revokedAt
role {
id
label
icon
}
}
}
`,
});
expect(response.status).toBe(200);
expect(response.body.data).toBeDefined();
expect(response.body.errors).toBeUndefined();
expect(response.body.data.apiKeys).toBeDefined();
expect(Array.isArray(response.body.data.apiKeys)).toBe(true);
});
});
describe('createApiKey mutation', () => {
it('should create an API key successfully', async () => {
const apiKeyInput = {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
roleId: adminRoleId,
};
const response = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyInput!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: apiKeyInput,
},
});
expect(response.status).toBe(200);
expect(response.body.data).toBeDefined();
expect(response.body.errors).toBeUndefined();
const createdApiKey = response.body.data.createApiKey;
expect(createdApiKey).toBeDefined();
expect(createdApiKey.id).toBeDefined();
expect(createdApiKey.name).toBe(apiKeyInput.name);
expect(createdApiKey.expiresAt).toBe('2025-12-31T23:59:59.000Z');
expect(createdApiKey.revokedAt).toBeNull();
expect(createdApiKey.role).toBeDefined();
expect(createdApiKey.role.id).toBe(adminRoleId);
expect(createdApiKey.role.label).toBe('Admin');
createdApiKeyId = createdApiKey.id;
});
it('should fail to create API key with invalid expiry date', async () => {
const apiKeyInput = {
name: 'Test API Key',
expiresAt: 'invalid-date',
roleId: adminRoleId,
};
const response = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyInput!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
roleId
}
}
`,
variables: {
input: apiKeyInput,
},
});
expect(response.status).toBe(200);
expect(response.body.errors).toBeDefined();
expect(response.body.errors.length).toBeGreaterThan(0);
});
});
describe('updateApiKey mutation', () => {
it('should update an API key successfully', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyInput!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
roleId: adminRoleId,
},
},
});
const createdApiKey = createResponse.body.data.createApiKey;
createdApiKeyId = createdApiKey.id;
const updateInput = {
id: createdApiKey.id,
name: 'Updated API Key',
expiresAt: '2026-01-01T00:00:00Z',
};
const updateResponse = await makeMetadataAPIRequest({
query: gql`
mutation UpdateApiKey($input: UpdateApiKeyInput!) {
updateApiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: updateInput,
},
});
expect(updateResponse.status).toBe(200);
expect(updateResponse.body.data).toBeDefined();
expect(updateResponse.body.errors).toBeUndefined();
const updatedApiKey = updateResponse.body.data.updateApiKey;
expect(updatedApiKey).toBeDefined();
expect(updatedApiKey.id).toBe(createdApiKey.id);
expect(updatedApiKey.name).toBe(updateInput.name);
expect(updatedApiKey.expiresAt).toBe('2026-01-01T00:00:00.000Z');
expect(updatedApiKey.revokedAt).toBeNull();
expect(updatedApiKey.role).toBeDefined();
expect(updatedApiKey.role.id).toBe(adminRoleId);
});
});
describe('apiKey query', () => {
it('should find a specific API key', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyInput!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: {
name: 'Test API Key',
expiresAt: '2025-12-31T23:59:59Z',
roleId: adminRoleId,
},
},
});
const createdApiKey = createResponse.body.data.createApiKey;
createdApiKeyId = createdApiKey.id;
const apiKeyResponse = await makeMetadataAPIRequest({
query: gql`
query GetApiKey($input: GetApiKeyInput!) {
apiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: { id: createdApiKey.id },
},
});
expect(apiKeyResponse.status).toBe(200);
expect(apiKeyResponse.body.data).toBeDefined();
expect(apiKeyResponse.body.errors).toBeUndefined();
const foundApiKey = apiKeyResponse.body.data.apiKey;
expect(foundApiKey).toBeDefined();
expect(foundApiKey.id).toBe(createdApiKey.id);
expect(foundApiKey.name).toBe('Test API Key');
expect(foundApiKey.role).toBeDefined();
expect(foundApiKey.role.id).toBe(adminRoleId);
});
});
describe('revokeApiKey mutation', () => {
it('should revoke an API key successfully', async () => {
const createResponse = await makeMetadataAPIRequest({
query: gql`
mutation CreateApiKey($input: CreateApiKeyInput!) {
createApiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: {
name: 'Test API Key for Revoke',
expiresAt: '2025-12-31T23:59:59Z',
roleId: adminRoleId,
},
},
});
const createdApiKey = createResponse.body.data.createApiKey;
createdApiKeyId = createdApiKey.id;
const revokeResponse = await makeMetadataAPIRequest({
query: gql`
mutation RevokeApiKey($input: RevokeApiKeyInput!) {
revokeApiKey(input: $input) {
id
name
expiresAt
revokedAt
role {
id
label
}
}
}
`,
variables: {
input: { id: createdApiKeyId },
},
});
expect(revokeResponse.status).toBe(200);
expect(revokeResponse.body.data).toBeDefined();
expect(revokeResponse.body.errors).toBeUndefined();
const revokedApiKey = revokeResponse.body.data.revokeApiKey;
expect(revokedApiKey).toBeDefined();
expect(revokedApiKey.id).toBe(createdApiKeyId);
expect(revokedApiKey.revokedAt).toBeDefined();
expect(revokedApiKey.role).toBeDefined();
expect(revokedApiKey.role.id).toBe(adminRoleId);
});
});
});