Skip to content
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

feat: generate secret function and replaced few instances #7810

Merged
merged 21 commits into from
Oct 30, 2024
Merged

feat: generate secret function and replaced few instances #7810

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
f9eed54
feat: generate secret function and replaced few instances
Khaan25 Oct 18, 2024
a979e82
feat: use environment service to get app secret
Khaan25 Oct 19, 2024
09f7b5d
Replace variables
FelixMalfait Oct 20, 2024
e02604c
Merge main
FelixMalfait Oct 20, 2024
40d752e
Upgrade guide
FelixMalfait Oct 20, 2024
5477e18
Pass workspaceId for remoteServer and PostgresCredentials
FelixMalfait Oct 20, 2024
c0797ff
Sign with workspaceId
FelixMalfait Oct 21, 2024
543d669
Merge main
FelixMalfait Oct 21, 2024
5d21376
Begin refactoring
FelixMalfait Oct 21, 2024
4409219
Keep splitting TokenService into sub-services
FelixMalfait Oct 22, 2024
58b4e1d
More refactoring
FelixMalfait Oct 22, 2024
a6d0c63
Refactoring
FelixMalfait Oct 22, 2024
936bc38
Fix a few tests
FelixMalfait Oct 22, 2024
00e5c9a
Fix a few tests
FelixMalfait Oct 22, 2024
526cfb6
Fix and add more tests
FelixMalfait Oct 22, 2024
d0f4757
Fix integration tests
FelixMalfait Oct 22, 2024
b2613ba
Fix file token
FelixMalfait Oct 22, 2024
619b560
feat: updated developer docs
Khaan25 Oct 27, 2024
08d3bb2
Merge branch 'feat/introduce-app-secret-to-replace-secrets' of https:…
Khaan25 Oct 27, 2024
315cf5b
feat: updated developer docs
Khaan25 Oct 27, 2024
8cece24
Merge branch 'main' into feat/introduce-app-secret-to-replace-secrets
charlesBochet Oct 28, 2024
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
5 changes: 3 additions & 2 deletions packages/twenty-server/src/engine/core-modules/auth/token/services/token.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
} from 'src/engine/core-modules/workspace/workspace.entity';
import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
import { generateSecret } from 'src/utils/generate-secret';

@Injectable()
export class TokenService {
Expand Down Expand Up @@ -232,7 +233,7 @@ export class TokenService {
userId: string,
workspaceId: string,
): Promise<AuthToken> {
const secret = this.environmentService.get('LOGIN_TOKEN_SECRET');
const secret = generateSecret(workspaceId, 'LOGIN');
FelixMalfait marked this conversation as resolved.
Show resolved Hide resolved
const expiresIn = this.environmentService.get(
'SHORT_TERM_TOKEN_EXPIRES_IN',
);
Expand Down Expand Up @@ -271,7 +272,7 @@ export class TokenService {
const jwtPayload = {
sub: workspaceId,
};
const secret = this.environmentService.get('ACCESS_TOKEN_SECRET');
const secret = generateSecret(workspaceId, 'ACCESS');
let expiresIn: string | number;

if (expiresAt) {
Expand Down
14 changes: 14 additions & 0 deletions packages/twenty-server/src/utils/generate-secret.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { createHash } from 'crypto';

if (!process.env.APP_SECRET) {
Copy link
Member

@FelixMalfait FelixMalfait Oct 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should access env var through the dedicate service not directly through process.env ; you should probably do this in TokenService

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it. I'll see that.

throw new Error('APP_SECRET is not set');
}

export const generateSecret = (
workspaceId: string,
type: 'ACCESS' | 'LOGIN' | 'REFRESH' | 'FILE',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: consider using an enum for type parameter

): string => {
return createHash('sha256')
.update(`${process.env.APP_SECRET}${workspaceId}${type}`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

logic: no separator between APP_SECRET, workspaceId, and type could lead to collisions

.digest('hex');
};
Loading